Author: niallp
Date: Fri Jan 11 07:40:25 2008
New Revision: 611207
URL: http://svn.apache.org/viewvc?rev=611207&view=rev
Log:
Add OSGi manifest entries to the m1 and m2 builds
Modified:
commons/proper/pool/branches/1_4_RELEASE_BRANCH/pom.xml
commons/proper/pool/branches/1_4_RELEASE_BRANCH/project.properties
Modified: commons/proper/pool/branches/1_4_RELEASE_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/pool/branches/1_4_RELEASE_BRANCH/pom.xml?rev=611207&r1=611206&r2=611207&view=diff
==============================================================================
--- commons/proper/pool/branches/1_4_RELEASE_BRANCH/pom.xml (original)
+++ commons/proper/pool/branches/1_4_RELEASE_BRANCH/pom.xml Fri Jan 11 07:40:25
2008
@@ -189,6 +189,33 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <!--
+ Configure OSGi bundle information
+ (remvoe when maven bundle plugin is added to commons-parent
pom)
+ -->
+ <manifestEntries>
+
<Bundle-SymbolicName>org.apache.commons.pool</Bundle-SymbolicName>
+
<Bundle-License>http://www.apache.org/licenses/LICENSE-2.0.txt</Bundle-License>
+ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+ <Bundle-Name>Apache Commons Pool Bundle</Bundle-Name>
+ <Bundle-Vendor>${project.organization.name}</Bundle-Vendor>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ <Export-Package>
+org.apache.commons.pool;version=${project.version},
+org.apache.commons.pool.impl;version=${project.version}
+ </Export-Package>
+ <Import-Package>
+org.apache.commons.pool;version=${project.version},
+org.apache.commons.pool.impl;version=${project.version}
+ </Import-Package>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
Modified: commons/proper/pool/branches/1_4_RELEASE_BRANCH/project.properties
URL:
http://svn.apache.org/viewvc/commons/proper/pool/branches/1_4_RELEASE_BRANCH/project.properties?rev=611207&r1=611206&r2=611207&view=diff
==============================================================================
--- commons/proper/pool/branches/1_4_RELEASE_BRANCH/project.properties
(original)
+++ commons/proper/pool/branches/1_4_RELEASE_BRANCH/project.properties Fri Jan
11 07:40:25 2008
@@ -30,11 +30,21 @@
maven.jar.manifest=${basedir}/manifestMods.txt
# Jar Manifest Additional Attributes
-maven.jar.manifest.attributes.list=Specification-Version,Implementation-Vendor-Id,X-Compile-Source-JDK,X-Compile-Target-JDK
-maven.jar.manifest.attribute.Specification-Version=1.4
+maven.jar.manifest.attributes.list=Specification-Version,Implementation-Vendor-Id,X-Compile-Source-JDK,X-Compile-Target-JDK,Bundle-SymbolicName,Bundle-License,Bundle-ManifestVersion,Bundle-Name,Bundle-Vendor,Bundle-Version,Export-Package,Import-Package
+maven.jar.manifest.attribute.Specification-Version=${pom.currentVersion}
maven.jar.manifest.attribute.Implementation-Vendor-Id=org.apache
maven.jar.manifest.attribute.X-Compile-Source-JDK=${maven.compile.source}
maven.jar.manifest.attribute.X-Compile-Target-JDK=${maven.compile.target}
+
+#OSGi Jar Manifest entries
+maven.jar.manifest.attribute.Bundle-SymbolicName=${pom.package}
+maven.jar.manifest.attribute.Bundle-License=http://www.apache.org/licenses/LICENSE-2.0.txt
+maven.jar.manifest.attribute.Bundle-ManifestVersion=2
+maven.jar.manifest.attribute.Bundle-Name=Apache Commons Pool Bundle
+maven.jar.manifest.attribute.Bundle-Vendor=${pom.organization.name}
+maven.jar.manifest.attribute.Bundle-Version=${pom.currentVersion}
+maven.jar.manifest.attribute.Export-Package=org.apache.commons.pool;version=${pom.currentVersion},
org.apache.commons.pool.impl;version=${pom.currentVersion}
+maven.jar.manifest.attribute.Import-Package=org.apache.commons.pool;version=${pom.currentVersion},
org.apache.commons.pool.impl;version=${pom.currentVersion}
maven.xdoc.date=bottom
maven.xdoc.poweredby.image=maven-feather.png
