#5 Update to upstream version 3.4.2
Merged 8 months ago by mizdebsk. Opened 2 years ago by mkoncek.
rpms/ mkoncek/maven-assembly-plugin rawhide  into  rawhide

file modified
+3
@@ -20,3 +20,6 @@ 

  /maven-assembly-plugin-3.1.1-source-release.zip

  /maven-assembly-plugin-3.2.0-source-release.zip

  /maven-assembly-plugin-3.3.0-source-release.zip

+ /maven-assembly-plugin-3.4.2-source-release.zip

+ /maven-assembly-plugin-3.6.0.tar.gz

+ /maven-assembly-plugin-3.6.0-source-release.zip

file modified
+11 -6
@@ -1,15 +1,15 @@ 

  %bcond_with bootstrap

  

  Name:           maven-assembly-plugin

- Version:        3.3.0

- Release:        11%{?dist}

+ Version:        3.6.0

+ Release:        1%{?dist}

  Summary:        Maven Assembly Plugin

- License:        ASL 2.0

+ License:        Apache-2.0

  URL:            https://maven.apache.org/plugins/maven-assembly-plugin/

  BuildArch:      noarch

  ExclusiveArch:  %{java_arches} noarch

  

- Source0:        http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip

+ Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip

  

  %if %{with bootstrap}

  BuildRequires:  javapackages-bootstrap
@@ -23,6 +23,7 @@ 

  BuildRequires:  mvn(org.apache.maven:maven-core)

  BuildRequires:  mvn(org.apache.maven:maven-model)

  BuildRequires:  mvn(org.apache.maven:maven-plugin-api)

+ BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)

  BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)

  BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)

  BuildRequires:  mvn(org.apache.maven.shared:file-management)
@@ -37,6 +38,7 @@ 

  BuildRequires:  mvn(org.codehaus.plexus:plexus-interpolation)

  BuildRequires:  mvn(org.codehaus.plexus:plexus-io)

  BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)

+ BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)

  %endif

  

  %description
@@ -52,9 +54,9 @@ 

  %prep

  %setup -q

  

+ %pom_remove_dep jaxen:jaxen

+ 

  %build

- # Tests need easymockclassextension version 2.x, which is incompatible

- # with easymockclassextension version 3.x we have in Fedora.

  %mvn_build -f

  

  %install
@@ -67,6 +69,9 @@ 

  %license LICENSE NOTICE

  

  %changelog

+ * Mon Aug 14 2023 Marian Koncek <mkoncek@redhat.com> - 3.6.0-1

+ - Update to upstream version 3.6.0

+ 

  * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-11

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (maven-assembly-plugin-3.3.0-source-release.zip) = d41ba25dd35dea5b1b690f6cb84e4e30c5466c0e6fb3d5d98305daf70cb1ba9468c0ba2181afb8fa5f6d41c735f4f1d9d462f58eb320df0c85d57dbefa70b15a

+ SHA512 (maven-assembly-plugin-3.6.0-source-release.zip) = 9a497059010d50a2acf5185d29c3bd31cf6081f0129bf04876dac076a85172d672366928a8a0b1dd9c9020a349b42684a27fe2bbb5cb0e898fa2fb2cec3003be

Please explain why sisu-maven-plugin is removed.

rebased onto f6a5abc

9 months ago

rebased onto b14543a

8 months ago

2 new commits added

  • Update to upstream version 3.6.0
  • Update license to SPDX format
8 months ago

Pull-Request has been merged by mizdebsk

8 months ago