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

Update to upstream version 3.5.1

Browse Source
This commit is contained in:
Marian Koncek 2018-11-01 15:19:46 +01:00
parent 36a9b80eec
commit 5c257b2908
7 changed files with 181 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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.3.0-source-release.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

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

@ -13,7 +13,7 @@ diff --git a/pom.xml b/pom.xml
index dfbf237..46b2ba6 100644 index dfbf237..46b2ba6 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -189,7 +189,7 @@ @@ -192,7 +192,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>

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

@ -11,7 +11,7 @@ diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src
index 3e4384e..a42d6ef 100644 index 3e4384e..a42d6ef 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
@@ -1101,7 +1101,7 @@ public class BundlePlugin extends AbstractMojo @@ -1104,7 +1104,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 );

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

@ -12,7 +12,7 @@ diff --git a/pom.xml b/pom.xml
index 46b2ba6..144f5ad 100644 index 46b2ba6..144f5ad 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -194,7 +194,7 @@ @@ -197,7 +197,7 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>

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

@ -12,7 +12,7 @@ diff --git a/pom.xml b/pom.xml
index 144f5ad..cf3d7dc 100644 index 144f5ad..cf3d7dc 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -179,7 +179,17 @@ @@ -182,7 +192,17 @@
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
@ -31,7 +31,7 @@ index 144f5ad..cf3d7dc 100644
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
@@ -223,11 +233,6 @@ @@ -225,11 +234,6 @@
<version>1.1</version> <version>1.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

7
maven-plugin-bundle.spec
View File

@ -4,8 +4,8 @@
%global site_name maven-bundle-plugin %global site_name maven-bundle-plugin
Name: maven-plugin-bundle Name: maven-plugin-bundle
Version: 3.5.0 Version: 3.5.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 URL: http://felix.apache.org
@ -109,6 +109,9 @@ rm -f src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
%license LICENSE NOTICE %license LICENSE NOTICE
%changelog %changelog
* Thu Nov 01 2018 Marian Koncek <mkoncek@redhat.com> - 3.5.1-1
- Update to upstream version 3.5.1
* Thu Aug 02 2018 Michael Simacek <msimacek@redhat.com> - 3.5.0-4 * Thu Aug 02 2018 Michael Simacek <msimacek@redhat.com> - 3.5.0-4
- Remove spurious %%if fedora - Remove spurious %%if fedora
- Use license macro - Use license macro

2
sources
View File

@ -1 +1 @@
SHA512 (maven-bundle-plugin-3.5.0-source-release.tar.gz) = 81f81d61c7c8739788caa22ec615a3bfb6b753e81d8cb05cfaf3bcc5d936877caea5d75c3ac911fed75e0b3bf9822b258ac5f1d5564f88d569bf5102313841f0 SHA512 (maven-bundle-plugin-3.5.1-source-release.tar.gz) = ddb34ef413fb637c30057998c860b6bfa364f02deb7b734b9027cc50ca9071c4e4537203cf4ec62293550971e06da86c1c1649411f07fb8e82424b05953d6f7d