geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r824381 - in /geronimo/xbean/trunk: xbean-asm-shaded/pom.xml xbean-finder-shaded/pom.xml
Date Mon, 12 Oct 2009 15:21:07 GMT
Author: jlaskowski
Date: Mon Oct 12 15:21:06 2009
New Revision: 824381

URL: http://svn.apache.org/viewvc?rev=824381&view=rev
Log:
XBEAN-141 NumberFormatException upon installing the shaded subprojects - asm and reflect -
into Apache Felix 2.0.0

Modified:
    geronimo/xbean/trunk/xbean-asm-shaded/pom.xml
    geronimo/xbean/trunk/xbean-finder-shaded/pom.xml

Modified: geronimo/xbean/trunk/xbean-asm-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm-shaded/pom.xml?rev=824381&r1=824380&r2=824381&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-asm-shaded/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-asm-shaded/pom.xml Mon Oct 12 15:21:06 2009
@@ -28,7 +28,7 @@
         <version>3.7-SNAPSHOT</version>
     </parent>
     <artifactId>xbean-asm-shaded</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Apache XBean :: ASM shaded (repackaged)</name>
 
     <description>Repackaged and shaded asm jars</description>
@@ -66,16 +66,10 @@
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
-                                        <Bundle-Name>${pom.name}</Bundle-Name>
-                                        <Bundle-Vendor>${organization.name}</Bundle-Vendor>
-                                        <Bundle-Version>${version}</Bundle-Version>
-                                        <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
                                         <Bundle-License>http://asm.ow2.org/license.html</Bundle-License>
-                                        <Bundle-Description>${description}</Bundle-Description>
-                                        <Bundle-DocURL>${project.url}</Bundle-DocURL>
+                                        <Bundle-SymbolicName>org.apache.xbean.asm-shaded</Bundle-SymbolicName>
                                         <Export-Package>${xbean.osgi.export}</Export-Package>
                                         <Import-Package>${xbean.osgi.export}</Import-Package>
-                                        <Bundle-SymbolicName>org.apache.xbean.asm-shaded</Bundle-SymbolicName>
                                     </manifestEntries>
                                 </transformer>
                             </transformers>
@@ -101,18 +95,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--<plugin>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>maven-bundle-plugin</artifactId>-->
-            <!--<extensions>true</extensions>-->
-            <!--<configuration>-->
-            <!--<instructions>-->
-            <!--<Export-Package>org.apache.xbean.asm;version=3.1</Export-Package>-->
-            <!--<Import-Package>${xbean.osgi.import}</Import-Package>-->
-            <!--<Private-Package />-->
-            <!--</instructions>-->
-            <!--</configuration>-->
-            <!--</plugin>-->
         </plugins>
     </build>
     <dependencies>

Modified: geronimo/xbean/trunk/xbean-finder-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder-shaded/pom.xml?rev=824381&r1=824380&r2=824381&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder-shaded/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder-shaded/pom.xml Mon Oct 12 15:21:06 2009
@@ -60,26 +60,32 @@
                                     <exclude>org.apache.xbean:xbean-asm-shaded</exclude>
                                 </excludes>
                             </artifactSet>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <manifestEntries>
-                                        <Bundle-Name>${pom.name}</Bundle-Name>
-                                        <Bundle-Vendor>${organization.name}</Bundle-Vendor>
-                                        <Bundle-Version>${version}</Bundle-Version>
-                                        <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
-                                        <Bundle-License>${license.url}</Bundle-License>
-                                        <Bundle-Description>${description}</Bundle-Description>
-                                        <Bundle-DocURL>${project.url}</Bundle-DocURL>
-                                        <Export-Package>${xbean.osgi.export}</Export-Package>
-                                        <Import-Package>${xbean.osgi.import}</Import-Package>
-                                        <Bundle-SymbolicName>org.apache.xbean.finder-shaded</Bundle-SymbolicName>
-                                    </manifestEntries>
-                                </transformer>
-                            </transformers>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Import-Package>!org.objectweb.asm.*,!org.apache.xbean.finder.*,org.apache.xbean.asm,*;resolution:=optional</Import-Package>
+                        <Private-Package />
+                        <excludeDependencies>true</excludeDependencies>
+                        <_nouses>true</_nouses>
+                        <_classpath>target/xbean-finder-shaded-${pom.version}.jar</_classpath>
+                    </instructions>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>bundle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencies>



Mime
View raw message