Converted my JARs into OSGi bundles
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Mon, 04 Nov 2013 13:03:58 +0100
changeset 3143461e5ec9059
parent 313 0794bce338ea
child 315 b3a78c2e5c33
Converted my JARs into OSGi bundles
boot-fx/pom.xml
boot/pom.xml
context/pom.xml
geo/pom.xml
json-tck/pom.xml
json/pom.xml
ko-fx/pom.xml
ko-ws-tyrus/pom.xml
pom.xml
sound/pom.xml
     1.1 --- a/boot-fx/pom.xml	Sat Nov 02 15:50:23 2013 +0100
     1.2 +++ b/boot-fx/pom.xml	Mon Nov 04 13:03:58 2013 +0100
     1.3 @@ -10,19 +10,17 @@
     1.4    <artifactId>boot-fx</artifactId>
     1.5    <version>0.7-SNAPSHOT</version>
     1.6    <name>FX WebView Bootstrap</name>
     1.7 +  <packaging>bundle</packaging>
     1.8    <url>http://maven.apache.org</url>
     1.9    <properties>
    1.10      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    1.11 +    <publicPackages>net.java.html.boot.fx</publicPackages>
    1.12    </properties>
    1.13    <build>
    1.14        <plugins>
    1.15            <plugin>
    1.16 -              <groupId>org.apache.maven.plugins</groupId>
    1.17 -              <artifactId>maven-javadoc-plugin</artifactId>
    1.18 -              <configuration>
    1.19 -                  <skip>false</skip>
    1.20 -                  <subpackages>net.java.html.boot.fx</subpackages>
    1.21 -              </configuration>
    1.22 +              <groupId>org.apache.felix</groupId>
    1.23 +              <artifactId>maven-bundle-plugin</artifactId>
    1.24            </plugin>
    1.25            <plugin>
    1.26                <groupId>org.apache.maven.plugins</groupId>
     2.1 --- a/boot/pom.xml	Sat Nov 02 15:50:23 2013 +0100
     2.2 +++ b/boot/pom.xml	Mon Nov 04 13:03:58 2013 +0100
     2.3 @@ -9,20 +9,18 @@
     2.4    <groupId>org.apidesign.html</groupId>
     2.5    <artifactId>net.java.html.boot</artifactId>
     2.6    <version>0.7-SNAPSHOT</version>
     2.7 +  <packaging>bundle</packaging>
     2.8    <name>Browser Bootstrap</name>
     2.9    <url>http://maven.apache.org</url>
    2.10    <properties>
    2.11      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    2.12 +    <publicPackages>net.java.html.js,net.java.html.boot</publicPackages>
    2.13    </properties>
    2.14    <build>
    2.15        <plugins>
    2.16            <plugin>
    2.17 -              <groupId>org.apache.maven.plugins</groupId>
    2.18 -              <artifactId>maven-javadoc-plugin</artifactId>
    2.19 -              <configuration>
    2.20 -                  <subpackages>net.java.html.js:net.java.html.boot</subpackages>
    2.21 -                  <skip>false</skip>
    2.22 -              </configuration>
    2.23 +              <groupId>org.apache.felix</groupId>
    2.24 +              <artifactId>maven-bundle-plugin</artifactId>
    2.25            </plugin>
    2.26        </plugins>
    2.27    </build>
     3.1 --- a/context/pom.xml	Sat Nov 02 15:50:23 2013 +0100
     3.2 +++ b/context/pom.xml	Mon Nov 04 13:03:58 2013 +0100
     3.3 @@ -9,20 +9,18 @@
     3.4    <groupId>org.apidesign.html</groupId>
     3.5    <artifactId>net.java.html</artifactId>
     3.6    <version>0.7-SNAPSHOT</version>
     3.7 +  <packaging>bundle</packaging>
     3.8    <name>HTML Context</name>
     3.9    <url>http://maven.apache.org</url>
    3.10    <properties>
    3.11      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    3.12 +    <publicPackages>net.java.html</publicPackages>
    3.13    </properties>
    3.14    <build>
    3.15        <plugins>
    3.16            <plugin>
    3.17 -              <groupId>org.apache.maven.plugins</groupId>
    3.18 -              <artifactId>maven-javadoc-plugin</artifactId>
    3.19 -              <configuration>
    3.20 -                  <subpackages>net.java.html</subpackages>
    3.21 -                  <skip>false</skip>
    3.22 -              </configuration>
    3.23 +              <groupId>org.apache.felix</groupId>
    3.24 +              <artifactId>maven-bundle-plugin</artifactId>
    3.25            </plugin>
    3.26        </plugins>
    3.27    </build>
     4.1 --- a/geo/pom.xml	Sat Nov 02 15:50:23 2013 +0100
     4.2 +++ b/geo/pom.xml	Mon Nov 04 13:03:58 2013 +0100
     4.3 @@ -9,20 +9,18 @@
     4.4    <groupId>org.apidesign.html</groupId>
     4.5    <artifactId>net.java.html.geo</artifactId>
     4.6    <version>0.7-SNAPSHOT</version>
     4.7 +  <packaging>bundle</packaging>
     4.8    <name>Geolocation API</name>
     4.9    <url>http://maven.apache.org</url>
    4.10    <properties>
    4.11      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    4.12 +    <publicPackages>net.java.html.geo</publicPackages>
    4.13    </properties>
    4.14    <build>
    4.15        <plugins>
    4.16            <plugin>
    4.17 -              <groupId>org.apache.maven.plugins</groupId>
    4.18 -              <artifactId>maven-javadoc-plugin</artifactId>
    4.19 -              <configuration>
    4.20 -                  <subpackages>net.java.html.geo</subpackages>
    4.21 -                  <skip>false</skip>
    4.22 -              </configuration>
    4.23 +              <groupId>org.apache.felix</groupId>
    4.24 +              <artifactId>maven-bundle-plugin</artifactId>
    4.25            </plugin>
    4.26        </plugins>
    4.27    </build>
    4.28 @@ -39,7 +37,7 @@
    4.29      <dependency>
    4.30        <groupId>org.apidesign.html</groupId>
    4.31        <artifactId>net.java.html.boot</artifactId>
    4.32 -      <version>0.7-SNAPSHOT</version>
    4.33 +      <version>${project.version}</version>
    4.34        <type>jar</type>
    4.35      </dependency>
    4.36    </dependencies>
     5.1 --- a/json-tck/pom.xml	Sat Nov 02 15:50:23 2013 +0100
     5.2 +++ b/json-tck/pom.xml	Mon Nov 04 13:03:58 2013 +0100
     5.3 @@ -9,18 +9,24 @@
     5.4    <groupId>org.apidesign.html</groupId>
     5.5    <artifactId>net.java.html.json.tck</artifactId>
     5.6    <version>0.7-SNAPSHOT</version>
     5.7 +  <packaging>bundle</packaging>
     5.8    <name>TCK for JSON Model</name>
     5.9    <url>http://maven.apache.org</url>
    5.10    <properties>
    5.11      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    5.12 +    <publicPackages>org.apidesign.html.json.tck</publicPackages>
    5.13    </properties>
    5.14    <build>
    5.15        <plugins>
    5.16            <plugin>
    5.17 +              <groupId>org.apache.felix</groupId>
    5.18 +              <artifactId>maven-bundle-plugin</artifactId>
    5.19 +          </plugin>
    5.20 +          <plugin>
    5.21                <groupId>org.apache.maven.plugins</groupId>
    5.22                <artifactId>maven-javadoc-plugin</artifactId>
    5.23                <configuration>
    5.24 -                  <subpackages>org.apidesign.html.json.tck:org.apidesign.html.json.spi</subpackages>
    5.25 +                  <subpackages>org.apidesign.html.json.tck,org.apidesign.html.json.spi</subpackages>
    5.26                    <skip>false</skip>
    5.27                    <includeDependencySources>true</includeDependencySources>
    5.28                </configuration>
     6.1 --- a/json/pom.xml	Sat Nov 02 15:50:23 2013 +0100
     6.2 +++ b/json/pom.xml	Mon Nov 04 13:03:58 2013 +0100
     6.3 @@ -9,20 +9,18 @@
     6.4    <groupId>org.apidesign.html</groupId>
     6.5    <artifactId>net.java.html.json</artifactId>
     6.6    <version>0.7-SNAPSHOT</version>
     6.7 +  <packaging>bundle</packaging>
     6.8    <name>JSON Model in Java</name>
     6.9    <url>http://maven.apache.org</url>
    6.10    <properties>
    6.11      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    6.12 +    <publicPackages>net.java.html.json</publicPackages>
    6.13    </properties>
    6.14    <build>
    6.15        <plugins>
    6.16            <plugin>
    6.17 -              <groupId>org.apache.maven.plugins</groupId>
    6.18 -              <artifactId>maven-javadoc-plugin</artifactId>
    6.19 -              <configuration>
    6.20 -                  <subpackages>net.java.html.json</subpackages>
    6.21 -                  <skip>false</skip>
    6.22 -              </configuration>
    6.23 +              <groupId>org.apache.felix</groupId>
    6.24 +              <artifactId>maven-bundle-plugin</artifactId>
    6.25            </plugin>
    6.26            <plugin>
    6.27                <groupId>org.apache.maven.plugins</groupId>
     7.1 --- a/ko-fx/pom.xml	Sat Nov 02 15:50:23 2013 +0100
     7.2 +++ b/ko-fx/pom.xml	Mon Nov 04 13:03:58 2013 +0100
     7.3 @@ -9,6 +9,7 @@
     7.4    <groupId>org.apidesign.html</groupId>
     7.5    <artifactId>ko-fx</artifactId>
     7.6    <version>0.7-SNAPSHOT</version>
     7.7 +  <packaging>bundle</packaging>
     7.8    <name>Knockout.fx</name>
     7.9    <url>http://maven.apache.org</url>
    7.10    <properties>
    7.11 @@ -17,6 +18,10 @@
    7.12    <build>
    7.13        <plugins>
    7.14            <plugin>
    7.15 +              <groupId>org.apache.felix</groupId>
    7.16 +              <artifactId>maven-bundle-plugin</artifactId>
    7.17 +          </plugin>
    7.18 +          <plugin>
    7.19                <groupId>org.apache.maven.plugins</groupId>
    7.20                <artifactId>maven-javadoc-plugin</artifactId>
    7.21                <configuration>
     8.1 --- a/ko-ws-tyrus/pom.xml	Sat Nov 02 15:50:23 2013 +0100
     8.2 +++ b/ko-ws-tyrus/pom.xml	Mon Nov 04 13:03:58 2013 +0100
     8.3 @@ -9,6 +9,7 @@
     8.4    <groupId>org.apidesign.html</groupId>
     8.5    <artifactId>ko-ws-tyrus</artifactId>
     8.6    <version>0.7-SNAPSHOT</version>
     8.7 +  <packaging>bundle</packaging>
     8.8    <name>Tyrus Based WebSockets</name>
     8.9    <url>http://maven.apache.org</url>
    8.10      <build>
    8.11 @@ -23,6 +24,10 @@
    8.12                  </configuration>
    8.13              </plugin>
    8.14              <plugin>
    8.15 +                <groupId>org.apache.felix</groupId>
    8.16 +                <artifactId>maven-bundle-plugin</artifactId>
    8.17 +            </plugin>
    8.18 +            <plugin>
    8.19                  <groupId>org.apache.maven.plugins</groupId>
    8.20                  <artifactId>maven-javadoc-plugin</artifactId>
    8.21                  <configuration>
     9.1 --- a/pom.xml	Sat Nov 02 15:50:23 2013 +0100
     9.2 +++ b/pom.xml	Mon Nov 04 13:03:58 2013 +0100
     9.3 @@ -117,7 +117,8 @@
     9.4                  <artifactId>maven-javadoc-plugin</artifactId>
     9.5                  <version>2.9</version>
     9.6                  <configuration>
     9.7 -                    <skip>true</skip>
     9.8 +                    <subpackages>${publicPackages}</subpackages>
     9.9 +                    <skip>false</skip>
    9.10                  </configuration>
    9.11                </plugin>
    9.12              <plugin>
    9.13 @@ -129,6 +130,18 @@
    9.14                      <target>1.6</target>
    9.15                  </configuration>
    9.16              </plugin>
    9.17 +            <plugin>
    9.18 +                <groupId>org.apache.felix</groupId>
    9.19 +                <artifactId>maven-bundle-plugin</artifactId>
    9.20 +                <version>2.4.0</version>
    9.21 +                <extensions>true</extensions>
    9.22 +                <configuration>
    9.23 +                    <instructions>
    9.24 +                        <Export-Package>${publicPackages},META-INF.services.*</Export-Package>
    9.25 +                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
    9.26 +                    </instructions>
    9.27 +                </configuration>
    9.28 +            </plugin>
    9.29            </plugins>
    9.30        </pluginManagement>
    9.31    </build>
    10.1 --- a/sound/pom.xml	Sat Nov 02 15:50:23 2013 +0100
    10.2 +++ b/sound/pom.xml	Mon Nov 04 13:03:58 2013 +0100
    10.3 @@ -9,21 +9,19 @@
    10.4      <groupId>org.apidesign.html</groupId>
    10.5      <artifactId>net.java.html.sound</artifactId>
    10.6      <version>0.7-SNAPSHOT</version>
    10.7 +    <packaging>bundle</packaging>
    10.8      <name>Sound API via HTML</name>
    10.9      <url>http://maven.apache.org</url>
   10.10      <properties>
   10.11          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   10.12 +        <publicPackages>net.java.html.sound</publicPackages>
   10.13      </properties>
   10.14      <build>
   10.15          <plugins>
   10.16 -            <plugin>
   10.17 -                <groupId>org.apache.maven.plugins</groupId>
   10.18 -                <artifactId>maven-javadoc-plugin</artifactId>
   10.19 -                <configuration>
   10.20 -                    <skip>false</skip>
   10.21 -                    <subpackages>net.java.html.sound</subpackages>
   10.22 -                </configuration>
   10.23 -            </plugin>
   10.24 +          <plugin>
   10.25 +              <groupId>org.apache.felix</groupId>
   10.26 +              <artifactId>maven-bundle-plugin</artifactId>
   10.27 +          </plugin>
   10.28          </plugins>
   10.29      </build>
   10.30      <dependencies>