Author: mgrigorov Date: Fri Dec 31 11:55:46 2010 New Revision: 1054100 URL: http://svn.apache.org/viewvc?rev=1054100&view=rev Log: WICKET-3088 "split-package" problem for wicket bundles started in an osgi container
Re-work the packaging of 'wicket' module. Now it uses maven-dependency-plugin to unpack the resources from the dependendies (-core, -util and -request). This way it is possible to re-generate META-INF/MANIFEST.MF to add the OSGi headers. Modified: wicket/trunk/wicket/pom.xml Modified: wicket/trunk/wicket/pom.xml URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/pom.xml?rev=1054100&r1=1054099&r2=1054100&view=diff ============================================================================== --- wicket/trunk/wicket/pom.xml (original) +++ wicket/trunk/wicket/pom.xml Fri Dec 31 11:55:46 2010 @@ -33,24 +33,53 @@ </dependencies> <build> <plugins> + <!-- + How it works: + I) In 'prepare-package' phase do: + 1) unpack the dependencies in target/classes so it looks like + all files (*.class, *.properties, ...) belong to this project + 2) re-generate META-INF/MANIGEST.MF so that it contains all OSGi + headers for all packages + + II) In 'package' phase maven-jar-plugin collects all that in the + final artifact + --> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>1.4</version> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> <executions> <execution> - <phase>package</phase> + <id>unpack-dependencies</id> + <phase>prepare-package</phase> <goals> - <goal>shade</goal> + <goal>unpack-dependencies</goal> </goals> <configuration> - <artifactSet> - <includes> - <include>org.apache.wicket:wicket-core</include> - <include>org.apache.wicket:wicket-util</include> - <include>org.apache.wicket:wicket-request</include> - </includes> - </artifactSet> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <includes>**/*</includes> + <includeGroupIds>org.apache.wicket</includeGroupIds> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.1.0</version> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + <goals> + <goal>manifest</goal> + </goals> + <configuration> + <instructions> + <Import-Package>org.apache.wicket*</Import-Package> + <DynamicImport-Package>*</DynamicImport-Package> + <_nouses>true</_nouses> + </instructions> </configuration> </execution> </executions>