Update to upstream version 3.2.0
This commit is contained in:
parent
97e2f043cb
commit
7d5ec7e2a8
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ maven-bundle-plugin-2.0.0-project.tar.gz
|
|||||||
/maven-bundle-plugin-2.3.7-source-release.tar.gz
|
/maven-bundle-plugin-2.3.7-source-release.tar.gz
|
||||||
/maven-bundle-plugin-2.5.4-source-release.tar.gz
|
/maven-bundle-plugin-2.5.4-source-release.tar.gz
|
||||||
/maven-bundle-plugin-3.0.1-source-release.tar.gz
|
/maven-bundle-plugin-3.0.1-source-release.tar.gz
|
||||||
|
/maven-bundle-plugin-3.2.0-source-release.tar.gz
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From d857930332910d1315d8e5edc41229afbc0ec546 Mon Sep 17 00:00:00 2001
|
From 1d3e098ac5d020a7e93b942782c95ca42def50cb Mon Sep 17 00:00:00 2001
|
||||||
From: Michael Simacek <msimacek@redhat.com>
|
From: Michael Simacek <msimacek@redhat.com>
|
||||||
Date: Fri, 12 Feb 2016 09:45:20 +0100
|
Date: Fri, 12 Feb 2016 09:45:20 +0100
|
||||||
Subject: [PATCH 1/3] Port to current maven-dependency-tree
|
Subject: [PATCH 1/3] Port to current maven-dependency-tree
|
||||||
@ -150,7 +150,7 @@ index 5d095d8..b32b90b 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
index f15a34a..07a36fe 100644
|
index a4f0db1..4b56967 100644
|
||||||
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
@@ -72,15 +72,15 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
|
@@ -72,15 +72,15 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
|
||||||
@ -171,7 +171,7 @@ index f15a34a..07a36fe 100644
|
|||||||
import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
|
import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
|
||||||
import org.apache.maven.shared.osgi.Maven2OsgiConverter;
|
import org.apache.maven.shared.osgi.Maven2OsgiConverter;
|
||||||
import org.codehaus.plexus.archiver.UnArchiver;
|
import org.codehaus.plexus.archiver.UnArchiver;
|
||||||
@@ -212,9 +212,6 @@ public class BundlePlugin extends AbstractMojo
|
@@ -225,9 +225,6 @@ public class BundlePlugin extends AbstractMojo
|
||||||
@Component
|
@Component
|
||||||
protected MavenProjectBuilder mavenProjectBuilder;
|
protected MavenProjectBuilder mavenProjectBuilder;
|
||||||
|
|
||||||
@ -181,7 +181,7 @@ index f15a34a..07a36fe 100644
|
|||||||
/**
|
/**
|
||||||
* The dependency graph builder to use.
|
* The dependency graph builder to use.
|
||||||
*/
|
*/
|
||||||
@@ -331,7 +328,10 @@ public class BundlePlugin extends AbstractMojo
|
@@ -350,7 +347,10 @@ public class BundlePlugin extends AbstractMojo
|
||||||
DependencyNode dependencyGraph;
|
DependencyNode dependencyGraph;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -193,7 +193,7 @@ index f15a34a..07a36fe 100644
|
|||||||
}
|
}
|
||||||
catch ( DependencyGraphBuilderException e )
|
catch ( DependencyGraphBuilderException e )
|
||||||
{
|
{
|
||||||
@@ -739,7 +739,7 @@ public class BundlePlugin extends AbstractMojo
|
@@ -758,7 +758,7 @@ public class BundlePlugin extends AbstractMojo
|
||||||
// We need to find the direct dependencies that have been included in the uber JAR so that we can modify the
|
// We need to find the direct dependencies that have been included in the uber JAR so that we can modify the
|
||||||
// POM accordingly.
|
// POM accordingly.
|
||||||
private void createDependencyReducedPom( Set<String> artifactsToRemove )
|
private void createDependencyReducedPom( Set<String> artifactsToRemove )
|
||||||
@ -202,7 +202,7 @@ index f15a34a..07a36fe 100644
|
|||||||
{
|
{
|
||||||
Model model = project.getOriginalModel();
|
Model model = project.getOriginalModel();
|
||||||
List<Dependency> dependencies = new ArrayList<Dependency>();
|
List<Dependency> dependencies = new ArrayList<Dependency>();
|
||||||
@@ -882,24 +882,26 @@ public class BundlePlugin extends AbstractMojo
|
@@ -901,24 +901,26 @@ public class BundlePlugin extends AbstractMojo
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean updateExcludesInDeps( MavenProject project, List<Dependency> dependencies, List<Dependency> transitiveDeps )
|
public boolean updateExcludesInDeps( MavenProject project, List<Dependency> dependencies, List<Dependency> transitiveDeps )
|
||||||
@ -237,5 +237,5 @@ index f15a34a..07a36fe 100644
|
|||||||
//check if it really isn't in the list of original dependencies. Maven
|
//check if it really isn't in the list of original dependencies. Maven
|
||||||
//prior to 2.0.8 may grab versions from transients instead of
|
//prior to 2.0.8 may grab versions from transients instead of
|
||||||
--
|
--
|
||||||
2.5.5
|
2.7.4
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 0c057190600bb982937f6f007d63e7728b037327 Mon Sep 17 00:00:00 2001
|
From d79e608dfbaf74574dea1d1e1b8e5a249aa8019a Mon Sep 17 00:00:00 2001
|
||||||
From: Mat Booth <mat.booth@redhat.com>
|
From: Mat Booth <mat.booth@redhat.com>
|
||||||
Date: Thu, 14 Apr 2016 17:00:23 +0100
|
Date: Thu, 14 Apr 2016 17:00:23 +0100
|
||||||
Subject: [PATCH 2/3] Fix for new maven archiver
|
Subject: [PATCH 2/3] Fix for new maven archiver
|
||||||
@ -8,10 +8,10 @@ Subject: [PATCH 2/3] Fix for new maven archiver
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
index 07a36fe..8c0b6f0 100644
|
index 4b56967..dcf3978 100644
|
||||||
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
@@ -1082,7 +1082,7 @@ public class BundlePlugin extends AbstractMojo
|
@@ -1101,7 +1101,7 @@ public class BundlePlugin extends AbstractMojo
|
||||||
* Grab customized manifest entries from the maven-jar-plugin configuration
|
* Grab customized manifest entries from the maven-jar-plugin configuration
|
||||||
*/
|
*/
|
||||||
MavenArchiveConfiguration archiveConfig = JarPluginConfiguration.getArchiveConfiguration( currentProject );
|
MavenArchiveConfiguration archiveConfig = JarPluginConfiguration.getArchiveConfiguration( currentProject );
|
||||||
@ -21,5 +21,5 @@ index 07a36fe..8c0b6f0 100644
|
|||||||
|
|
||||||
Manifest mavenManifest = new Manifest();
|
Manifest mavenManifest = new Manifest();
|
||||||
--
|
--
|
||||||
2.5.5
|
2.7.4
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From b7bc677d48dd8b5a2b491dddd607ecaad41a1128 Mon Sep 17 00:00:00 2001
|
From 0110a0dc8c3559b4a0a5c88c9883a07bef605233 Mon Sep 17 00:00:00 2001
|
||||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
Date: Thu, 12 May 2016 09:24:36 +0200
|
Date: Thu, 12 May 2016 09:24:36 +0200
|
||||||
Subject: [PATCH 3/3] Port to plexus-utils 3.0.24
|
Subject: [PATCH 3/3] Port to plexus-utils 3.0.24
|
||||||
@ -8,10 +8,10 @@ Subject: [PATCH 3/3] Port to plexus-utils 3.0.24
|
|||||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
index 8c0b6f0..02e53fe 100644
|
index dcf3978..8ddf111 100644
|
||||||
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
@@ -1784,7 +1784,14 @@ public class BundlePlugin extends AbstractMojo
|
@@ -1803,7 +1803,14 @@ public class BundlePlugin extends AbstractMojo
|
||||||
File filterFile = new File( i.next() );
|
File filterFile = new File( i.next() );
|
||||||
if ( filterFile.isFile() )
|
if ( filterFile.isFile() )
|
||||||
{
|
{
|
||||||
@ -28,5 +28,5 @@ index 8c0b6f0..02e53fe 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.5.5
|
2.7.4
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
%global site_name maven-bundle-plugin
|
%global site_name maven-bundle-plugin
|
||||||
|
|
||||||
Name: maven-plugin-bundle
|
Name: maven-plugin-bundle
|
||||||
Version: 3.0.1
|
Version: 3.2.0
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Maven Bundle Plugin
|
Summary: Maven Bundle Plugin
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://felix.apache.org
|
URL: http://felix.apache.org
|
||||||
@ -30,7 +30,6 @@ BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer)
|
|||||||
BuildRequires: mvn(org.apache.maven:maven-archiver)
|
BuildRequires: mvn(org.apache.maven:maven-archiver)
|
||||||
BuildRequires: mvn(org.apache.maven:maven-compat)
|
BuildRequires: mvn(org.apache.maven:maven-compat)
|
||||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin)
|
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||||
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl)
|
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl)
|
||||||
@ -87,6 +86,9 @@ rm -r src/main/java/org/apache/maven/shared/dependency
|
|||||||
%doc LICENSE NOTICE
|
%doc LICENSE NOTICE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 19 2016 Michael Simacek <msimacek@redhat.com> - 3.2.0-1
|
||||||
|
- Update to upstream version 3.2.0
|
||||||
|
|
||||||
* Thu May 26 2016 Michael Simacek <msimacek@redhat.com> - 3.0.1-4
|
* Thu May 26 2016 Michael Simacek <msimacek@redhat.com> - 3.0.1-4
|
||||||
- Remove aqute downgrade patch
|
- Remove aqute downgrade patch
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user