From 68e925975621b3d15c7a51c82e1290bb53c305a9 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 2 Jan 2018 14:31:49 +0100 Subject: [PATCH] Update to upstream version 3.4.0 --- .gitignore | 1 + ...ort-to-current-maven-dependency-tree.patch | 356 +++++++++--------- 0002-Fix-for-new-maven-archiver.patch | 22 +- 0003-Port-to-plexus-utils-3.0.24.patch | 40 +- 0004-Use-Maven-3-APIs.patch | 90 ++--- maven-plugin-bundle.spec | 7 +- sources | 2 +- 7 files changed, 261 insertions(+), 257 deletions(-) diff --git a/.gitignore b/.gitignore index 83c6bf9..4207792 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ maven-bundle-plugin-2.0.0-project.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 +/maven-bundle-plugin-3.4.0-source-release.tar.gz diff --git a/0001-Port-to-current-maven-dependency-tree.patch b/0001-Port-to-current-maven-dependency-tree.patch index 7d5684e..f827d9d 100644 --- a/0001-Port-to-current-maven-dependency-tree.patch +++ b/0001-Port-to-current-maven-dependency-tree.patch @@ -1,4 +1,4 @@ -From ebccbeb7befb0f2d02e64a9e15496f46f7a260b2 Mon Sep 17 00:00:00 2001 +From f04e7a4e7ce6e7f9248d142c14b1e98df0e3b9a9 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 12 Feb 2016 09:45:20 +0100 Subject: [PATCH 1/4] Port to current maven-dependency-tree @@ -10,246 +10,246 @@ 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 c64ff31..8231d7c 100644 +index 4e5b9b2..05e798f 100644 --- a/pom.xml +++ b/pom.xml -@@ -187,7 +187,7 @@ - - org.apache.maven.shared - maven-dependency-tree -- 2.1 +@@ -189,7 +189,7 @@ + + org.apache.maven.shared + maven-dependency-tree +- 2.1 + 3.0 - - - org.codehaus.plexus + + + org.codehaus.plexus diff --git a/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java -index f3b5509..6591923 100644 +index 5d095d8..b32b90b 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; - - import java.io.File; - import java.io.FilenameFilter; + + import java.io.File; + import java.io.FilenameFilter; +import java.util.ArrayDeque; - import java.util.Arrays; - import java.util.Collection; + import java.util.Arrays; + import java.util.Collection; +import java.util.Deque; - import java.util.HashSet; - import java.util.Iterator; - import java.util.LinkedHashMap; + import java.util.HashSet; + import java.util.Iterator; + import java.util.LinkedHashMap; @@ -38,7 +40,6 @@ import org.apache.maven.artifact.Artifact; - import org.apache.maven.artifact.factory.ArtifactFactory; - import org.apache.maven.artifact.metadata.ArtifactMetadataSource; - import org.apache.maven.artifact.repository.ArtifactRepository; --import org.apache.maven.artifact.resolver.ArtifactCollector; - import org.apache.maven.artifact.resolver.ArtifactNotFoundException; - import org.apache.maven.artifact.resolver.ArtifactResolutionException; - import org.apache.maven.artifact.resolver.ArtifactResolver; + import org.apache.maven.artifact.factory.ArtifactFactory; + import org.apache.maven.artifact.metadata.ArtifactMetadataSource; + import org.apache.maven.artifact.repository.ArtifactRepository; +-import org.apache.maven.artifact.resolver.ArtifactCollector; + import org.apache.maven.artifact.resolver.ArtifactNotFoundException; + import org.apache.maven.artifact.resolver.ArtifactResolutionException; + import org.apache.maven.artifact.resolver.ArtifactResolver; @@ -49,13 +50,14 @@ import org.apache.maven.plugins.annotations.LifecyclePhase; - import org.apache.maven.plugins.annotations.Mojo; - import org.apache.maven.plugins.annotations.Parameter; - import org.apache.maven.plugins.annotations.ResolutionScope; + import org.apache.maven.plugins.annotations.Mojo; + import org.apache.maven.plugins.annotations.Parameter; + import org.apache.maven.plugins.annotations.ResolutionScope; +import org.apache.maven.project.DefaultProjectBuildingRequest; - import org.apache.maven.project.MavenProject; - import org.apache.maven.project.MavenProjectBuilder; - import org.apache.maven.project.ProjectBuildingException; + import org.apache.maven.project.MavenProject; + import org.apache.maven.project.MavenProjectBuilder; + import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingRequest; - import org.apache.maven.project.artifact.InvalidDependencyVersionException; --import org.apache.maven.shared.dependency.tree.DependencyNode; --import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; --import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; + import org.apache.maven.project.artifact.InvalidDependencyVersionException; +-import org.apache.maven.shared.dependency.tree.DependencyNode; +-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; +-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; +import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException; +import org.apache.maven.shared.dependency.graph.DependencyNode; - import org.codehaus.plexus.util.FileUtils; - - import aQute.bnd.osgi.Analyzer; + import org.codehaus.plexus.util.FileUtils; + + import aQute.bnd.osgi.Analyzer; @@ -92,24 +94,18 @@ public class BundleAllPlugin extends ManifestPlugin - */ - @Parameter( property = "wrapImportPackage", defaultValue = "*" ) - private String wrapImportPackage; -- - @Component - private ArtifactFactory m_factory; - - @Component - private ArtifactMetadataSource m_artifactMetadataSource; - -- @Component -- private ArtifactCollector m_collector; -- - /** - * Artifact resolver, needed to download jars. - */ - @Component - private ArtifactResolver m_artifactResolver; - -- @Component -- private DependencyTreeBuilder m_dependencyTreeBuilder; - - @Component - private MavenProjectBuilder m_mavenProjectBuilder; + */ + @Parameter( property = "wrapImportPackage", defaultValue = "*" ) + private String wrapImportPackage; +- + @Component + private ArtifactFactory m_factory; + + @Component + private ArtifactMetadataSource m_artifactMetadataSource; + +- @Component +- private ArtifactCollector m_collector; +- + /** + * Artifact resolver, needed to download jars. + */ + @Component + private ArtifactResolver m_artifactResolver; + +- @Component +- private DependencyTreeBuilder m_dependencyTreeBuilder; + + @Component + private MavenProjectBuilder m_mavenProjectBuilder; @@ -180,17 +176,19 @@ public class BundleAllPlugin extends ManifestPlugin - - try - { -- dependencyTree = m_dependencyTreeBuilder.buildDependencyTree( project, localRepository, m_factory, -- m_artifactMetadataSource, null, m_collector ); + + try + { +- dependencyTree = m_dependencyTreeBuilder.buildDependencyTree( project, localRepository, m_factory, +- m_artifactMetadataSource, null, m_collector ); + ProjectBuildingRequest request = new DefaultProjectBuildingRequest(); + request.setProject(getProject()); + request.setRepositorySession(session.getRepositorySession()); + dependencyTree = m_dependencyGraphBuilder.buildDependencyGraph(request, null); - } -- catch ( DependencyTreeBuilderException e ) + } +- catch ( DependencyTreeBuilderException e ) + catch ( DependencyGraphBuilderException e ) - { - throw new MojoExecutionException( "Unable to build dependency tree", e ); - } - - BundleInfo bundleInfo = new BundleInfo(); - -- if ( !dependencyTree.hasChildren() ) + { + throw new MojoExecutionException( "Unable to build dependency tree", e ); + } + + BundleInfo bundleInfo = new BundleInfo(); + +- if ( !dependencyTree.hasChildren() ) + if ( dependencyTree.getChildren().isEmpty()) - { - /* no need to traverse the tree */ - return bundleRoot( project, bundleInfo ); + { + /* no need to traverse the tree */ + return bundleRoot( project, bundleInfo ); @@ -198,20 +196,27 @@ public class BundleAllPlugin extends ManifestPlugin - - getLog().debug( "Will bundle the following dependency tree" + LS + dependencyTree ); - -- for ( Iterator it = dependencyTree.inverseIterator(); it.hasNext(); ) + + getLog().debug( "Will bundle the following dependency tree" + LS + dependencyTree ); + +- for ( Iterator it = dependencyTree.inverseIterator(); it.hasNext(); ) + Deque stack = new ArrayDeque(); + stack.push(dependencyTree); + Set visited = new HashSet(); + while (!stack.isEmpty()) - { -- DependencyNode node = ( DependencyNode ) it.next(); -- if ( !it.hasNext() ) + { +- DependencyNode node = ( DependencyNode ) it.next(); +- if ( !it.hasNext() ) + DependencyNode node = stack.pop(); + if (visited.contains(node)) - { -- /* this is the root, current project */ -- break; + { +- /* this is the root, current project */ +- break; + continue; - } -- -- if ( node.getState() != DependencyNode.INCLUDED ) + } +- +- if ( node.getState() != DependencyNode.INCLUDED ) + visited.add(node); + if (node.getChildren() != null) - { -- continue; + { +- continue; + stack.addAll(node.getChildren()); - } - + } + + //if ( node.getState() != DependencyNode.INCLUDED ) + //{ + // continue; + //} + - if ( Artifact.SCOPE_SYSTEM.equals( node.getArtifact().getScope() ) ) - { - getLog().debug( "Ignoring system scoped artifact " + node.getArtifact() ); + if ( Artifact.SCOPE_SYSTEM.equals( node.getArtifact().getScope() ) ) + { + getLog().debug( "Ignoring system scoped artifact " + node.getArtifact() ); @@ -235,12 +240,11 @@ public class BundleAllPlugin extends ManifestPlugin - - node.getArtifact().setFile( artifact.getFile() ); - -- int nodeDepth = node.getDepth(); -- if ( nodeDepth > maxDepth ) + + node.getArtifact().setFile( artifact.getFile() ); + +- int nodeDepth = node.getDepth(); +- if ( nodeDepth > maxDepth ) + if ( stack.size() > maxDepth ) - { - /* node is deeper than we want */ - getLog().debug( -- "Ignoring " + node.getArtifact() + ", depth is " + nodeDepth + ", bigger than " + maxDepth ); + { + /* node is deeper than we want */ + getLog().debug( +- "Ignoring " + node.getArtifact() + ", depth is " + nodeDepth + ", bigger than " + maxDepth ); + "Ignoring " + node.getArtifact() + ", depth is " + stack.size() + ", bigger than " + maxDepth ); - continue; - } - + continue; + } + diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java -index 67d0915..c3e9366 100644 +index 426f9d2..bfebfbb 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; - import org.apache.maven.plugins.annotations.Mojo; - import org.apache.maven.plugins.annotations.Parameter; - import org.apache.maven.plugins.annotations.ResolutionScope; + import org.apache.maven.plugins.annotations.Mojo; + import org.apache.maven.plugins.annotations.Parameter; + import org.apache.maven.plugins.annotations.ResolutionScope; +import org.apache.maven.project.DefaultProjectBuildingRequest; - import org.apache.maven.project.MavenProject; - import org.apache.maven.project.MavenProjectBuilder; - import org.apache.maven.project.MavenProjectHelper; - import org.apache.maven.project.ProjectBuildingException; + import org.apache.maven.project.MavenProject; + import org.apache.maven.project.MavenProjectBuilder; + import org.apache.maven.project.MavenProjectHelper; + import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingRequest; - import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder; - import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException; - import org.apache.maven.shared.dependency.graph.DependencyNode; --import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; --import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; - import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter; - import org.apache.maven.shared.osgi.Maven2OsgiConverter; - import org.codehaus.plexus.archiver.UnArchiver; + import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder; + import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException; + import org.apache.maven.shared.dependency.graph.DependencyNode; +-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; +-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; + import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter; + import org.apache.maven.shared.osgi.Maven2OsgiConverter; + import org.codehaus.plexus.archiver.UnArchiver; @@ -225,9 +225,6 @@ public class BundlePlugin extends AbstractMojo - @Component - protected MavenProjectBuilder mavenProjectBuilder; - -- @Component -- private DependencyTreeBuilder dependencyTreeBuilder; -- - /** - * The dependency graph builder to use. - */ + @Component + protected MavenProjectBuilder mavenProjectBuilder; + +- @Component +- private DependencyTreeBuilder dependencyTreeBuilder; +- + /** + * The dependency graph builder to use. + */ @@ -347,7 +344,10 @@ public class BundlePlugin extends AbstractMojo - DependencyNode dependencyGraph; - try - { -- dependencyGraph = m_dependencyGraphBuilder.buildDependencyGraph( mavenProject, null ); + DependencyNode dependencyGraph; + try + { +- dependencyGraph = m_dependencyGraphBuilder.buildDependencyGraph( mavenProject, null ); + ProjectBuildingRequest request = new DefaultProjectBuildingRequest(); + request.setProject(mavenProject); + request.setRepositorySession(session.getRepositorySession()); + dependencyGraph = m_dependencyGraphBuilder.buildDependencyGraph( request, null ); - } - catch ( DependencyGraphBuilderException e ) - { -@@ -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 artifactsToRemove ) -- throws IOException, DependencyTreeBuilderException, ProjectBuildingException + } + catch ( DependencyGraphBuilderException e ) + { +@@ -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 + // POM accordingly. + private void createDependencyReducedPom( Set artifactsToRemove ) +- throws IOException, DependencyTreeBuilderException, ProjectBuildingException + throws IOException, DependencyGraphBuilderException, ProjectBuildingException - { - Model model = project.getOriginalModel(); - List dependencies = new ArrayList(); -@@ -898,24 +898,26 @@ public class BundlePlugin extends AbstractMojo - } - - public boolean updateExcludesInDeps( MavenProject project, List dependencies, List transitiveDeps ) -- throws DependencyTreeBuilderException + { + Model model = project.getOriginalModel(); + List dependencies = new ArrayList(); +@@ -901,24 +901,26 @@ public class BundlePlugin extends AbstractMojo + } + + public boolean updateExcludesInDeps( MavenProject project, List dependencies, List transitiveDeps ) +- throws DependencyTreeBuilderException + throws DependencyGraphBuilderException - { -- org.apache.maven.shared.dependency.tree.DependencyNode node = dependencyTreeBuilder.buildDependencyTree(project, localRepository, artifactFactory, -- artifactMetadataSource, null, -- artifactCollector); + { +- org.apache.maven.shared.dependency.tree.DependencyNode node = dependencyTreeBuilder.buildDependencyTree(project, localRepository, artifactFactory, +- artifactMetadataSource, null, +- artifactCollector); + ProjectBuildingRequest request = new DefaultProjectBuildingRequest(); + request.setProject(project); + request.setRepositorySession(session.getRepositorySession()); + DependencyNode node = dependencyGraphBuilder.buildDependencyGraph(request, null); - boolean modified = false; - Iterator it = node.getChildren().listIterator(); - while ( it.hasNext() ) - { -- org.apache.maven.shared.dependency.tree.DependencyNode n2 = (org.apache.maven.shared.dependency.tree.DependencyNode) it.next(); + boolean modified = false; + Iterator it = node.getChildren().listIterator(); + while ( it.hasNext() ) + { +- org.apache.maven.shared.dependency.tree.DependencyNode n2 = (org.apache.maven.shared.dependency.tree.DependencyNode) it.next(); + DependencyNode n2 = (DependencyNode) it.next(); - Iterator it2 = n2.getChildren().listIterator(); - while ( it2.hasNext() ) - { -- org.apache.maven.shared.dependency.tree.DependencyNode n3 = (org.apache.maven.shared.dependency.tree.DependencyNode) it2.next(); + Iterator it2 = n2.getChildren().listIterator(); + while ( it2.hasNext() ) + { +- org.apache.maven.shared.dependency.tree.DependencyNode n3 = (org.apache.maven.shared.dependency.tree.DependencyNode) it2.next(); + DependencyNode n3 = (DependencyNode) it2.next(); - //anything two levels deep that is marked "included" - //is stuff that was excluded by the original poms, make sure it - //remains excluded IF promoting transitives. -- if ( n3.getState() == org.apache.maven.shared.dependency.tree.DependencyNode.INCLUDED ) + //anything two levels deep that is marked "included" + //is stuff that was excluded by the original poms, make sure it + //remains excluded IF promoting transitives. +- if ( n3.getState() == org.apache.maven.shared.dependency.tree.DependencyNode.INCLUDED ) + //if ( n3.getState() == org.apache.maven.shared.dependency.tree.DependencyNode.INCLUDED ) + if (true) - { - //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 + { + //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.9.3 +2.14.3 diff --git a/0002-Fix-for-new-maven-archiver.patch b/0002-Fix-for-new-maven-archiver.patch index 16f0ad9..493021a 100644 --- a/0002-Fix-for-new-maven-archiver.patch +++ b/0002-Fix-for-new-maven-archiver.patch @@ -1,4 +1,4 @@ -From ecd5fa65f16f1035c1cef1b6c5578eda532c0005 Mon Sep 17 00:00:00 2001 +From 3c3ca1818774e9bc6763face9d2a4b23d788488e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 14 Apr 2016 17:00:23 +0100 Subject: [PATCH 2/4] Fix for new maven archiver @@ -8,18 +8,18 @@ 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 c3e9366..15abd0e 100644 +index bfebfbb..2b8ae02 100644 --- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java +++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java -@@ -1098,7 +1098,7 @@ public class BundlePlugin extends AbstractMojo - * Grab customized manifest entries from the maven-jar-plugin configuration - */ - MavenArchiveConfiguration archiveConfig = JarPluginConfiguration.getArchiveConfiguration( currentProject ); -- String mavenManifestText = new MavenArchiver().getManifest( currentProject, archiveConfig ).toString(); +@@ -1101,7 +1101,7 @@ public class BundlePlugin extends AbstractMojo + * Grab customized manifest entries from the maven-jar-plugin configuration + */ + MavenArchiveConfiguration archiveConfig = JarPluginConfiguration.getArchiveConfiguration( currentProject ); +- String mavenManifestText = new MavenArchiver().getManifest( currentProject, archiveConfig ).toString(); + String mavenManifestText = new MavenArchiver().getManifest( m_mavenSession, currentProject, archiveConfig ).toString(); - addMavenDescriptor = addMavenDescriptor && archiveConfig.isAddMavenDescriptor(); - - Manifest mavenManifest = new Manifest(); + addMavenDescriptor = addMavenDescriptor && archiveConfig.isAddMavenDescriptor(); + + Manifest mavenManifest = new Manifest(); -- -2.9.3 +2.14.3 diff --git a/0003-Port-to-plexus-utils-3.0.24.patch b/0003-Port-to-plexus-utils-3.0.24.patch index d1edd47..b481e98 100644 --- a/0003-Port-to-plexus-utils-3.0.24.patch +++ b/0003-Port-to-plexus-utils-3.0.24.patch @@ -1,4 +1,4 @@ -From 15dd54ee8552138a46719db7560a7e71871c5ee3 Mon Sep 17 00:00:00 2001 +From 7d270867e5c02d4523d1de321c6e69e8da8c49a2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2016 09:24:36 +0200 Subject: [PATCH 3/4] Port to plexus-utils 3.0.24 @@ -9,27 +9,27 @@ 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 8231d7c..ca63d8d 100644 +index 05e798f..aed3155 100644 --- a/pom.xml +++ b/pom.xml -@@ -192,7 +192,7 @@ - - org.codehaus.plexus - plexus-utils -- 3.0.10 +@@ -194,7 +194,7 @@ + + org.codehaus.plexus + plexus-utils +- 3.0.10 + 3.0.24 - - - org.sonatype.plexus + + + org.sonatype.plexus diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java -index 15abd0e..9ebd1a4 100644 +index 2b8ae02..6bab369 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 - File filterFile = new File( i.next() ); - if ( filterFile.isFile() ) - { -- properties.putAll( PropertyUtils.loadProperties( filterFile ) ); +@@ -1806,7 +1806,14 @@ public class BundlePlugin extends AbstractMojo + File filterFile = new File( i.next() ); + if ( filterFile.isFile() ) + { +- properties.putAll( PropertyUtils.loadProperties( filterFile ) ); + try + { + properties.putAll( PropertyUtils.loadProperties( filterFile ) ); @@ -38,9 +38,9 @@ index 15abd0e..9ebd1a4 100644 + { + // Ignore + } - } - } - + } + } + -- -2.9.3 +2.14.3 diff --git a/0004-Use-Maven-3-APIs.patch b/0004-Use-Maven-3-APIs.patch index 778b8b8..a27c2ea 100644 --- a/0004-Use-Maven-3-APIs.patch +++ b/0004-Use-Maven-3-APIs.patch @@ -1,4 +1,4 @@ -From e0ba1232e2e65ffb4745901c7111ab3f4e82ac67 Mon Sep 17 00:00:00 2001 +From 5fa49250fafc8895ec99d55f76a0d7f57fc70a40 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 12 Oct 2016 23:43:00 +0200 Subject: [PATCH 4/4] Use Maven 3 APIs @@ -9,14 +9,14 @@ Subject: [PATCH 4/4] Use Maven 3 APIs 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml -index ca63d8d..ac8ca9a 100644 +index aed3155..7556d8b 100644 --- a/pom.xml +++ b/pom.xml -@@ -177,7 +177,17 @@ - - org.apache.maven - maven-core -- 2.2.0 +@@ -179,7 +179,17 @@ + + org.apache.maven + maven-core +- 2.2.0 + 3.3.9 + + @@ -28,50 +28,50 @@ index ca63d8d..ac8ca9a 100644 + org.apache.maven.reporting + maven-reporting-impl + 2.4 - - - org.apache.maven -@@ -221,11 +231,6 @@ - 1.1 - test - -- -- org.jdom -- jdom -- 1.1 -- - - - + + + org.apache.maven +@@ -223,11 +233,6 @@ + 1.1 + test + +- +- org.jdom +- jdom +- 1.1 +- + + + diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java -index 9ebd1a4..27d9dc4 100644 +index 6bab369..050a922 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; - import java.util.jar.Attributes; - import java.util.jar.Manifest; - --import org.apache.felix.bundleplugin.pom.PomWriter; - import org.apache.maven.archiver.ManifestSection; - import org.apache.maven.archiver.MavenArchiveConfiguration; - import org.apache.maven.archiver.MavenArchiver; + import java.util.jar.Attributes; + import java.util.jar.Manifest; + +-import org.apache.felix.bundleplugin.pom.PomWriter; + import org.apache.maven.archiver.ManifestSection; + import org.apache.maven.archiver.MavenArchiveConfiguration; + import org.apache.maven.archiver.MavenArchiver; @@ -63,6 +62,7 @@ import org.apache.maven.model.Exclusion; - import org.apache.maven.model.License; - import org.apache.maven.model.Model; - import org.apache.maven.model.Resource; + import org.apache.maven.model.License; + import org.apache.maven.model.Model; + import org.apache.maven.model.Resource; +import org.apache.maven.model.io.xpp3.MavenXpp3Writer; - import org.apache.maven.plugin.AbstractMojo; - import org.apache.maven.plugin.MojoExecutionException; - import org.apache.maven.plugin.MojoFailureException; -@@ -861,7 +861,7 @@ public class BundlePlugin extends AbstractMojo - - try - { -- PomWriter.write( w, model, true ); + 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 + + try + { +- PomWriter.write( w, model, true ); + new MavenXpp3Writer().write( w, model ); - } - finally - { + } + finally + { -- -2.9.3 +2.14.3 diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec index 9504dc8..0bcb8a3 100644 --- a/maven-plugin-bundle.spec +++ b/maven-plugin-bundle.spec @@ -6,8 +6,8 @@ %global site_name maven-bundle-plugin Name: maven-plugin-bundle -Version: 3.3.0 -Release: 2%{?dist} +Version: 3.4.0 +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 +* Tue Jan 02 2018 Michael Simacek - 3.4.0-1 +- Update to upstream version 3.4.0 + * Wed Jul 26 2017 Fedora Release Engineering - 3.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 351c984..b9b598c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-bundle-plugin-3.3.0-source-release.tar.gz) = ee9f4c2f70564604629b73bef338623740977cf1ba5af10853249712b46fad5fac90ce3c41b733548d3feab0843a0c36f34061d6c0ed72e3690769325e812ee6 +SHA512 (maven-bundle-plugin-3.4.0-source-release.tar.gz) = a5f029ab42b1b8622827907eb8136309cfc4d7e49dd9c0431669c35ff249c6ad78be845941c88b86c2cf7033204d1f29a6162058db0290025b1086be28adf6a1