You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xbean-scm@geronimo.apache.org by gn...@apache.org on 2014/05/20 21:00:19 UTC
svn commit: r1596365 - in /geronimo/xbean/trunk: pom.xml
xbean-asm5-shaded/pom.xml xbean-finder-shaded/pom.xml xbean-finder/pom.xml
xbean-reflect/pom.xml
Author: gnodet
Date: Tue May 20 19:00:19 2014
New Revision: 1596365
URL: http://svn.apache.org/r1596365
Log:
[XBEAN-268] Fix osgi headers and missing package
Modified:
geronimo/xbean/trunk/pom.xml
geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml
geronimo/xbean/trunk/xbean-finder-shaded/pom.xml
geronimo/xbean/trunk/xbean-finder/pom.xml
geronimo/xbean/trunk/xbean-reflect/pom.xml
Modified: geronimo/xbean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/pom.xml?rev=1596365&r1=1596364&r2=1596365&view=diff
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Tue May 20 19:00:19 2014
@@ -337,12 +337,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
- <Export-Package>org.apache.xbean.*;version=${project.version}</Export-Package>
+ <Export-Package>org.apache.xbean.*;version=${project.version};-noimport:=true</Export-Package>
<Private-Package />
</instructions>
</configuration>
Modified: geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml?rev=1596365&r1=1596364&r2=1596365&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml Tue May 20 19:00:19 2014
@@ -49,6 +49,13 @@
org.apache.xbean.asm5.commons;version=${asm.version},
org.apache.xbean.asm5.tree;version=${asm.version}
</xbean.osgi.export>
+ <xbean.osgi.import>
+ org.apache.xbean.asm5.shade.commons;version="[${asm.version},${asm.version}]",
+ org.apache.xbean.asm5;version="[${asm.version},${asm.version}]",
+ org.apache.xbean.asm5.signature;version="[${asm.version},${asm.version}]",
+ org.apache.xbean.asm5.commons;version="[${asm.version},${asm.version}]",
+ org.apache.xbean.asm5.tree;version="[${asm.version},${asm.version}]"
+ </xbean.osgi.import>
</properties>
<build>
@@ -80,7 +87,7 @@
<Bundle-License>http://asm.ow2.org/license.html</Bundle-License>
<Bundle-SymbolicName>org.apache.xbean.asm5-shaded</Bundle-SymbolicName>
<Export-Package>${xbean.osgi.export}</Export-Package>
- <Import-Package>${xbean.osgi.export}</Import-Package>
+ <Import-Package>${xbean.osgi.import}</Import-Package>
</manifestEntries>
</transformer>
</transformers>
Modified: geronimo/xbean/trunk/xbean-finder-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder-shaded/pom.xml?rev=1596365&r1=1596364&r2=1596365&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder-shaded/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder-shaded/pom.xml Tue May 20 19:00:19 2014
@@ -96,11 +96,18 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <excludeDependencies>true</excludeDependencies>
<instructions>
- <Import-Package>!org.objectweb.asm.*,!org.apache.xbean.finder.*,org.apache.xbean.asm5,*;resolution:=optional</Import-Package>
+ <Export-Package>
+ org.apache.xbean.finder.*;version=${project.version};-noimport:=true
+ </Export-Package>
+ <Import-Package>
+ org.apache.xbean.asm5.*;version="[5.0,6.0)",
+ *
+ </Import-Package>
<Private-Package />
- <_nouses>true</_nouses>
+ <_removeheaders>
+ Ignore-Package,Private-Package,Include-Resource,Embed-Dependency
+ </_removeheaders>
</instructions>
</configuration>
<executions>
@@ -126,5 +133,11 @@
<artifactId>xbean-asm5-shaded</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/xbean/trunk/xbean-finder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/pom.xml?rev=1596365&r1=1596364&r2=1596365&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder/pom.xml Tue May 20 19:00:19 2014
@@ -69,16 +69,20 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>org.apache.xbean.finder.*;version=${project.version}</Export-Package>
+ <Export-Package>
+ org.apache.xbean.finder.*;version=${project.version};-noimport:=true
+ </Export-Package>
<Import-Package>
- org.objectweb.asm;version=5,
- org.objectweb.asm.commons;version=5,
+ org.objectweb.asm*;version="[5.0,6.0)",
*
</Import-Package>
+ <Private-Package>org.apache.xbean.asm5.original.commons</Private-Package>
+ <_removeheaders>
+ Ignore-Package,Private-Package,Include-Resource,Embed-Dependency
+ </_removeheaders>
</instructions>
</configuration>
</plugin>
Modified: geronimo/xbean/trunk/xbean-reflect/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/pom.xml?rev=1596365&r1=1596364&r2=1596365&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-reflect/pom.xml Tue May 20 19:00:19 2014
@@ -80,15 +80,32 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
<extensions>true</extensions>
<configuration>
<excludeDependencies>true</excludeDependencies>
<instructions>
- <Export-Package>!org.apache.xbean.asm.*,org.apache.xbean.*;version=${project.version}</Export-Package>
- <Import-Package>*,org.apache.log4j;resolution:=optional,org.apache.commons.logging;resolution:=optional,org.objectweb.asm;resolution:=optional;version=5,org.objectweb.asm.commons;resolution:=optional;version=5,org.apache.xbean.asm5;resolution:=optional;version=5,org.apache.xbean.asm5.original.commons;resolution:=optional,org.apache.xbean.asm5.shade.commons;resolution:=optional;version=5</Import-Package>
+ <Export-Package>
+ org.apache.xbean.propertyeditor;version=${project.version};-noimport:=true,
+ org.apache.xbean.recipe;version=${project.version};-noimport:=true
+ </Export-Package>
+ <Import-Package>
+ org.apache.log4j;resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
+ org.objectweb.asm;resolution:=optional;version="[5.0,6.0)",
+ org.objectweb.asm.commons;resolution:=optional;version="[5.0,6.0)",
+ org.apache.xbean.asm5;resolution:=optional;version="[5.0,6.0)",
+ org.apache.xbean.asm5.commons;resolution:=optional;version="[5.0,6.0)",
+ org.apache.xbean.asm5.shade.commons;resolution:=optional;version="[5.0,6.0)",
+ javax.*
+ </Import-Package>
+ <Private-Package>
+ org.apache.xbean.asm5.original.commons
+ </Private-Package>
+ <_removeheaders>
+ Ignore-Package,Private-Package,Include-Resource,Embed-Dependency
+ </_removeheaders>
</instructions>
- </configuration>
+ </configuration>
</plugin>
</plugins>
</build>