[apache-commons-logging] Generate different Bundle-SymbolicName for different JARs
by Mikolaj Izdebski
commit 0ccbd402b937c33543d937a9aa54e4394b9286e3
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jul 30 12:50:24 2014 +0200
Generate different Bundle-SymbolicName for different JARs
- Resolves: rhbz#1123055
...fferent-Bundle-SymbolicName-for-different.patch | 99 ++++++++++++++++++++
apache-commons-logging.spec | 9 ++-
2 files changed, 107 insertions(+), 1 deletions(-)
---
diff --git a/0001-Generate-different-Bundle-SymbolicName-for-different.patch b/0001-Generate-different-Bundle-SymbolicName-for-different.patch
new file mode 100644
index 0000000..52943b1
--- /dev/null
+++ b/0001-Generate-different-Bundle-SymbolicName-for-different.patch
@@ -0,0 +1,99 @@
+From 00823b8008bffc5dd65c9e8de604994040a3190d Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Tue, 29 Jul 2014 09:00:03 +0200
+Subject: [PATCH] Generate different Bundle-SymbolicName for different JARs
+
+---
+ pom.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 55 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index cdad31c..5707595 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -179,6 +179,52 @@ under the License.
+ <build>
+ <plugins>
+
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <executions>
++ <execution>
++ <id>tests-bundle-manifest</id>
++ <phase>process-classes</phase>
++ <goals>
++ <goal>manifest</goal>
++ </goals>
++ <configuration>
++ <manifestLocation>${project.build.directory}/osgi-tests</manifestLocation>
++ <instructions>
++ <Bundle-SymbolicName>${commons.osgi.symbolicName}.tests</Bundle-SymbolicName>
++ </instructions>
++ </configuration>
++ </execution>
++ <execution>
++ <id>api-bundle-manifest</id>
++ <phase>process-classes</phase>
++ <goals>
++ <goal>manifest</goal>
++ </goals>
++ <configuration>
++ <manifestLocation>${project.build.directory}/osgi-api</manifestLocation>
++ <instructions>
++ <Bundle-SymbolicName>${commons.osgi.symbolicName}.api</Bundle-SymbolicName>
++ </instructions>
++ </configuration>
++ </execution>
++ <execution>
++ <id>adapters-bundle-manifest</id>
++ <phase>process-classes</phase>
++ <goals>
++ <goal>manifest</goal>
++ </goals>
++ <configuration>
++ <manifestLocation>${project.build.directory}/osgi-adapters</manifestLocation>
++ <instructions>
++ <Bundle-SymbolicName>${commons.osgi.symbolicName}.adapters</Bundle-SymbolicName>
++ </instructions>
++ </configuration>
++ </execution>
++ </executions>
++ </plugin>
++
+ <!--
+ - We want to create four jarfiles from this project: normal, tests, api
+ - and adapters. The first two are handled by the normal jar:jar and
+@@ -202,6 +248,9 @@ under the License.
+ </goals>
+ <configuration>
+ <jarName>commons-logging</jarName>
++ <archive>
++ <manifestFile>${project.build.directory}/osgi-tests/MANIFEST.MF</manifestFile>
++ </archive>
+ </configuration>
+ </execution>
+
+@@ -213,6 +262,9 @@ under the License.
+ </goals>
+ <configuration>
+ <jarName>${project.artifactId}-api-${project.version}</jarName>
++ <archive>
++ <manifestFile>${project.build.directory}/osgi-api/MANIFEST.MF</manifestFile>
++ </archive>
+ <includes>
+ <include>org/apache/commons/logging/*.class</include>
+ <include>org/apache/commons/logging/impl/LogFactoryImpl*.class</include>
+@@ -237,6 +289,9 @@ under the License.
+ </goals>
+ <configuration>
+ <jarName>${project.artifactId}-adapters-${project.version}</jarName>
++ <archive>
++ <manifestFile>${project.build.directory}/osgi-adapters/MANIFEST.MF</manifestFile>
++ </archive>
+ <includes>
+ <include>org/apache/commons/logging/impl/**.class</include>
+ <include>META-INF/LICENSE.txt</include>
+--
+1.9.3
+
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index eb2fd2a..4d7dac3 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,13 +4,15 @@
Name: apache-%{short_name}
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Commons Logging
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}...
+Patch0: 0001-Generate-different-Bundle-SymbolicName-for-different.patch
+
BuildRequires: maven-local
BuildRequires: mvn(avalon-framework:avalon-framework-api)
BuildRequires: mvn(avalon-framework:avalon-framework-impl)
@@ -47,6 +49,7 @@ Summary: API documentation for %{name}
%prep
%setup -q -n %{short_name}-%{version}-src
+%patch0 -p1
# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
%pom_remove_dep :avalon-framework
@@ -102,6 +105,10 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
# -----------------------------------------------------------------------------
%changelog
+* Tue Jul 29 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-2
+- Generate different Bundle-SymbolicName for different JARs
+- Resolves: rhbz#1123055
+
* Sun Jul 20 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-1
- Update to upstream version 1.2
9 years, 11 months
[exec-maven-plugin] Update to upstream version 1.3.2
by Mikolaj Izdebski
commit 981ba72eeed558845efdc5763847ef60a75af31f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jul 30 09:35:12 2014 +0200
Update to upstream version 1.3.2
.gitignore | 1 +
exec-maven-plugin.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c2a5161..3b64a78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/LICENSE-2.0.txt
/exec-maven-plugin-1.3-source-release.zip
/exec-maven-plugin-1.3.1-source-release.zip
+/exec-maven-plugin-1.3.2-source-release.zip
diff --git a/exec-maven-plugin.spec b/exec-maven-plugin.spec
index 8743d5b..d23eca5 100644
--- a/exec-maven-plugin.spec
+++ b/exec-maven-plugin.spec
@@ -1,5 +1,5 @@
Name: exec-maven-plugin
-Version: 1.3.1
+Version: 1.3.2
Release: 1%{?dist}
Summary: Exec Maven Plugin
@@ -58,6 +58,9 @@ find . -name *.jar -delete
%doc LICENSE.txt
%changelog
+* Wed Jul 30 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.3.2-1
+- Update to upstream version 1.3.2
+
* Mon Jun 09 2014 Michal Srb <msrb(a)redhat.com> - 1.3.1-1
- Update to upstream version 1.3.1
diff --git a/sources b/sources
index d46ca62..8316171 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85cd5b55c70bbb9947f2fb8b8734cdb8 exec-maven-plugin-1.3.1-source-release.zip
+dfd75b00be09008effd3aecfbc40a1fe exec-maven-plugin-1.3.2-source-release.zip
9 years, 11 months