rpms/maven-bundle-plugin
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update to version 4.2.1 and disable obr support

Browse Source
This commit is contained in:
Fabio Valentini 2020-05-16 15:05:48 +02:00
parent 7d3b11f2c0
commit a5d9473844
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF
7 changed files with 157 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1,4 +1,7 @@
maven-bundle-plugin-2.0.0-project.tar.gz /results_*
/*.src.rpm
/maven-bundle-plugin-2.0.0-project.tar.gz
/maven-bundle-plugin-2.3.5-source-release.tar.gz /maven-bundle-plugin-2.3.5-source-release.tar.gz
/maven-bundle-plugin-2.3.6-source-release.tar.gz /maven-bundle-plugin-2.3.6-source-release.tar.gz
/maven-bundle-plugin-2.3.7-source-release.tar.gz /maven-bundle-plugin-2.3.7-source-release.tar.gz
@ -9,3 +12,4 @@ maven-bundle-plugin-2.0.0-project.tar.gz
/maven-bundle-plugin-3.4.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-3.5.0-source-release.tar.gz
/maven-bundle-plugin-3.5.1-source-release.tar.gz /maven-bundle-plugin-3.5.1-source-release.tar.gz
/maven-bundle-plugin-4.2.1-source-release.tar.gz

97
0001-Port-to-current-maven-dependency-tree.patch
View File

@ -1,19 +1,19 @@
From ac9f85cd5fdab1d51defa363b31235c45560c7f6 Mon Sep 17 00:00:00 2001 From bdd09969d3719b18875ab0f2078baec48c5154b2 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: Sun, 7 Jun 2020 20:41:17 +0200
Subject: [PATCH 1/4] Port to current maven-dependency-tree Subject: [PATCH 1/4] Port to current maven-dependency-tree
--- ---
pom.xml | 2 +- pom.xml | 2 +-
.../apache/felix/bundleplugin/BundleAllPlugin.java | 54 ++++++++++++---------- .../felix/bundleplugin/BundleAllPlugin.java | 54 ++++++++++---------
.../apache/felix/bundleplugin/BundlePlugin.java | 30 ++++++------ .../felix/bundleplugin/BundlePlugin.java | 30 +++++++----
3 files changed, 46 insertions(+), 40 deletions(-) 3 files changed, 49 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index dfbf237..46b2ba6 100644 index 8f017c6..284f909 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -192,7 +192,7 @@ @@ -212,7 +212,7 @@
<dependency> <dependency>
<groupId>org.apache.maven.shared</groupId> <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId> <artifactId>maven-dependency-tree</artifactId>
@ -23,7 +23,7 @@ index dfbf237..46b2ba6 100644
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <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 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 8c7b254..8f38eee 100644
--- a/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java --- a/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
+++ b/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; @@ -21,8 +21,10 @@ package org.apache.felix.bundleplugin;
@ -37,7 +37,7 @@ index f3b5509..6591923 100644
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -38,7 +40,6 @@ import org.apache.maven.artifact.Artifact; @@ -37,7 +39,6 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository;
@ -45,7 +45,7 @@ index f3b5509..6591923 100644
import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.resolver.ArtifactResolver;
@@ -49,13 +50,14 @@ import org.apache.maven.plugins.annotations.LifecyclePhase; @@ -48,13 +49,14 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.plugins.annotations.ResolutionScope;
@ -63,7 +63,7 @@ index f3b5509..6591923 100644
import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.FileUtils;
import aQute.bnd.osgi.Analyzer; import aQute.bnd.osgi.Analyzer;
@@ -92,24 +94,18 @@ public class BundleAllPlugin extends ManifestPlugin @@ -91,24 +93,18 @@ public class BundleAllPlugin extends ManifestPlugin
*/ */
@Parameter( property = "wrapImportPackage", defaultValue = "*" ) @Parameter( property = "wrapImportPackage", defaultValue = "*" )
private String wrapImportPackage; private String wrapImportPackage;
@ -88,7 +88,7 @@ index f3b5509..6591923 100644
@Component @Component
private MavenProjectBuilder m_mavenProjectBuilder; private MavenProjectBuilder m_mavenProjectBuilder;
@@ -180,17 +176,19 @@ public class BundleAllPlugin extends ManifestPlugin @@ -179,17 +175,19 @@ public class BundleAllPlugin extends ManifestPlugin
try try
{ {
@ -112,7 +112,7 @@ index f3b5509..6591923 100644
{ {
/* no need to traverse the tree */ /* no need to traverse the tree */
return bundleRoot( project, bundleInfo ); return bundleRoot( project, bundleInfo );
@@ -198,20 +196,27 @@ public class BundleAllPlugin extends ManifestPlugin @@ -197,20 +195,27 @@ public class BundleAllPlugin extends ManifestPlugin
getLog().debug( "Will bundle the following dependency tree" + LS + dependencyTree ); getLog().debug( "Will bundle the following dependency tree" + LS + dependencyTree );
@ -148,7 +148,7 @@ index f3b5509..6591923 100644
if ( Artifact.SCOPE_SYSTEM.equals( node.getArtifact().getScope() ) ) if ( Artifact.SCOPE_SYSTEM.equals( node.getArtifact().getScope() ) )
{ {
getLog().debug( "Ignoring system scoped artifact " + node.getArtifact() ); getLog().debug( "Ignoring system scoped artifact " + node.getArtifact() );
@@ -235,12 +240,11 @@ public class BundleAllPlugin extends ManifestPlugin @@ -234,12 +239,11 @@ public class BundleAllPlugin extends ManifestPlugin
node.getArtifact().setFile( artifact.getFile() ); node.getArtifact().setFile( artifact.getFile() );
@ -164,10 +164,10 @@ index f3b5509..6591923 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 1dcf1c1..3e4384e 100644 index c07637a..7844ead 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; @@ -73,12 +73,15 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.plugins.annotations.ResolutionScope;
@ -176,47 +176,44 @@ index 1dcf1c1..3e4384e 100644
import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.MavenProjectHelper; import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.project.ProjectBuildingException; 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.DependencyTreeBuilder;
-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; -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.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;
@@ -225,9 +225,6 @@ public class BundlePlugin extends AbstractMojo @@ -209,6 +212,9 @@ public class BundlePlugin extends AbstractMojo
@Component @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; protected MavenProjectBuilder mavenProjectBuilder;
- @Component @Component
- private DependencyTreeBuilder dependencyTreeBuilder; - private DependencyTreeBuilder dependencyTreeBuilder;
- + private DependencyGraphBuilder dependencyGraphBuilder;
/**
* The dependency graph builder to use. @Component
*/ private ArtifactMetadataSource artifactMetadataSource;
@@ -347,7 +344,10 @@ public class BundlePlugin extends AbstractMojo @@ -737,7 +743,7 @@ 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 // 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 )
- throws IOException, DependencyTreeBuilderException, ProjectBuildingException - throws IOException, ProjectBuildingException, DependencyTreeBuilderException {
+ throws IOException, DependencyGraphBuilderException, ProjectBuildingException + throws IOException, ProjectBuildingException, DependencyGraphBuilderException {
{
Model model = project.getOriginalModel(); Model model = project.getOriginalModel();
List<Dependency> dependencies = new ArrayList<Dependency>(); List<Dependency> dependencies = new ArrayList<Dependency>();
@@ -901,24 +901,26 @@ public class BundlePlugin extends AbstractMojo
@@ -875,20 +881,22 @@ 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 )
@ -231,16 +228,12 @@ index 1dcf1c1..3e4384e 100644
+ request.setRepositorySession(session.getRepositorySession()); + request.setRepositorySession(session.getRepositorySession());
+ DependencyNode node = dependencyGraphBuilder.buildDependencyGraph(request, null); + DependencyNode node = dependencyGraphBuilder.buildDependencyGraph(request, null);
boolean modified = false; boolean modified = false;
Iterator it = node.getChildren().listIterator(); - for (org.apache.maven.shared.dependency.tree.DependencyNode n2 : node.getChildren())
while ( it.hasNext() ) + for (org.apache.maven.shared.dependency.graph.DependencyNode n2 : node.getChildren())
{ {
- org.apache.maven.shared.dependency.tree.DependencyNode n2 = (org.apache.maven.shared.dependency.tree.DependencyNode) it.next(); - for (org.apache.maven.shared.dependency.tree.DependencyNode n3 : n2.getChildren())
+ DependencyNode n2 = (DependencyNode) it.next(); + for (org.apache.maven.shared.dependency.graph.DependencyNode n3 : n2.getChildren())
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" //anything two levels deep that is marked "included"
//is stuff that was excluded by the original poms, make sure it //is stuff that was excluded by the original poms, make sure it
//remains excluded IF promoting transitives. //remains excluded IF promoting transitives.
@ -251,5 +244,5 @@ index 1dcf1c1..3e4384e 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.14.3 2.26.2

10
0002-Fix-for-new-maven-archiver.patch
View File

@ -1,6 +1,6 @@
From 17a505c7c7924540f9636e3cd2700cc25a59447e Mon Sep 17 00:00:00 2001 From 187b8754f9276ec9702b16f9211b63bb107dbd68 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: Sun, 7 Jun 2020 20:41:45 +0200
Subject: [PATCH 2/4] Fix for new maven archiver 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(-) 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 3e4384e..a42d6ef 100644 index 7844ead..b8cf9e2 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
@@ -1104,7 +1104,7 @@ public class BundlePlugin extends AbstractMojo @@ -1075,7 +1075,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 3e4384e..a42d6ef 100644
Manifest mavenManifest = new Manifest(); Manifest mavenManifest = new Manifest();
-- --
2.14.3 2.26.2

16
0003-Port-to-plexus-utils-3.0.24.patch
View File

@ -1,18 +1,18 @@
From 5e514316b5cfbe769b21dc089e2631a9c302dd19 Mon Sep 17 00:00:00 2001 From 1103a4e6745131039d701f3dd760352066c159f9 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: Sun, 7 Jun 2020 20:42:06 +0200
Subject: [PATCH 3/4] Port to plexus-utils 3.0.24 Subject: [PATCH 3/4] Port to plexus-utils 3.0.24
--- ---
pom.xml | 2 +- pom.xml | 2 +-
src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java | 9 ++++++++- .../java/org/apache/felix/bundleplugin/BundlePlugin.java | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-) 2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 46b2ba6..144f5ad 100644 index 284f909..fd2cad3 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -197,7 +197,7 @@ @@ -217,7 +217,7 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>
@ -22,10 +22,10 @@ index 46b2ba6..144f5ad 100644
<dependency> <dependency>
<groupId>org.sonatype.plexus</groupId> <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 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 index b8cf9e2..5530ca7 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
@@ -1806,7 +1806,14 @@ public class BundlePlugin extends AbstractMojo @@ -1781,7 +1781,14 @@ public class BundlePlugin extends AbstractMojo
File filterFile = new File( i.next() ); File filterFile = new File( i.next() );
if ( filterFile.isFile() ) if ( filterFile.isFile() )
{ {
@ -42,5 +42,5 @@ index a42d6ef..c858b6b 100644
} }
-- --
2.14.3 2.26.2

51
0004-Use-Maven-3-APIs.patch
View File

@ -1,38 +1,19 @@
From e0f3d1cddc9ce70d8290aafbdaa36e3aa56e5e9d Mon Sep 17 00:00:00 2001 From 8c6e31d293e86bc2713bd29c57741d8abc9cb621 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com> From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 12 Oct 2016 23:43:00 +0200 Date: Sun, 7 Jun 2020 20:42:29 +0200
Subject: [PATCH 4/4] Use Maven 3 APIs Subject: [PATCH 4/4] Use Maven 3 APIs
--- ---
pom.xml | 17 +++++++++++------ pom.xml | 5 -----
.../org/apache/felix/bundleplugin/BundlePlugin.java | 4 ++-- .../java/org/apache/felix/bundleplugin/BundlePlugin.java | 4 ++--
2 files changed, 13 insertions(+), 8 deletions(-) 2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 144f5ad..cf3d7dc 100644 index fd2cad3..7ed4773 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -182,7 +192,17 @@ @@ -252,11 +252,6 @@
<dependency> <version>1.1.0</version>
<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>
@@ -225,11 +234,6 @@
<version>1.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
- <dependency> - <dependency>
@ -40,14 +21,14 @@ index 144f5ad..cf3d7dc 100644
- <artifactId>jdom</artifactId> - <artifactId>jdom</artifactId>
- <version>1.1</version> - <version>1.1</version>
- </dependency> - </dependency>
</dependencies> <dependency>
<groupId>junit</groupId>
<reporting> <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 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 5530ca7..21adb1a 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
@@ -46,7 +46,6 @@ import java.util.TreeMap; @@ -47,7 +47,6 @@ import java.util.TreeMap;
import java.util.jar.Attributes; import java.util.jar.Attributes;
import java.util.jar.Manifest; import java.util.jar.Manifest;
@ -55,7 +36,7 @@ index c858b6b..5023569 100644
import org.apache.maven.archiver.ManifestSection; import org.apache.maven.archiver.ManifestSection;
import org.apache.maven.archiver.MavenArchiveConfiguration; import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver; import org.apache.maven.archiver.MavenArchiver;
@@ -63,6 +62,7 @@ import org.apache.maven.model.Exclusion; @@ -64,6 +63,7 @@ import org.apache.maven.model.Exclusion;
import org.apache.maven.model.License; import org.apache.maven.model.License;
import org.apache.maven.model.Model; import org.apache.maven.model.Model;
import org.apache.maven.model.Resource; import org.apache.maven.model.Resource;
@ -63,7 +44,7 @@ index c858b6b..5023569 100644
import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.MojoFailureException;
@@ -864,7 +864,7 @@ public class BundlePlugin extends AbstractMojo @@ -844,7 +844,7 @@ public class BundlePlugin extends AbstractMojo
try try
{ {
@ -73,5 +54,5 @@ index c858b6b..5023569 100644
finally finally
{ {
-- --
2.14.3 2.26.2

28
maven-plugin-bundle.spec
View File

@ -1,17 +1,16 @@
%bcond_without obr %bcond_with obr
%bcond_without reporting %bcond_without reporting
%global site_name maven-bundle-plugin %global srcname maven-bundle-plugin
Name: maven-plugin-bundle Name: maven-plugin-bundle
Version: 3.5.1 Version: 4.2.1
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
BuildArch: noarch
Source0: http://repo2.maven.org/maven2/org/apache/felix/{%site_name}/%{version}/%{site_name}-%{version}-source-release.tar.gz URL: https://felix.apache.org
Source0: https://repo1.maven.org/maven2/org/apache/felix/%{srcname}/%{version}/%{srcname}-%{version}-source-release.tar.gz
# Needs polishing to be sent upstream # Needs polishing to be sent upstream
Patch0: 0001-Port-to-current-maven-dependency-tree.patch Patch0: 0001-Port-to-current-maven-dependency-tree.patch
@ -22,6 +21,8 @@ Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
# Port to newer Maven # Port to newer Maven
Patch3: 0004-Use-Maven-3-APIs.patch Patch3: 0004-Use-Maven-3-APIs.patch
BuildArch: noarch
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib)
BuildRequires: mvn(org.apache.felix:felix-parent:pom:) BuildRequires: mvn(org.apache.felix:felix-parent:pom:)
@ -34,6 +35,7 @@ BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.shared:maven-dependency-tree) BuildRequires: mvn(org.apache.maven.shared:maven-dependency-tree)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.osgi:osgi.core)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
%if %{with obr} %if %{with obr}
BuildRequires: mvn(net.sf.kxml:kxml2) BuildRequires: mvn(net.sf.kxml:kxml2)
@ -43,7 +45,7 @@ BuildRequires: mvn(xpp3:xpp3)
%if %{with reporting} %if %{with reporting}
BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api)
BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
%endif %endif
%description %description
@ -58,7 +60,7 @@ Summary: Javadoc for %{name}
API documentation for %{name}. API documentation for %{name}.
%prep %prep
%setup -q -n %{site_name}-%{version} %setup -q -n %{srcname}-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
@ -83,15 +85,14 @@ rm -r src/main/java/org/apache/felix/bundleplugin/pom
%pom_add_dep xpp3:xpp3 %pom_add_dep xpp3:xpp3
%pom_add_dep net.sf.kxml:kxml2 %pom_add_dep net.sf.kxml:kxml2
%else %else
rm -rf src/main/java/org/apache/felix/obrplugin/ rm -r src/main/java/org/apache/felix/obrplugin/
%pom_remove_dep :org.apache.felix.bundlerepository %pom_remove_dep :org.apache.felix.bundlerepository
%endif %endif
%if %{without reporting} %if %{without reporting}
rm -f src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java rm src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
%pom_remove_dep :doxia-sink-api %pom_remove_dep :doxia-sink-api
%pom_remove_dep :doxia-site-renderer %pom_remove_dep :doxia-site-renderer
%pom_remove_dep :maven-reporting-impl
%endif %endif
%build %build
@ -108,6 +109,9 @@ rm -f src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
%license LICENSE NOTICE %license LICENSE NOTICE
%changelog %changelog
* Sat May 16 2020 Fabio Valentini <decathorpe@gmail.com> - 4.2.1-1
- Update to version 4.2.1.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-4 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (maven-bundle-plugin-3.5.1-source-release.tar.gz) = ddb34ef413fb637c30057998c860b6bfa364f02deb7b734b9027cc50ca9071c4e4537203cf4ec62293550971e06da86c1c1649411f07fb8e82424b05953d6f7d SHA512 (maven-bundle-plugin-4.2.1-source-release.tar.gz) = c1d9ec95c6b96d47e4e63be6652356f0f3b7a48f351bcc72f4b844d1e95ec7b52c1583d7d425c1e8466e87619a1f50592d6a763e8dea146c64608f94192994b4