commit 0ccbd402b937c33543d937a9aa54e4394b9286e3 Author: Mikolaj Izdebski mizdebsk@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@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/%%7Bbase_name%7D Source0: http://www.apache.org/dist/commons/%%7Bbase_name%7D/source/%%7Bshort_name%7D... Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%%7Bshort_name%7D/%%7Bshort_na...
+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@redhat.com - 1.2-2 +- Generate different Bundle-SymbolicName for different JARs +- Resolves: rhbz#1123055 + * Sun Jul 20 2014 Mikolaj Izdebski mizdebsk@redhat.com - 1.2-1 - Update to upstream version 1.2
java-sig-commits@lists.fedoraproject.org