Provide proper OSGi meta-data for all modules eclipse-leshan#248 (ecl…

…ipse-leshan#249) * Provide proper OSGi meta-data for all modules eclipse-leshan#248 Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>
mike-scott · Mar 24, 2017 · 6d4cc6d · 6d4cc6d
1 parent a6d9f93
commit 6d4cc6d
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 8 deletions.
diff --git a/californium-core/pom.xml b/californium-core/pom.xml
@@ -11,7 +11,7 @@
 		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>californium-core</artifactId>
-	<packaging>jar</packaging>
+	<packaging>bundle</packaging>
 
 	<name>Californium (Cf) Core</name>
 	<description>CoAP library module</description>
@@ -36,6 +36,35 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>
+							org.eclipse.californium.core,
+							org.eclipse.californium.core.coap,
+							org.eclipse.californium.core.network,
+							org.eclipse.californium.core.network.config,
+							org.eclipse.californium.core.network.interceptors,
+							org.eclipse.californium.core.network.stack,
+							org.eclipse.californium.core.observe,
+							org.eclipse.californium.core.server,
+							org.eclipse.californium.core.server.resources
+						</Export-Package>
+						<Private-Package>
+							org.eclipse.californium.core.network.deduplication,
+							org.eclipse.californium.core.network.serialization,
+							org.eclipse.californium.core.network.stack.*
+						</Private-Package>
+						<Import-Package>
+							*
+						</Import-Package>
+						<Bundle-SymbolicName>${project.groupId}.core</Bundle-SymbolicName>
+					</instructions>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>

diff --git a/californium-proxy/pom.xml b/californium-proxy/pom.xml
@@ -11,11 +11,17 @@
 		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>californium-proxy</artifactId>
-	<packaging>jar</packaging>
+	<packaging>bundle</packaging>
 
 	<name>Californium (Cf) Proxy</name>
 	<description>Cross-proxy module</description>
 
+	<properties>
+		<httpcomponents.version>4.2.5</httpcomponents.version>
+		<httpcomponents.version.lowerbound>4.2</httpcomponents.version.lowerbound>
+		<httpcomponents.version.upperbound>5</httpcomponents.version.upperbound>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -31,13 +37,13 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpcore-nio</artifactId>
-			<version>4.2.5</version>
+			<version>${httpcomponents.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.2.5</version>
+			<version>${httpcomponents.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -46,4 +52,27 @@
 			<version>15.0</version>
 		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>
+							org.eclipse.californium.proxy,
+							org.eclipse.californium.proxy.resources
+						</Export-Package>
+						<Import-Package>
+							org.apache.http*; version="[${httpcomponents.version.lowerbound},${httpcomponents.version.upperbound})",
+							*
+						</Import-Package>
+						<Bundle-SymbolicName>${project.groupId}.proxy</Bundle-SymbolicName>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/element-connector/pom.xml b/element-connector/pom.xml
@@ -14,6 +14,12 @@
 
 	<name>element-connector</name>
 	<description>Java socket abstraction for datagram transports (UDP, DTLS, etc.)</description>
+
+	<properties>
+		<netty.version>4.1.1.Final</netty.version>
+		<netty.version.lowerbound>4.1</netty.version.lowerbound>
+		<netty.version.upperbound>5</netty.version.upperbound>
+	</properties>
 
 	<dependencies>
 		<dependency>
@@ -27,7 +33,7 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
-			<version>4.1.1.Final</version>
+			<version>${netty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
@@ -45,12 +51,15 @@
 				<configuration>
 					<instructions>
 						<Export-Package>
-							org.eclipse.californium.elements
+							org.eclipse.californium.elements,
+							org.eclipse.californium.elements.tcp,
+							org.eclipse.californium.elements.util
 						</Export-Package>
 						<Import-Package>
+							io.netty*; version="[${netty.version.lowerbound},${netty.version.upperbound})",
 							*
 						</Import-Package>
-						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+						<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
 					</instructions>
 				</configuration>
 			</plugin>

diff --git a/scandium-core/pom.xml b/scandium-core/pom.xml
@@ -112,7 +112,7 @@
 						<Import-Package>
 							*
 						</Import-Package>
-						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+						<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
 					</instructions>
 				</configuration>
 			</plugin>