Skip to content

Instantly share code, notes, and snippets.

@anpieber

anpieber/gist:1170553

Created August 25, 2011 12:34
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save anpieber/1170553 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save anpieber/1170553 to your computer and use it in GitHub Desktop.
Download ZIP
osgi patch wicket
Raw
gistfile1.txt
diff --git a/pom.xml b/pom.xml
index c3b66f8..98d28b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,12 +99,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- </plugins>
+ </plugins>
</build>
<distributionManagement>
@@ -163,11 +158,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
</plugins>
</build>
@@ -582,11 +572,6 @@
<artifactId>maven-jar-plugin</artifactId>
<inherited>true</inherited>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -772,23 +757,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.2.0</version>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</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>
+ <version>2.3.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index bff81c3..1ad8d93 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>wicket-core</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Wicket Core</name>
<description>
Wicket is a Java web application framework that takes simplicity,
@@ -86,6 +86,22 @@
<licenseLocation>${basedir}/../../../common/lib/clover.license</licenseLocation>
</configuration>
</plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Require-Bundle>org.apache.wicket.request;visibility:=reexport,org.apache.wicket.util;visibility:=reexport</Require-Bundle>
+ <Bundle-SymbolicName>org.apache.wicket.core</Bundle-SymbolicName>
+ <Import-Package>junit.framework;resolution:=optional, *</Import-Package>
+ <Export-Package>org.apache.wicket.*;version=${project.version}</Export-Package>
+ <_nouses>true</_nouses>
+ <_failok>true</_failok>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
+
diff --git a/wicket-request/pom.xml b/wicket-request/pom.xml
index 8b540d8..f75568e 100755
--- a/wicket-request/pom.xml
+++ b/wicket-request/pom.xml
@@ -26,6 +26,7 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
<version>1.5-SNAPSHOT</version>
+ <packaging>bundle</packaging>
<name>Wicket Request</name>
<url>http://maven.apache.org</url>
<dependencies>
@@ -40,5 +41,25 @@
<scope>test</scope>
<version>${project.version}</version>
</dependency>
- </dependencies>
+</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Require-Bundle>org.apache.wicket.util;visibility:=reexport</Require-Bundle>
+ <Bundle-SymbolicName>org.apache.wicket.request</Bundle-SymbolicName>
+ <!--<Import-Package>junit.framework;resolution:=optional, *</Import-Package>-->
+ <Export-Package>org.apache.wicket.*;version=${project.version};org.apache.wicket.request=split;mandatory:=org.apache.wicket.request</Export-Package>
+ <_nouses>true</_nouses>
+ <_failok>true</_failok>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
+
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index 323a483..8c58bb4 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -26,6 +26,25 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
<version>1.5-SNAPSHOT</version>
+ <packaging>bundle</packaging>
<name>Wicket Util</name>
<url>http://maven.apache.org</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.wicket.util</Bundle-SymbolicName>
+ <!--<Import-Package>junit.framework;resolution:=optional, *</Import-Package>-->
+ <Export-Package>org.apache.wicket.*;version=${project.version};org.apache.wicket.util=split;mandatory:=org.apache.wicket.util</Export-Package>
+ <_nouses>true</_nouses>
+ <_failok>true</_failok>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment