[#870] Convert all modules into osgi bundles
This commit is contained in:
parent
992d431a95
commit
fd75615d7a
@ -24,7 +24,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>netty-buffer</artifactId>
|
<artifactId>netty-buffer</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<name>Netty/Buffer</name>
|
<name>Netty/Buffer</name>
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>netty-codec-http</artifactId>
|
<artifactId>netty-codec-http</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<name>Netty/Codec/HTTP</name>
|
<name>Netty/Codec/HTTP</name>
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>netty-codec-socks</artifactId>
|
<artifactId>netty-codec-socks</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<name>Netty/Codec/Socks</name>
|
<name>Netty/Codec/Socks</name>
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>netty-codec</artifactId>
|
<artifactId>netty-codec</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<name>Netty/Codec</name>
|
<name>Netty/Codec</name>
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>netty-common</artifactId>
|
<artifactId>netty-common</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<name>Netty/Common</name>
|
<name>Netty/Common</name>
|
||||||
|
|
||||||
@ -48,5 +48,26 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.felix</groupId>
|
||||||
|
<artifactId>maven-bundle-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<instructions>
|
||||||
|
<!-- enforce JVM vendor package as optional -->
|
||||||
|
<Import-Package>
|
||||||
|
sun.misc.*;resolution:=optional,
|
||||||
|
*
|
||||||
|
</Import-Package>
|
||||||
|
<!-- override "internal" private package convention -->
|
||||||
|
<Private-Package>
|
||||||
|
!*
|
||||||
|
</Private-Package>
|
||||||
|
</instructions>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
</project>
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>netty-handler</artifactId>
|
<artifactId>netty-handler</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<name>Netty/Handler</name>
|
<name>Netty/Handler</name>
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>netty-microbench</artifactId>
|
<artifactId>netty-microbench</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<name>Netty/Microbench</name>
|
<name>Netty/Microbench</name>
|
||||||
|
|
||||||
|
17
pom.xml
17
pom.xml
@ -354,7 +354,6 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>2.12</version>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<includes>
|
<includes>
|
||||||
<include>**/*Test*.java</include>
|
<include>**/*Test*.java</include>
|
||||||
@ -421,11 +420,27 @@
|
|||||||
<tagNameFormat>netty-@{project.version}</tagNameFormat>
|
<tagNameFormat>netty-@{project.version}</tagNameFormat>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<!-- always produce osgi bundles -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.felix</groupId>
|
||||||
|
<artifactId>maven-bundle-plugin</artifactId>
|
||||||
|
<extensions>true</extensions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<!-- keep surefire and failsafe in sync -->
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
|
<version>2.12</version>
|
||||||
|
</plugin>
|
||||||
|
<!-- keep surefire and failsafe in sync -->
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-failsafe-plugin</artifactId>
|
||||||
|
<version>2.12</version>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
<version>2.5</version>
|
<version>2.5</version>
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>io.netty</groupId>
|
<groupId>io.netty</groupId>
|
||||||
<artifactId>netty-parent</artifactId>
|
<artifactId>netty-parent</artifactId>
|
||||||
@ -24,7 +25,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>netty-transport-rxtx</artifactId>
|
<artifactId>netty-transport-rxtx</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<name>Netty/Transport/RXTX</name>
|
<name>Netty/Transport/RXTX</name>
|
||||||
|
|
||||||
@ -44,6 +45,7 @@
|
|||||||
<artifactId>netty-transport</artifactId>
|
<artifactId>netty-transport</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!-- FIXME find/make osgi bundle -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.rxtx</groupId>
|
<groupId>org.rxtx</groupId>
|
||||||
<artifactId>rxtx</artifactId>
|
<artifactId>rxtx</artifactId>
|
||||||
@ -51,4 +53,3 @@
|
|||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>netty-transport-sctp</artifactId>
|
<artifactId>netty-transport-sctp</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<name>Netty/Transport/SCTP</name>
|
<name>Netty/Transport/SCTP</name>
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>netty-transport-udt</artifactId>
|
<artifactId>netty-transport-udt</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<name>Netty/Transport/UDT</name>
|
<name>Netty/Transport/UDT</name>
|
||||||
|
|
||||||
@ -77,6 +77,7 @@
|
|||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
|
||||||
|
<!-- run each test in separate JVM -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
@ -85,6 +86,20 @@
|
|||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- attach and deploy tests artifact -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>test-jar</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>netty-transport</artifactId>
|
<artifactId>netty-transport</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>bundle</packaging>
|
||||||
|
|
||||||
<name>Netty/Transport</name>
|
<name>Netty/Transport</name>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user