Update to upstream version 3.3.0

.gitignore

@@ -5,3 +5,4 @@ maven-bundle-plugin-2.0.0-project.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.2.0-source-release.tar.gz
+/maven-bundle-plugin-3.3.0-source-release.tar.gz

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

@@ -1,4 +1,4 @@
-From b173320e3dca5637136055427829a4f7198838d4 Mon Sep 17 00:00:00 2001
+From ebccbeb7befb0f2d02e64a9e15496f46f7a260b2 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Fri, 12 Feb 2016 09:45:20 +0100
 Subject: [PATCH 1/4] Port to current maven-dependency-tree
@@ -10,7 +10,7 @@ Subject: [PATCH 1/4] Port to current maven-dependency-tree
  3 files changed, 46 insertions(+), 40 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index d3ec096..db1134f 100644
+index c64ff31..8231d7c 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -187,7 +187,7 @@
@@ -23,7 +23,7 @@ index d3ec096..db1134f 100644
    <dependency>
     <groupId>org.codehaus.plexus</groupId>
 diff --git a/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
-index 5d095d8..b32b90b 100644
+index f3b5509..6591923 100644
 --- a/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
 +++ b/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
 @@ -21,8 +21,10 @@ package org.apache.felix.bundleplugin;
@@ -164,7 +164,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
-index a4f0db1..4b56967 100644
+index 67d0915..c3e9366 100644
 --- a/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;
@@ -195,7 +195,7 @@ index a4f0db1..4b56967 100644
      /**
       * The dependency graph builder to use.
       */
-@@ -350,7 +347,10 @@ public class BundlePlugin extends AbstractMojo
+@@ -347,7 +344,10 @@ public class BundlePlugin extends AbstractMojo
          DependencyNode dependencyGraph;
          try
          {
@@ -207,7 +207,7 @@ index a4f0db1..4b56967 100644
          }
          catch ( DependencyGraphBuilderException e )
          {
-@@ -758,7 +758,7 @@ public class BundlePlugin extends AbstractMojo
+@@ -755,7 +755,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
      // POM accordingly.
      private void createDependencyReducedPom( Set<String> artifactsToRemove )
@@ -216,7 +216,7 @@ index a4f0db1..4b56967 100644
      {
          Model model = project.getOriginalModel();
          List<Dependency> dependencies = new ArrayList<Dependency>();
-@@ -901,24 +901,26 @@ public class BundlePlugin extends AbstractMojo
+@@ -898,24 +898,26 @@ public class BundlePlugin extends AbstractMojo
      }
  
      public boolean updateExcludesInDeps( MavenProject project, List<Dependency> dependencies, List<Dependency> transitiveDeps )
@@ -251,5 +251,5 @@ index a4f0db1..4b56967 100644
                      //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
 -- 
-2.7.4
+2.9.3
 

0002-Fix-for-new-maven-archiver.patch

@@ -1,4 +1,4 @@
-From 8e244ca6810e4e4d93e21e63c9d83e815c2e403d Mon Sep 17 00:00:00 2001
+From ecd5fa65f16f1035c1cef1b6c5578eda532c0005 Mon Sep 17 00:00:00 2001
 From: Mat Booth <mat.booth@redhat.com>
 Date: Thu, 14 Apr 2016 17:00:23 +0100
 Subject: [PATCH 2/4] Fix for new maven archiver
@@ -8,10 +8,10 @@ Subject: [PATCH 2/4] Fix for new maven archiver
  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
-index 4b56967..dcf3978 100644
+index c3e9366..15abd0e 100644
 --- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 +++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-@@ -1101,7 +1101,7 @@ public class BundlePlugin extends AbstractMojo
+@@ -1098,7 +1098,7 @@ public class BundlePlugin extends AbstractMojo
               * Grab customized manifest entries from the maven-jar-plugin configuration
               */
              MavenArchiveConfiguration archiveConfig = JarPluginConfiguration.getArchiveConfiguration( currentProject );
@@ -21,5 +21,5 @@ index 4b56967..dcf3978 100644
  
              Manifest mavenManifest = new Manifest();
 -- 
-2.7.4
+2.9.3
 

0003-Port-to-plexus-utils-3.0.24.patch

@@ -1,4 +1,4 @@
-From 82bf76df538a57f823499e613aba13876429d651 Mon Sep 17 00:00:00 2001
+From 15dd54ee8552138a46719db7560a7e71871c5ee3 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Thu, 12 May 2016 09:24:36 +0200
 Subject: [PATCH 3/4] Port to plexus-utils 3.0.24
@@ -9,7 +9,7 @@ Subject: [PATCH 3/4] Port to plexus-utils 3.0.24
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index db1134f..8749fdd 100644
+index 8231d7c..ca63d8d 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -192,7 +192,7 @@
@@ -22,7 +22,7 @@ index db1134f..8749fdd 100644
    <dependency>
     <groupId>org.sonatype.plexus</groupId>
 diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-index dcf3978..8ddf111 100644
+index 15abd0e..9ebd1a4 100644
 --- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 +++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 @@ -1803,7 +1803,14 @@ public class BundlePlugin extends AbstractMojo
@@ -42,5 +42,5 @@ index dcf3978..8ddf111 100644
          }
  
 -- 
-2.7.4
+2.9.3
 

0004-Use-Maven-3-APIs.patch

@@ -1,4 +1,4 @@
-From 971aaa7a15ac327c83bd3ce34d08c4d72fc074d0 Mon Sep 17 00:00:00 2001
+From e0ba1232e2e65ffb4745901c7111ab3f4e82ac67 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Wed, 12 Oct 2016 23:43:00 +0200
 Subject: [PATCH 4/4] Use Maven 3 APIs
@@ -9,7 +9,7 @@ Subject: [PATCH 4/4] Use Maven 3 APIs
  2 files changed, 13 insertions(+), 8 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 8749fdd..6deaf4f 100644
+index ca63d8d..ac8ca9a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -177,7 +177,17 @@
@@ -44,7 +44,7 @@ index 8749fdd..6deaf4f 100644
  
   <reporting>
 diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
-index 8ddf111..da41aa1 100644
+index 9ebd1a4..27d9dc4 100644
 --- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 +++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 @@ -46,7 +46,6 @@ import java.util.TreeMap;
@@ -63,7 +63,7 @@ index 8ddf111..da41aa1 100644
  import org.apache.maven.plugin.AbstractMojo;
  import org.apache.maven.plugin.MojoExecutionException;
  import org.apache.maven.plugin.MojoFailureException;
-@@ -864,7 +864,7 @@ public class BundlePlugin extends AbstractMojo
+@@ -861,7 +861,7 @@ public class BundlePlugin extends AbstractMojo
  
                  try
                  {
@@ -73,5 +73,5 @@ index 8ddf111..da41aa1 100644
                  finally
                  {
 -- 
-2.7.4
+2.9.3
 

maven-plugin-bundle.spec

@@ -6,8 +6,8 @@
 %global site_name maven-bundle-plugin
 
 Name:           maven-plugin-bundle
-Version:        3.2.0
+Version:        3.3.0
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Maven Bundle Plugin
 License:        ASL 2.0
 URL:            http://felix.apache.org
@@ -111,6 +111,9 @@ rm -f src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
 %doc LICENSE NOTICE
 
 %changelog
+* Wed Mar 29 2017 Michael Simacek <msimacek@redhat.com> - 3.3.0-1
+- Update to upstream version 3.3.0
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

sources

@@ -1 +1 @@
-33c238220f8ff1535198909213b0f845  maven-bundle-plugin-3.2.0-source-release.tar.gz
+SHA512 (maven-bundle-plugin-3.3.0-source-release.tar.gz) = ee9f4c2f70564604629b73bef338623740977cf1ba5af10853249712b46fad5fac90ce3c41b733548d3feab0843a0c36f34061d6c0ed72e3690769325e812ee6