c8-stream-201902
imports/c8-stream-201902/maven-plugin-bundle-4.2.1-2.module_el8.2.0+363+9996591c
MSVSphere Packaging Team
8 months ago
commit
fc0ac93598
@ -0,0 +1 @@
|
|||||||
|
SOURCES/maven-bundle-plugin-4.2.1-source-release.tar.gz
|
||||||
@ -0,0 +1 @@
|
|||||||
|
815bf0d833ee221aa17128567c578bcaf8a4a4e2 SOURCES/maven-bundle-plugin-4.2.1-source-release.tar.gz
|
||||||
@ -0,0 +1,248 @@
|
|||||||
|
From ac9f85cd5fdab1d51defa363b31235c45560c7f6 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
|
||||||
|
|
||||||
|
---
|
||||||
|
pom.xml | 2 +-
|
||||||
|
.../apache/felix/bundleplugin/BundleAllPlugin.java | 54 ++++++++++++----------
|
||||||
|
.../apache/felix/bundleplugin/BundlePlugin.java | 30 ++++++------
|
||||||
|
3 files changed, 46 insertions(+), 40 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index dfbf237..46b2ba6 100644
|
||||||
|
--- a/pom.xml
|
||||||
|
+++ b/pom.xml
|
||||||
|
@@ -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>
|
||||||
|
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.util.ArrayDeque;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collection;
|
||||||
|
+import java.util.Deque;
|
||||||
|
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;
|
||||||
|
@@ -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.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.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.shared.dependency.graph.DependencyGraphBuilderException;
|
||||||
|
+import org.apache.maven.shared.dependency.graph.DependencyNode;
|
||||||
|
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;
|
||||||
|
@@ -180,17 +176,19 @@ public class BundleAllPlugin extends ManifestPlugin
|
||||||
|
|
||||||
|
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 ( DependencyGraphBuilderException e )
|
||||||
|
{
|
||||||
|
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 );
|
||||||
|
@@ -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(); )
|
||||||
|
+ 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 = stack.pop();
|
||||||
|
+ if (visited.contains(node))
|
||||||
|
{
|
||||||
|
- /* this is the root, current project */
|
||||||
|
- break;
|
||||||
|
+ continue;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
- if ( node.getState() != DependencyNode.INCLUDED )
|
||||||
|
+ visited.add(node);
|
||||||
|
+ if (node.getChildren() != null)
|
||||||
|
{
|
||||||
|
- 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() );
|
||||||
|
@@ -235,12 +240,11 @@ public class BundleAllPlugin extends ManifestPlugin
|
||||||
|
|
||||||
|
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 );
|
||||||
|
+ "Ignoring " + node.getArtifact() + ", depth is " + stack.size() + ", bigger than " + maxDepth );
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
|
index 395340d..987a55c 100644
|
||||||
|
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
|
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
|
@@ -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.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.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;
|
||||||
|
- 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
|
||||||
|
--
|
||||||
|
2.14.3
|
||||||
|
|
||||||
@ -0,0 +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
|
||||||
|
@@ -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();
|
||||||
|
addMavenDescriptor = addMavenDescriptor && archiveConfig.isAddMavenDescriptor();
|
||||||
|
|
||||||
|
Manifest mavenManifest = new Manifest();
|
||||||
|
--
|
||||||
|
2.14.3
|
||||||
|
|
||||||
@ -0,0 +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
|
||||||
|
@@ -197,7 +197,7 @@
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
|
<artifactId>plexus-utils</artifactId>
|
||||||
|
- <version>3.0.10</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
|
||||||
|
File filterFile = new File( i.next() );
|
||||||
|
if ( filterFile.isFile() )
|
||||||
|
{
|
||||||
|
- properties.putAll( PropertyUtils.loadProperties( filterFile ) );
|
||||||
|
+ try
|
||||||
|
+ {
|
||||||
|
+ properties.putAll( PropertyUtils.loadProperties( filterFile ) );
|
||||||
|
+ }
|
||||||
|
+ catch ( IOException exc )
|
||||||
|
+ {
|
||||||
|
+ // Ignore
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.14.3
|
||||||
|
|
||||||
@ -0,0 +1,58 @@
|
|||||||
|
From e0f3d1cddc9ce70d8290aafbdaa36e3aa56e5e9d 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
|
||||||
|
|
||||||
|
---
|
||||||
|
pom.xml | 17 +++++++++++------
|
||||||
|
.../org/apache/felix/bundleplugin/BundlePlugin.java | 4 ++--
|
||||||
|
2 files changed, 13 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index b1fc107..5fc0a36 100644
|
||||||
|
--- a/pom.xml
|
||||||
|
+++ b/pom.xml
|
||||||
|
@@ -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 987a55c..05e77b0 100644
|
||||||
|
--- a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
|
+++ b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||||
|
@@ -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;
|
||||||
|
@@ -842,7 +842,7 @@ public class BundlePlugin extends AbstractMojo
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
- PomWriter.write( w, model, true );
|
||||||
|
+ new MavenXpp3Writer().write( w, model );
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.14.3
|
||||||
|
|
||||||
@ -0,0 +1,240 @@
|
|||||||
|
Name: maven-plugin-bundle
|
||||||
|
Version: 4.2.1
|
||||||
|
Release: 2%{?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/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
|
||||||
|
# New maven-archiver removed some deprecated methods we were using
|
||||||
|
Patch1: 0002-Fix-for-new-maven-archiver.patch
|
||||||
|
# Port to newer Plexus utils
|
||||||
|
Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
|
||||||
|
# Port to newer Maven
|
||||||
|
Patch3: 0004-Use-Maven-3-APIs.patch
|
||||||
|
|
||||||
|
BuildRequires: maven-local
|
||||||
|
BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib)
|
||||||
|
BuildRequires: mvn(org.apache.felix:felix-parent:pom:)
|
||||||
|
BuildRequires: mvn(org.apache.felix:org.apache.felix.utils)
|
||||||
|
BuildRequires: mvn(org.apache.maven:maven-archiver)
|
||||||
|
BuildRequires: mvn(org.apache.maven:maven-compat)
|
||||||
|
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||||
|
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||||
|
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||||
|
BuildRequires: mvn(org.apache.maven.shared:maven-dependency-tree)
|
||||||
|
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||||
|
BuildRequires: mvn(org.osgi:osgi.core)
|
||||||
|
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
|
||||||
|
|
||||||
|
%description
|
||||||
|
Provides a maven plugin that supports creating an OSGi bundle
|
||||||
|
from the contents of the compilation classpath along with its
|
||||||
|
resources and dependencies. Plus a zillion other features.
|
||||||
|
|
||||||
|
%package javadoc
|
||||||
|
Summary: Javadoc for %{name}
|
||||||
|
|
||||||
|
%description javadoc
|
||||||
|
API documentation for %{name}.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n maven-bundle-plugin-%{version}
|
||||||
|
|
||||||
|
find -name 'pom.xml' -exec sed -i 's/\r//' {} \;
|
||||||
|
find -name '*.java' -exec sed -i 's/\r//' {} \;
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
|
find -name '*.jar' -delete
|
||||||
|
|
||||||
|
%pom_change_dep :org.osgi.core :osgi.core
|
||||||
|
|
||||||
|
# Bundled class from old maven-dependency-tree
|
||||||
|
rm -r src/main/java/org/apache/maven/shared/dependency
|
||||||
|
|
||||||
|
# Bundled classes from old maven
|
||||||
|
rm -r src/main/java/org/apache/felix/bundleplugin/pom
|
||||||
|
|
||||||
|
# There is forked version of maven-osgi in
|
||||||
|
# src/{main,test}/java/org/apache/maven
|
||||||
|
|
||||||
|
rm -rf src/main/java/org/apache/felix/obrplugin/
|
||||||
|
%pom_remove_dep :org.apache.felix.bundlerepository
|
||||||
|
|
||||||
|
rm -f src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
|
||||||
|
%pom_remove_dep :doxia-sink-api
|
||||||
|
%pom_remove_dep :doxia-site-renderer
|
||||||
|
|
||||||
|
%build
|
||||||
|
# Tests depend on bundled JARs
|
||||||
|
%mvn_build -f
|
||||||
|
|
||||||
|
%install
|
||||||
|
%mvn_install
|
||||||
|
|
||||||
|
%files -f .mfiles
|
||||||
|
%doc LICENSE NOTICE DEPENDENCIES
|
||||||
|
|
||||||
|
%files javadoc -f .mfiles-javadoc
|
||||||
|
%doc LICENSE NOTICE
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.1-2
|
||||||
|
- Mass rebuild for javapackages-tools 201902
|
||||||
|
|
||||||
|
* Mon Aug 19 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.1-1
|
||||||
|
- Update to upstream version 4.2.1
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 08 2018 Michael Simacek <msimacek@redhat.com> - 3.5.0-1
|
||||||
|
- Update to upstream version 3.5.0
|
||||||
|
|
||||||
|
* Tue Jan 02 2018 Michael Simacek <msimacek@redhat.com> - 3.4.0-1
|
||||||
|
- Update to upstream version 3.4.0
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Wed Oct 12 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-3
|
||||||
|
- Add conditionals for building without OBR or Maven reports
|
||||||
|
|
||||||
|
* Thu Oct 06 2016 Michael Simacek <msimacek@redhat.com> - 3.2.0-2
|
||||||
|
- Use osgi APIs instead of felix-framework
|
||||||
|
|
||||||
|
* Tue Jul 19 2016 Michael Simacek <msimacek@redhat.com> - 3.2.0-1
|
||||||
|
- Update to upstream version 3.2.0
|
||||||
|
|
||||||
|
* Thu May 26 2016 Michael Simacek <msimacek@redhat.com> - 3.0.1-4
|
||||||
|
- Remove aqute downgrade patch
|
||||||
|
|
||||||
|
* Thu May 12 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-3
|
||||||
|
- Port to plexus-utils 3.0.24
|
||||||
|
|
||||||
|
* Thu Apr 14 2016 Mat Booth <mat.booth@redhat.com> - 3.0.1-2
|
||||||
|
- Fix build against new maven-archiver, which removed some deprecated methods
|
||||||
|
that this plugin was using
|
||||||
|
|
||||||
|
* Fri Feb 12 2016 Michael Simacek <msimacek@redhat.com> - 3.0.1-1
|
||||||
|
- Update to upstream version 3.0.1
|
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 08 2015 Michael Simacek <msimacek@redhat.com> - 2.5.4-1
|
||||||
|
- Update to upstream version 2.5.4
|
||||||
|
|
||||||
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.7-15
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.7-14
|
||||||
|
- Add build-requires on mockito
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.7-13
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed May 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.7-12
|
||||||
|
- Update to current packaging guidelines
|
||||||
|
|
||||||
|
* Thu Feb 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.7-11
|
||||||
|
- Remove unneeded R and BR: maven-wagon
|
||||||
|
|
||||||
|
* Fri Jul 26 2013 Tomas Radej <tradej@redhat.com> - 2.3.7-10
|
||||||
|
- Fixed release number
|
||||||
|
|
||||||
|
* Wed Jul 17 2013 Tomas Radej <tradej@redhat.com> - 2.3.7-9
|
||||||
|
- Updated source address (error 404)
|
||||||
|
|
||||||
|
* Wed Apr 10 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.7-8
|
||||||
|
- Add missing BR: maven-plugin-testing-harness
|
||||||
|
|
||||||
|
* Mon Mar 11 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.7-7
|
||||||
|
- Re-enable tests
|
||||||
|
|
||||||
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.7-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 2.3.7-5
|
||||||
|
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||||
|
- Replace maven BuildRequires with maven-local
|
||||||
|
|
||||||
|
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.7-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon May 21 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.3.7-3
|
||||||
|
- Add kxml2 to pom as a dependency
|
||||||
|
|
||||||
|
* Mon Apr 30 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.7-2
|
||||||
|
- Add missing BuildRequires
|
||||||
|
|
||||||
|
* Wed Feb 29 2012 Jaromir Capik <jcapik@redhat.com> 2.3.7-1
|
||||||
|
- Update to 2.3.7
|
||||||
|
|
||||||
|
* Thu Jan 19 2012 Jaromir Capik <jcapik@redhat.com> 2.3.6-3
|
||||||
|
- Bundled maven sources readded (they seem to change the behaviour)
|
||||||
|
|
||||||
|
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.6-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Dec 21 2011 Jaromir Capik <jcapik@redhat.com> 2.3.6-1
|
||||||
|
- Update to 2.3.6
|
||||||
|
|
||||||
|
* Mon Dec 19 2011 Jaromir Capik <jcapik@redhat.com> 2.3.5-3
|
||||||
|
- Minimal aqute-bndlib VR set to 1.43.0-2 (older ones are broken)
|
||||||
|
|
||||||
|
* Mon Nov 14 2011 Jaromir Capik <jcapik@redhat.com> 2.3.5-2
|
||||||
|
- OBR plugin readded (it's been merged to the bundle plugin)
|
||||||
|
|
||||||
|
* Mon Oct 24 2011 Jaromir Capik <jcapik@redhat.com> 2.3.5-1
|
||||||
|
- Update to 2.3.5
|
||||||
|
|
||||||
|
* Tue Oct 17 2011 Jaromir Capik <jcapik@redhat.com> 2.0.0-11
|
||||||
|
- aqute-bndlib renamed to aqute-bnd
|
||||||
|
|
||||||
|
* Fri Jun 17 2011 Alexander Kurtakov <akurtako@redhat.com> 2.0.0-10
|
||||||
|
- Do not depend on maven2.
|
||||||
|
|
||||||
|
* Thu Feb 10 2011 Alexander Kurtakov <akurtako@redhat.com> 2.0.0-9
|
||||||
|
- BR maven-surefire-provider-junit4.
|
||||||
|
|
||||||
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Dec 15 2010 Alexander Kurtakov <akurtako@redhat.com> 2.0.0-7
|
||||||
|
- BR/R felix-parent.
|
||||||
|
|
||||||
|
* Thu Sep 9 2010 Alexander Kurtakov <akurtako@redhat.com> 2.0.0-5
|
||||||
|
- Fix BuildRequires.
|
||||||
|
|
||||||
|
* Fri Sep 18 2009 Alexander Kurtakov <akurtako@redhat.com> 2.0.0-4
|
||||||
|
- Add missing Requires.
|
||||||
|
|
||||||
|
* Wed Sep 9 2009 Alexander Kurtakov <akurtako@redhat.com> 2.0.0-3
|
||||||
|
- BR doxia-sitetools.
|
||||||
|
|
||||||
|
* Mon Sep 7 2009 Alexander Kurtakov <akurtako@redhat.com> 2.0.0-2
|
||||||
|
- Fix BR/Rs.
|
||||||
|
|
||||||
|
* Thu Sep 3 2009 Alexander Kurtakov <akurtako@redhat.com> 2.0.0-1
|
||||||
|
- Initial import.
|
||||||
Loading…
Reference in new issue