.gitignore

@@ -1 +1 @@
-SOURCES/maven-shade-plugin-3.2.1-source-release.zip
+SOURCES/maven-shade-plugin-3.1.0-source-release.zip

.maven-shade-plugin.metadata

@@ -1 +1 @@
-9eca43750d7f4bfb5ed9d2ff8ca8fdc8629e0c4c SOURCES/maven-shade-plugin-3.2.1-source-release.zip
+3d1012e380c5bb6d88f51a298aa302022a39e1ad SOURCES/maven-shade-plugin-3.1.0-source-release.zip

SOURCES/0001-Port-to-maven-dependency-tree-3.0.patch

@@ -0,0 +1,30 @@
+From 826c911c0b4c5b6890a7519ed60f426703b42605 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Mon, 12 Oct 2015 16:40:07 +0200
+Subject: [PATCH] Port to maven-dependency-tree 3.0
+
+---
+ src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
+index a9d7c8e..361d697 100644
+--- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
++++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
+@@ -1138,7 +1138,12 @@ public class ShadeMojo
+                                          List<Dependency> transitiveDeps )
+                                              throws DependencyGraphBuilderException
+     {
+-        DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( project, null );
++        ProjectBuildingRequest projectBuildingRequest =
++                new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() );
++        projectBuildingRequest.setLocalRepository( localRepository );
++        projectBuildingRequest.setRemoteRepositories( remoteArtifactRepositories );
++        projectBuildingRequest.setProject( project );
++        DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, null );
+         boolean modified = false;
+         for ( DependencyNode n2 : node.getChildren() )
+         {
+-- 
+2.13.5
+

SPECS/maven-shade-plugin.spec

@@ -1,6 +1,6 @@
 Name:           maven-shade-plugin
-Version:        3.2.1
-Release:        2%{?dist}
+Version:        3.1.0
+Release:        3%{?dist}
 Summary:        This plugin provides the capability to package the artifact in an uber-jar
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/%{name}
@@ -8,8 +8,10 @@ BuildArch:      noarch
 
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
+Patch0:         0001-Port-to-maven-dependency-tree-3.0.patch
+
 BuildRequires:  maven-local
-BuildRequires:  mvn(com.google.guava:guava)
+BuildRequires:  mvn(com.google.guava:guava:19.0)
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
 BuildRequires:  mvn(org.apache.maven:maven-core)
@@ -42,12 +44,10 @@ Summary:        API documentation for %{name}
 
 %prep
 %setup -q
+%patch0 -p1
 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
 # A class from aopalliance is not found. Simply adding BR does not solve it
 %mvn_build -f
@@ -62,18 +62,6 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
 %license LICENSE NOTICE
 
 %changelog
-* Tue May 07 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.2.1-2
-- Rebuilt for MSVSphere 8.9
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-2
-- Mass rebuild for javapackages-tools 201902
-
-* Thu May 30 2019 Marian Koncek <mkoncek@redhat.com> - 3.2.1-1
-- Update to upstream version 3.2.1
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-4
-- Mass rebuild for javapackages-tools 201901
-
 * Wed Apr 11 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-3
 - Switch BR to guava20