diff --git a/bundles/org.openhab.core.io.jetty.certificate/bnd.bnd b/bundles/org.openhab.core.io.jetty.certificate/bnd.bnd
index 36b85085c..f568b9f9a 100644
--- a/bundles/org.openhab.core.io.jetty.certificate/bnd.bnd
+++ b/bundles/org.openhab.core.io.jetty.certificate/bnd.bnd
@@ -1,2 +1,3 @@
 Bundle-SymbolicName: ${project.artifactId}
-Bundle-Activator: org.openhab.io.jetty.certificate.internal.CertificateGenerator
\ No newline at end of file
+Bundle-Activator: org.openhab.io.jetty.certificate.internal.CertificateGenerator
+Import-Package: !org.bouncycastle.*,*
diff --git a/bundles/org.openhab.core.io.jetty.certificate/lib/bcpkix-jdk15on-1.52.jar b/bundles/org.openhab.core.io.jetty.certificate/lib/bcpkix-jdk15on-1.52.jar
deleted file mode 100644
index b6a5a62d3..000000000
Binary files a/bundles/org.openhab.core.io.jetty.certificate/lib/bcpkix-jdk15on-1.52.jar and /dev/null differ
diff --git a/bundles/org.openhab.core.io.jetty.certificate/lib/bcprov-jdk15on-1.52.jar b/bundles/org.openhab.core.io.jetty.certificate/lib/bcprov-jdk15on-1.52.jar
deleted file mode 100644
index 6c54dd901..000000000
Binary files a/bundles/org.openhab.core.io.jetty.certificate/lib/bcprov-jdk15on-1.52.jar and /dev/null differ
diff --git a/bundles/org.openhab.core.io.jetty.certificate/pom.xml b/bundles/org.openhab.core.io.jetty.certificate/pom.xml
index ce5246095..03cb52897 100644
--- a/bundles/org.openhab.core.io.jetty.certificate/pom.xml
+++ b/bundles/org.openhab.core.io.jetty.certificate/pom.xml
@@ -16,7 +16,6 @@
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
       <version>1.52</version>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 
@@ -25,37 +24,37 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.1</version>
-        <configuration>
-          <artifactSet>
-            <includes>
-              <include>org.bouncycastle:*</include>
-            </includes>
-          </artifactSet>
-          <filters>
-            <filter>
-              <artifact>org.bouncycastle:*</artifact>
-              <excludes>
-                <!-- Exclude the JAR signing files -->
-                <exclude>META-INF/BCKEY.*</exclude>
-              </excludes>
-            </filter>
-          </filters>
-          <minimizeJar>true</minimizeJar>
-          <transformers>
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-              <manifestEntries>
-                <Bundle-Classpath>.</Bundle-Classpath>
-              </manifestEntries>
-            </transformer>
-          </transformers>
-        </configuration>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <goals>
               <goal>shade</goal>
             </goals>
             <phase>package</phase>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>org.bouncycastle:*</include>
+                </includes>
+              </artifactSet>
+              <filters>
+                <filter>
+                  <artifact>org.bouncycastle:*</artifact>
+                  <excludes>
+                    <!-- Exclude the JAR signing files -->
+                    <exclude>META-INF/BCKEY.*</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+              <minimizeJar>true</minimizeJar>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <manifestEntries>
+                    <Bundle-Classpath>.</Bundle-Classpath>
+                  </manifestEntries>
+                </transformer>
+              </transformers>
+            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/features/karaf/openhab-core/pom.xml b/features/karaf/openhab-core/pom.xml
index a208cffe8..9bf05a741 100644
--- a/features/karaf/openhab-core/pom.xml
+++ b/features/karaf/openhab-core/pom.xml
@@ -14,6 +14,12 @@
   <name>openHAB Core :: Features :: Karaf :: Core</name>
   <description>openHAB Core Features</description>
 
+  <properties>
+    <jetty.version>9.4.12.v20180830</jetty.version>
+    <jna.version>4.5.2</jna.version>
+    <nrjavaserial.version>3.15.0.OH2</nrjavaserial.version>
+  </properties>
+
   <build>
     <plugins>
       <plugin>