Accepting request 750616 from Java:packages

3.2.1

OBS-URL: https://build.opensuse.org/request/show/750616
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-shade-plugin?expand=0&rev=2

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

@@ -1,30 +0,0 @@
-From b5f9a9c64f42b7452681dc53e67e8cbae4de1105 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
-
----
- .../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 d7011f9..02450a2 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.17.1
-

maven-shade-plugin-3.1.1-source-release.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dca9c4f74428cba4c321e378a02bec8060beeb8e50324ce8663e27fd72e03325
-size 716071

maven-shade-plugin-3.2.1-source-release.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62c9ef4488167163993079254b39646dc2c8e8e3d1ccb4bcb843b42cb336fdbe
+size 735191

maven-shade-plugin.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Nov 24 17:34:34 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 3.2.1
+- Removed patch:
+  * 0001-Port-to-maven-dependency-tree-3.0.patch
+    + Integrated upstream
+
 -------------------------------------------------------------------
 Sat Apr  6 11:14:42 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

maven-shade-plugin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package maven-shade-plugin
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,17 @@
 
 
 Name:           maven-shade-plugin
-Version:        3.1.1
+Version:        3.2.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
-Patch0:         0001-Port-to-maven-dependency-tree-3.0.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
-BuildRequires:  mvn(com.google.guava:guava:19.0)
+BuildRequires:  unzip
+BuildRequires:  mvn(com.google.guava:guava)
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
@@ -45,7 +45,6 @@ BuildRequires:  mvn(org.jdom:jdom2)
 BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.ow2.asm:asm-commons)
 BuildRequires:  mvn(org.vafer:jdependency)
-BuildRequires:  unzip
 BuildArch:      noarch
 
 %description
@@ -62,13 +61,17 @@ Group:          Documentation/HTML
 
 %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 \
-%{mvn_build} -f
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+	-- -Dmaven.compiler.release=7
+%endif
 
 %install
 %mvn_install