Update to upstream version 3.5.0
This commit is contained in:
Michael Simacek
parent
68e9259756
commit
4c66820b72
1
.gitignore
vendored
1
.gitignore
vendored
@ -7,3 +7,4 @@ maven-bundle-plugin-2.0.0-project.tar.gz
|
||||
/maven-bundle-plugin-3.2.0-source-release.tar.gz
|
||||
/maven-bundle-plugin-3.3.0-source-release.tar.gz
|
||||
/maven-bundle-plugin-3.4.0-source-release.tar.gz
|
||||
/maven-bundle-plugin-3.5.0-source-release.tar.gz
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f04e7a4e7ce6e7f9248d142c14b1e98df0e3b9a9 Mon Sep 17 00:00:00 2001
|
||||
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
|
||||
@ -10,7 +10,7 @@ Subject: [PATCH 1/4] Port to current maven-dependency-tree
|
||||
3 files changed, 46 insertions(+), 40 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 4e5b9b2..05e798f 100644
|
||||
index dfbf237..46b2ba6 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -189,7 +189,7 @@
|
||||
@ -23,7 +23,7 @@ index 4e5b9b2..05e798f 100644
|
||||
<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 5d095d8..b32b90b 100644
|
||||
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;
|
||||
@ -164,7 +164,7 @@ index 5d095d8..b32b90b 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||
index 426f9d2..bfebfbb 100644
|
||||
index 1dcf1c1..3e4384e 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;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 3c3ca1818774e9bc6763face9d2a4b23d788488e Mon Sep 17 00:00:00 2001
|
||||
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
|
||||
@ -8,7 +8,7 @@ Subject: [PATCH 2/4] Fix for new maven archiver
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||
index bfebfbb..2b8ae02 100644
|
||||
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
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 7d270867e5c02d4523d1de321c6e69e8da8c49a2 Mon Sep 17 00:00:00 2001
|
||||
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
|
||||
@ -9,7 +9,7 @@ Subject: [PATCH 3/4] Port to plexus-utils 3.0.24
|
||||
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 05e798f..aed3155 100644
|
||||
index 46b2ba6..144f5ad 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -194,7 +194,7 @@
|
||||
@ -22,7 +22,7 @@ index 05e798f..aed3155 100644
|
||||
<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 2b8ae02..6bab369 100644
|
||||
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
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 5fa49250fafc8895ec99d55f76a0d7f57fc70a40 Mon Sep 17 00:00:00 2001
|
||||
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
|
||||
@ -9,7 +9,7 @@ Subject: [PATCH 4/4] Use Maven 3 APIs
|
||||
2 files changed, 13 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index aed3155..7556d8b 100644
|
||||
index 144f5ad..cf3d7dc 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -179,7 +179,17 @@
|
||||
@ -44,7 +44,7 @@ index aed3155..7556d8b 100644
|
||||
|
||||
<reporting>
|
||||
diff --git a/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
|
||||
index 6bab369..050a922 100644
|
||||
index c858b6b..5023569 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;
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
%global site_name maven-bundle-plugin
|
||||
|
||||
Name: maven-plugin-bundle
|
||||
Version: 3.4.0
|
||||
Version: 3.5.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Maven Bundle Plugin
|
||||
License: ASL 2.0
|
||||
URL: http://felix.apache.org
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://archive.apache.org/dist/felix/%{site_name}-%{version}-source-release.tar.gz
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/felix/{%site_name}/%{version}/%{site_name}-%{version}-source-release.tar.gz
|
||||
|
||||
# Needs polishing to be sent upstream
|
||||
Patch0: 0001-Port-to-current-maven-dependency-tree.patch
|
||||
@ -111,6 +111,9 @@ rm -f src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (maven-bundle-plugin-3.4.0-source-release.tar.gz) = a5f029ab42b1b8622827907eb8136309cfc4d7e49dd9c0431669c35ff249c6ad78be845941c88b86c2cf7033204d1f29a6162058db0290025b1086be28adf6a1
|
||||
SHA512 (maven-bundle-plugin-3.5.0-source-release.tar.gz) = 81f81d61c7c8739788caa22ec615a3bfb6b753e81d8cb05cfaf3bcc5d936877caea5d75c3ac911fed75e0b3bf9822b258ac5f1d5564f88d569bf5102313841f0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user