Update to upstream version 4.2.0
This commit is contained in:
Marian Koncek
parent
95325206ac
commit
2446116bd2
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@ maven-bundle-plugin-2.0.0-project.tar.gz
|
||||
/maven-bundle-plugin-3.3.0-source-release.tar.gz
|
||||
/maven-bundle-plugin-3.4.0-source-release.tar.gz
|
||||
/maven-bundle-plugin-3.5.0-source-release.tar.gz
|
||||
/maven-bundle-plugin-4.2.0-source-release.tar.gz
|
||||
|
||||
@ -13,243 +13,236 @@ diff --git a/pom.xml b/pom.xml
|
||||
index dfbf237..46b2ba6 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -189,7 +189,7 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.shared</groupId>
|
||||
<artifactId>maven-dependency-tree</artifactId>
|
||||
- <version>2.1</version>
|
||||
@@ -192,7 +192,7 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.shared</groupId>
|
||||
<artifactId>maven-dependency-tree</artifactId>
|
||||
- <version>2.1</version>
|
||||
+ <version>3.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
</dependency>
|
||||
<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 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;
|
||||
|
||||
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<DependencyNode> stack = new ArrayDeque<DependencyNode>();
|
||||
+ stack.push(dependencyTree);
|
||||
+ Set<DependencyNode> visited = new HashSet<DependencyNode>();
|
||||
+ 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 1dcf1c1..3e4384e 100644
|
||||
index 395340d..987a55c 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;
|
||||
@@ -73,12 +73,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.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.shared.dependency.tree.DependencyTreeBuilder;
|
||||
-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
|
||||
+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;
|
||||
@@ -225,9 +225,6 @@ public class BundlePlugin extends AbstractMojo
|
||||
@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 );
|
||||
+ ProjectBuildingRequest request = new DefaultProjectBuildingRequest();
|
||||
+ request.setProject(mavenProject);
|
||||
+ request.setRepositorySession(session.getRepositorySession());
|
||||
+ dependencyGraph = m_dependencyGraphBuilder.buildDependencyGraph( request, null );
|
||||
}
|
||||
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<String> artifactsToRemove )
|
||||
- throws IOException, DependencyTreeBuilderException, ProjectBuildingException
|
||||
+ throws IOException, DependencyGraphBuilderException, ProjectBuildingException
|
||||
{
|
||||
Model model = project.getOriginalModel();
|
||||
List<Dependency> dependencies = new ArrayList<Dependency>();
|
||||
@@ -901,24 +901,26 @@ public class BundlePlugin extends AbstractMojo
|
||||
}
|
||||
|
||||
public boolean updateExcludesInDeps( MavenProject project, List<Dependency> dependencies, List<Dependency> transitiveDeps )
|
||||
- throws DependencyTreeBuilderException
|
||||
+ throws DependencyGraphBuilderException
|
||||
{
|
||||
- org.apache.maven.shared.dependency.tree.DependencyNode node = dependencyTreeBuilder.buildDependencyTree(project, localRepository, artifactFactory,
|
||||
- artifactMetadataSource, null,
|
||||
- artifactCollector);
|
||||
+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.osgi.DefaultMaven2OsgiConverter;
|
||||
import org.apache.maven.shared.osgi.Maven2OsgiConverter;
|
||||
import org.codehaus.plexus.archiver.UnArchiver;
|
||||
@@ -209,6 +212,9 @@ public class BundlePlugin extends AbstractMojo
|
||||
@Component
|
||||
private ArtifactHandlerManager m_artifactHandlerManager;
|
||||
|
||||
+ @Component
|
||||
+ protected DependencyGraphBuilder m_dependencyGraphBuilder;
|
||||
+
|
||||
/* The current Maven session. */
|
||||
@Parameter( defaultValue = "${session}", readonly = true )
|
||||
protected MavenSession session;
|
||||
@@ -221,7 +227,7 @@ public class BundlePlugin extends AbstractMojo
|
||||
protected MavenProjectBuilder mavenProjectBuilder;
|
||||
|
||||
@Component
|
||||
- private DependencyTreeBuilder dependencyTreeBuilder;
|
||||
+ private DependencyGraphBuilder dependencyGraphBuilder;
|
||||
|
||||
@Component
|
||||
private ArtifactMetadataSource artifactMetadataSource;
|
||||
@@ -735,7 +741,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 )
|
||||
- throws IOException, ProjectBuildingException, DependencyTreeBuilderException {
|
||||
+ throws IOException, ProjectBuildingException, DependencyGraphBuilderException {
|
||||
Model model = project.getOriginalModel();
|
||||
List<Dependency> dependencies = new ArrayList<Dependency>();
|
||||
|
||||
@@ -873,20 +879,22 @@ public class BundlePlugin extends AbstractMojo
|
||||
}
|
||||
|
||||
public boolean updateExcludesInDeps( MavenProject project, List<Dependency> dependencies, List<Dependency> transitiveDeps )
|
||||
- throws DependencyTreeBuilderException
|
||||
+ throws DependencyGraphBuilderException
|
||||
{
|
||||
- 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();
|
||||
+ 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();
|
||||
+ 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 )
|
||||
+ //if ( n3.getState() == org.apache.maven.shared.dependency.tree.DependencyNode.INCLUDED )
|
||||
boolean modified = false;
|
||||
- for (org.apache.maven.shared.dependency.tree.DependencyNode n2 : node.getChildren())
|
||||
+ for (org.apache.maven.shared.dependency.graph.DependencyNode n2 : node.getChildren())
|
||||
{
|
||||
- for (org.apache.maven.shared.dependency.tree.DependencyNode n3 : n2.getChildren())
|
||||
+ for (org.apache.maven.shared.dependency.graph.DependencyNode n3 : n2.getChildren())
|
||||
{
|
||||
//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.14.3
|
||||
|
||||
|
||||
@ -1,25 +1,25 @@
|
||||
From 17a505c7c7924540f9636e3cd2700cc25a59447e 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
|
||||
|
||||
---
|
||||
src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java | 2 +-
|
||||
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 3e4384e..a42d6ef 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
|
||||
From 17a505c7c7924540f9636e3cd2700cc25a59447e 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
|
||||
|
||||
---
|
||||
src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java | 2 +-
|
||||
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 3e4384e..a42d6ef 100644
|
||||
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||
@@ -1104,7 +1104,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();
|
||||
+ String mavenManifestText = new MavenArchiver().getManifest( m_mavenSession, currentProject, archiveConfig ).toString();
|
||||
addMavenDescriptor = addMavenDescriptor && archiveConfig.isAddMavenDescriptor();
|
||||
|
||||
Manifest mavenManifest = new Manifest();
|
||||
--
|
||||
2.14.3
|
||||
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
||||
@ -1,46 +1,46 @@
|
||||
From 5e514316b5cfbe769b21dc089e2631a9c302dd19 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
|
||||
|
||||
---
|
||||
pom.xml | 2 +-
|
||||
src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java | 9 ++++++++-
|
||||
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 46b2ba6..144f5ad 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -194,7 +194,7 @@
|
||||
From 5e514316b5cfbe769b21dc089e2631a9c302dd19 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
|
||||
|
||||
---
|
||||
pom.xml | 2 +-
|
||||
src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java | 9 ++++++++-
|
||||
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 46b2ba6..144f5ad 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -197,7 +197,7 @@
|
||||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-utils</artifactId>
|
||||
- <version>3.0.10</version>
|
||||
+ <version>3.0.24</version>
|
||||
+ <version>3.0.24</version>
|
||||
</dependency>
|
||||
<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 a42d6ef..c858b6b 100644
|
||||
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||
@@ -1806,7 +1806,14 @@ public class BundlePlugin extends AbstractMojo
|
||||
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||
index a42d6ef..c858b6b 100644
|
||||
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||
@@ -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 ) );
|
||||
+ }
|
||||
+ catch ( IOException exc )
|
||||
+ {
|
||||
+ // Ignore
|
||||
+ }
|
||||
+ try
|
||||
+ {
|
||||
+ properties.putAll( PropertyUtils.loadProperties( filterFile ) );
|
||||
+ }
|
||||
+ catch ( IOException exc )
|
||||
+ {
|
||||
+ // Ignore
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.14.3
|
||||
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
||||
@ -9,69 +9,50 @@ Subject: [PATCH 4/4] Use Maven 3 APIs
|
||||
2 files changed, 13 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 144f5ad..cf3d7dc 100644
|
||||
index b1fc107..5fc0a36 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -179,7 +179,17 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
<artifactId>maven-core</artifactId>
|
||||
- <version>2.2.0</version>
|
||||
+ <version>3.3.9</version>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.maven</groupId>
|
||||
+ <artifactId>maven-compat</artifactId>
|
||||
+ <version>3.3.9</version>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.maven.reporting</groupId>
|
||||
+ <artifactId>maven-reporting-impl</artifactId>
|
||||
+ <version>2.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
@@ -223,11 +233,6 @@
|
||||
<version>1.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.jdom</groupId>
|
||||
- <artifactId>jdom</artifactId>
|
||||
- <version>1.1</version>
|
||||
- </dependency>
|
||||
</dependencies>
|
||||
|
||||
<reporting>
|
||||
@@ -252,11 +252,6 @@
|
||||
<version>1.1.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.jdom</groupId>
|
||||
- <artifactId>jdom</artifactId>
|
||||
- <version>1.1</version>
|
||||
- </dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||
index c858b6b..5023569 100644
|
||||
index 987a55c..05e77b0 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;
|
||||
@@ -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;
|
||||
@@ -47,7 +47,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;
|
||||
@@ -64,6 +63,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.io.xpp3.MavenXpp3Writer;
|
||||
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 );
|
||||
import org.apache.maven.plugin.AbstractMojo;
|
||||
import org.apache.maven.plugin.MojoExecutionException;
|
||||
import org.apache.maven.plugin.MojoFailureException;
|
||||
@@ -842,7 +842,7 @@ public class BundlePlugin extends AbstractMojo
|
||||
|
||||
try
|
||||
{
|
||||
- PomWriter.write( w, model, true );
|
||||
+ new MavenXpp3Writer().write( w, model );
|
||||
}
|
||||
finally
|
||||
{
|
||||
}
|
||||
finally
|
||||
{
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
||||
@ -1,14 +1,12 @@
|
||||
%global site_name maven-bundle-plugin
|
||||
|
||||
Name: maven-plugin-bundle
|
||||
Version: 3.5.0
|
||||
Release: 3%{?dist}
|
||||
Version: 4.2.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Maven Bundle Plugin
|
||||
License: ASL 2.0
|
||||
URL: http://felix.apache.org
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/felix/{%site_name}/%{version}/%{site_name}-%{version}-source-release.tar.gz
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/felix/maven-bundle-plugin/%{version}/maven-bundle-plugin-%{version}-source-release.tar.gz
|
||||
|
||||
# Needs polishing to be sent upstream
|
||||
Patch0: 0001-Port-to-current-maven-dependency-tree.patch
|
||||
@ -45,7 +43,7 @@ Summary: Javadoc for %{name}
|
||||
API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{site_name}-%{version}
|
||||
%setup -q -n maven-bundle-plugin-%{version}
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
@ -71,7 +69,6 @@ rm -rf src/main/java/org/apache/felix/obrplugin/
|
||||
rm -f src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
|
||||
%pom_remove_dep :doxia-sink-api
|
||||
%pom_remove_dep :doxia-site-renderer
|
||||
%pom_remove_dep :maven-reporting-impl
|
||||
|
||||
%build
|
||||
# Tests depend on bundled JARs
|
||||
@ -87,6 +84,9 @@ rm -f src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Tue Jun 04 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.0-1
|
||||
- Update to upstream version 4.2.0
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.0-3
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (maven-bundle-plugin-3.5.0-source-release.tar.gz) = 81f81d61c7c8739788caa22ec615a3bfb6b753e81d8cb05cfaf3bcc5d936877caea5d75c3ac911fed75e0b3bf9822b258ac5f1d5564f88d569bf5102313841f0
|
||||
SHA512 (maven-bundle-plugin-4.2.0-source-release.tar.gz) = 6b8c2dda06dbb6ba496862c8f94e6c2adbccf5a5d438fe1efbd7ff456c529f7cb4ac17e0d6cc022b3d183d06e4006fa3fba0166c4370fd3c2b1e9e53510f6618
|
||||
|
||||
Loading…
Reference in New Issue
Block a user