diff --git a/maven-shade-plugin-3.2.1-source-release.zip b/maven-shade-plugin-3.2.1-source-release.zip deleted file mode 100644 index a7cd59c..0000000 --- a/maven-shade-plugin-3.2.1-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62c9ef4488167163993079254b39646dc2c8e8e3d1ccb4bcb843b42cb336fdbe -size 735191 diff --git a/maven-shade-plugin-3.4.1-source-release.zip b/maven-shade-plugin-3.4.1-source-release.zip new file mode 100644 index 0000000..81aeeef --- /dev/null +++ b/maven-shade-plugin-3.4.1-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61cb44f70ed3b3b9cd21e52015331eae69cddd703c1ff35b3b0839b7b0dbe0d1 +size 882603 diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec index e14bb2b..4e9ef96 100644 --- a/maven-shade-plugin.spec +++ b/maven-shade-plugin.spec @@ -1,7 +1,7 @@ # # spec file for package maven-shade-plugin # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,18 @@ Name: maven-shade-plugin -Version: 3.2.1 +Version: 3.4.1 Release: 0 Summary: Capability to package the artifact in an uber-jar License: Apache-2.0 Group: Development/Libraries/Java URL: http://maven.apache.org/plugins/%{name} -Source0: http://repo2.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 BuildRequires: fdupes BuildRequires: maven-local BuildRequires: unzip -BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(org.apache.commons:commons-collections4) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) @@ -41,6 +41,7 @@ BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm-commons) @@ -64,13 +65,10 @@ Group: Documentation/HTML rm src/test/jars/plexus-utils-1.4.1.jar ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar -%pom_remove_dep 'com.google.guava:guava:' -%pom_add_dep 'com.google.guava:guava' - %build %{mvn_build} -f \ %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -- -Dmaven.compiler.release=7 + -- -Dmaven.compiler.release=8 %endif %install