From 0fbc20b5c5c39d31c2a594881bf8514198d31780 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <jan.n.klug@rub.de>
Date: Fri, 30 Aug 2019 11:34:07 +0200
Subject: [PATCH] proof-of-concept part #2

Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
---
 bundles/org.openhab.binding.mail/pom.xml      |  8 ++++--
 .../src/main/feature/feature.xml              |  2 --
 bundles/org.openhab.binding.snmp/pom.xml      |  2 +-
 .../src/main/feature/feature.xml              |  1 -
 pom.xml                                       | 28 +++++++++++++++++--
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/bundles/org.openhab.binding.mail/pom.xml b/bundles/org.openhab.binding.mail/pom.xml
index 3358fc31422f7..d362ec3edd1cc 100644
--- a/bundles/org.openhab.binding.mail/pom.xml
+++ b/bundles/org.openhab.binding.mail/pom.xml
@@ -17,14 +17,18 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-email</artifactId>
       <version>1.5</version>
-      <scope>provided</scope>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.sun.mail</groupId>
       <artifactId>javax.mail</artifactId>
       <version>1.6.2</version>
-      <scope>provided</scope>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 
+  <properties>
+    <bnd.importpackage>sun.security.util;resolution:=optional</bnd.importpackage>
+  </properties>
+
 </project>
diff --git a/bundles/org.openhab.binding.mail/src/main/feature/feature.xml b/bundles/org.openhab.binding.mail/src/main/feature/feature.xml
index 880a90a78a0f4..c6f76579d1354 100644
--- a/bundles/org.openhab.binding.mail/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.mail/src/main/feature/feature.xml
@@ -4,8 +4,6 @@
 
     <feature name="openhab-binding-mail" description="Mail Binding" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <bundle dependency="true">mvn:com.sun.mail/javax.mail/1.6.2</bundle>
-        <bundle dependency="true">mvn:org.apache.commons/commons-email/1.5</bundle>
         <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.mail/${project.version}</bundle>
     </feature>
 </features>
diff --git a/bundles/org.openhab.binding.snmp/pom.xml b/bundles/org.openhab.binding.snmp/pom.xml
index 11ce56732c63d..ee16215f97d3f 100644
--- a/bundles/org.openhab.binding.snmp/pom.xml
+++ b/bundles/org.openhab.binding.snmp/pom.xml
@@ -18,7 +18,7 @@
       <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
       <version>2.6.3_1</version>
-      <scope>provided</scope>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 
diff --git a/bundles/org.openhab.binding.snmp/src/main/feature/feature.xml b/bundles/org.openhab.binding.snmp/src/main/feature/feature.xml
index 87b956e0d3415..9d565777b2d9c 100644
--- a/bundles/org.openhab.binding.snmp/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.snmp/src/main/feature/feature.xml
@@ -4,7 +4,6 @@
 
     <feature name="openhab-binding-snmp" description="SNMP Binding" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/2.6.3_1</bundle>
         <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.snmp/${project.version}</bundle>
     </feature>
 </features>
diff --git a/pom.xml b/pom.xml
index 233098c8d9e43..81da22ece39de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -499,6 +499,7 @@ Import-Package: \\
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
+
         <plugin>
           <groupId>org.openhab.tools.sat</groupId>
           <artifactId>sat-plugin</artifactId>
@@ -545,6 +546,7 @@ Import-Package: \\
           </execution>
         </executions>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
@@ -564,6 +566,28 @@ Import-Package: \\
           </execution>
         </executions>
       </plugin>
+
+      <!-- embed compile time dependencies by copying -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>dependencies</id>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeScope>runtime</includeScope>
+              <includeTypes>jar</includeTypes>
+              <excludeGroupIds>javax.activation,org.apache.karaf.features</excludeGroupIds>
+              <outputDirectory>${project.build.directory}/classes</outputDirectory>
+              <overWriteReleases>true</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -620,7 +644,7 @@ Import-Package: \\
         </file>
       </activation>
       <properties>
-        <bnd.includeresource>-${.}/../../NOTICE, -${.}/../../*.xsd, ${.}/../../lib/; filter:=*.jar; lib:=true</bnd.includeresource>
+        <bnd.includeresource>-${.}/../../NOTICE, -${.}/../../*.xsd, ${.}/../../lib/;filter:=*.jar;lib:=true</bnd.includeresource>
         <feature.directory>../../src/main/feature/feature.xml</feature.directory>
       </properties>
       <build>
@@ -663,7 +687,7 @@ Import-Package: \\
         </file>
       </activation>
       <properties>
-        <bnd.includeresource>-${.}/NOTICE, -${.}/*.xsd, ${.}/lib/; filter:=*.jar; lib:=true</bnd.includeresource>
+        <bnd.includeresource>-${.}/NOTICE, -${.}/*.xsd, ${.}/lib/;filter:=*.jar;lib:=true</bnd.includeresource>
       </properties>
     </profile>