Update to upstream version 3.1.0
This commit is contained in:
parent
6c80d85001
commit
c02499c7c3
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@ maven-shade-plugin-1.7.1-source-release.zip
|
|||||||
/maven-shade-plugin-2.4.2-source-release.zip
|
/maven-shade-plugin-2.4.2-source-release.zip
|
||||||
/maven-shade-plugin-2.4.3-source-release.zip
|
/maven-shade-plugin-2.4.3-source-release.zip
|
||||||
/maven-shade-plugin-3.0.0-source-release.zip
|
/maven-shade-plugin-3.0.0-source-release.zip
|
||||||
|
/maven-shade-plugin-3.1.0-source-release.zip
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 29d66485c635ae2dea9da2f7dedd29a41270f1fa Mon Sep 17 00:00:00 2001
|
From 826c911c0b4c5b6890a7519ed60f426703b42605 Mon Sep 17 00:00:00 2001
|
||||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
Date: Mon, 12 Oct 2015 16:40:07 +0200
|
Date: Mon, 12 Oct 2015 16:40:07 +0200
|
||||||
Subject: [PATCH] Port to maven-dependency-tree 3.0
|
Subject: [PATCH] Port to maven-dependency-tree 3.0
|
||||||
@ -8,23 +8,23 @@ Subject: [PATCH] Port to maven-dependency-tree 3.0
|
|||||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
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
|
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 6c516e9..0459b2f 100644
|
index a9d7c8e..361d697 100644
|
||||||
--- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
|
--- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
|
||||||
+++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
|
+++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
|
||||||
@@ -1130,7 +1130,12 @@ public class ShadeMojo
|
@@ -1138,7 +1138,12 @@ public class ShadeMojo
|
||||||
List<Dependency> transitiveDeps )
|
List<Dependency> transitiveDeps )
|
||||||
throws DependencyGraphBuilderException
|
throws DependencyGraphBuilderException
|
||||||
{
|
{
|
||||||
- DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( project, null );
|
- DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( project, null );
|
||||||
+ ProjectBuildingRequest projectBuildingRequest =
|
+ ProjectBuildingRequest projectBuildingRequest =
|
||||||
+ new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() );
|
+ new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() );
|
||||||
+ projectBuildingRequest.setLocalRepository( localRepository );
|
+ projectBuildingRequest.setLocalRepository( localRepository );
|
||||||
+ projectBuildingRequest.setRemoteRepositories( remoteArtifactRepositories );
|
+ projectBuildingRequest.setRemoteRepositories( remoteArtifactRepositories );
|
||||||
+ projectBuildingRequest.setProject( project );
|
+ projectBuildingRequest.setProject( project );
|
||||||
+ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, null );
|
+ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph( projectBuildingRequest, null );
|
||||||
boolean modified = false;
|
boolean modified = false;
|
||||||
for ( DependencyNode n2 : node.getChildren() )
|
for ( DependencyNode n2 : node.getChildren() )
|
||||||
{
|
{
|
||||||
--
|
--
|
||||||
2.9.3
|
2.13.5
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Name: maven-shade-plugin
|
Name: maven-shade-plugin
|
||||||
Version: 3.0.0
|
Version: 3.1.0
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: This plugin provides the capability to package the artifact in an uber-jar
|
Summary: This plugin provides the capability to package the artifact in an uber-jar
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://maven.apache.org/plugins/%{name}
|
URL: http://maven.apache.org/plugins/%{name}
|
||||||
@ -62,6 +62,9 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
|
|||||||
%license LICENSE NOTICE
|
%license LICENSE NOTICE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 11 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-1
|
||||||
|
- Update to upstream version 3.1.0
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (maven-shade-plugin-3.0.0-source-release.zip) = 746e563216f45a5a9967ab7b0bc18744a6db0709c92b393cc90a16ae65092286909590b2599fb060b44911cc48f16266541f28cdab5c9b0c1ed919b27aeca288
|
SHA512 (maven-shade-plugin-3.1.0-source-release.zip) = fa083184ecb4ede8ba97278de1b69786d1508866e9469a3307e832b6ce428c7e5ce1328317c35afd78b72b143d9d30c4a1efd8cbe102c25679e76b0a1fea559f
|
||||||
|
Loading…
Reference in New Issue
Block a user