From 02c0342ce819cfe8cf8c01ad88b7a6412b0a5e9a Mon Sep 17 00:00:00 2001
From: Jens Reimann <ctron@dentrassi.de>
Date: Thu, 13 Oct 2016 18:47:20 +0200
Subject: [PATCH] [#59] Clean up OSGi metadata

- Remove "sun.misc" and "sun.nio.ch" from the list of imported packages.
- Add a Travis CI file
- Use the maven-bundle-plugin in order to create OSGi metadata. It falls back to the default configuration, only overriding this when really necessary.
- Prevent the maven-bundle-plugin from importing 'javax.annotation' in order to prevent a "uses violation".

Signed-off-by: Jens Reimann <jreimann@redhat.com>
---
 .gitignore                            |  8 ++++++--
 .travis.yml                           |  4 ++++
 milo-examples/client-examples/pom.xml | 20 -------------------
 milo-examples/pom.xml                 | 10 ++++++++++
 milo-examples/server-examples/pom.xml | 21 +-------------------
 opc-ua-sdk/pom.xml                    | 28 +--------------------------
 opc-ua-stack/pom.xml                  | 28 +--------------------------
 pom.xml                               | 28 +++++++++++++++++++++++++++
 8 files changed, 51 insertions(+), 96 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.gitignore b/.gitignore
index 98a9bbcbd5..bfef6139de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,14 @@
 *.war
 *.ear
 
+# Eclipse
+.settings/
+.project
+.classpath
+
 # IntelliJ #
 *.iml
 .idea/*
 
 # Maven #
-**/target/*
-target/*
+target/
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..45e9d6b583
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,4 @@
+language: java
+
+jdk:
+  - oraclejdk8
diff --git a/milo-examples/client-examples/pom.xml b/milo-examples/client-examples/pom.xml
index b1eccdbe44..1f2d5cc4a2 100644
--- a/milo-examples/client-examples/pom.xml
+++ b/milo-examples/client-examples/pom.xml
@@ -28,24 +28,4 @@
             <version>1.1.7</version>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.4.0</version>
-                <executions>
-                    <execution>
-                        <id>generate-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/milo-examples/pom.xml b/milo-examples/pom.xml
index e1f3442065..aed9a2b598 100644
--- a/milo-examples/pom.xml
+++ b/milo-examples/pom.xml
@@ -16,5 +16,15 @@
         <module>client-examples</module>
         <module>server-examples</module>
     </modules>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <!-- configuration inherited from pluginManagement -->
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/milo-examples/server-examples/pom.xml b/milo-examples/server-examples/pom.xml
index 71495b7c0e..d354b0c9f3 100644
--- a/milo-examples/server-examples/pom.xml
+++ b/milo-examples/server-examples/pom.xml
@@ -23,24 +23,5 @@
             <version>1.1.7</version>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.4.0</version>
-                <executions>
-                    <execution>
-                        <id>generate-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
+    
 </project>
diff --git a/opc-ua-sdk/pom.xml b/opc-ua-sdk/pom.xml
index b1f728c449..99043bf9be 100644
--- a/opc-ua-sdk/pom.xml
+++ b/opc-ua-sdk/pom.xml
@@ -88,33 +88,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.4.0</version>
-                <executions>
-                    <execution>
-                        <id>generate-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                        <configuration>
-                            <supportedProjectTypes>
-                                <supportedProjectType>jar</supportedProjectType>
-                                <supportedProjectType>bundle</supportedProjectType>
-                            </supportedProjectTypes>
-                            <instructions>
-                                <Export-Package>${project.groupId}.opcua.sdk.*</Export-Package>
-
-                                <!-- enforce JVM vendor package as optional -->
-                                <Import-Package>
-                                    *,sun.misc.*;resolution:=optional,sun.nio.ch;resolution:=optional,sun.security.*;resolution:=optional
-                                </Import-Package>
-
-                                <!-- override "internal" private package convention -->
-                                <Private-Package>!*</Private-Package>
-                            </instructions>
-                        </configuration>
-                    </execution>
-                </executions>
+                <!-- configuration inherited from pluginManagement -->
             </plugin>
 
             <plugin>
diff --git a/opc-ua-stack/pom.xml b/opc-ua-stack/pom.xml
index ac56fa6984..993e2d1fa9 100644
--- a/opc-ua-stack/pom.xml
+++ b/opc-ua-stack/pom.xml
@@ -53,33 +53,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.4.0</version>
-                <executions>
-                    <execution>
-                        <id>generate-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                        <configuration>
-                            <supportedProjectTypes>
-                                <supportedProjectType>jar</supportedProjectType>
-                                <supportedProjectType>bundle</supportedProjectType>
-                            </supportedProjectTypes>
-                            <instructions>
-                                <Export-Package>${project.groupId}.opcua.stack.*</Export-Package>
-
-                                <!-- enforce JVM vendor package as optional -->
-                                <Import-Package>
-                                    *,sun.misc.*;resolution:=optional,sun.nio.ch;resolution:=optional,sun.security.*;resolution:=optional
-                                </Import-Package>
-
-                                <!-- override "internal" private package convention -->
-                                <Private-Package>!*</Private-Package>
-                            </instructions>
-                        </configuration>
-                    </execution>
-                </executions>
+                <!-- configuration inherited from pluginManagement -->
             </plugin>
 
             <plugin>
diff --git a/pom.xml b/pom.xml
index f64614d93d..c5b365382e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,6 +195,34 @@
                     </configuration>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>3.2.0</version>
+                    <executions>
+                        <execution>
+                            <id>generate-manifest</id>
+                            <phase>process-classes</phase>
+                            <goals>
+                                <goal>manifest</goal>
+                            </goals>
+                            <configuration>
+                                <supportedProjectTypes>
+                                    <supportedProjectType>jar</supportedProjectType>
+                                    <supportedProjectType>bundle</supportedProjectType>
+                                </supportedProjectTypes>
+                                <instructions>
+                                    <Import-Package>
+                                        com.sun.management.*;resolution:=optional,
+                                        !javax.annotation.*,
+                                        *
+                                    </Import-Package>
+                                </instructions>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>