fixes

Signed-off-by: Jan N. Klug <github@klug.nrw>
openhab · May 28, 2023 · ed073a3 · ed073a3
1 parent 2c342e6
commit ed073a3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
@@ -19,6 +19,7 @@
   <properties>
     <californium.version>2.7.4</californium.version>
     <jetty.version>9.4.50.v20221201</jetty.version>
+    <bouncycastle.version>1.70</bouncycastle.version>
     <pax.web.version>8.0.15</pax.web.version>
     <swagger.version>2.1.9</swagger.version>
   </properties>
@@ -190,6 +191,26 @@
       <scope>compile</scope>
     </dependency>
 
+    <!-- bouncycastle -->
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <version>${bouncycastle.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <version>${bouncycastle.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcutil-jdk15on</artifactId>
+      <version>${bouncycastle.version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- JmDNS -->
     <dependency>
       <groupId>org.jmdns</groupId>
@@ -436,6 +457,7 @@
       <version>5.12.1</version>
       <scope>compile</scope>
     </dependency>
+
   </dependencies>
 
 </project>
diff --git a/bundles/org.openhab.core.io.jetty.certificate/pom.xml b/bundles/org.openhab.core.io.jetty.certificate/pom.xml
@@ -13,14 +13,6 @@
 
   <name>openHAB Core :: Bundles :: SSL Certificate Generator</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.52</version>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>

diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -106,4 +106,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
 	org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
-	org.objenesis;version='[3.3.0,3.3.1)'
+	org.objenesis;version='[3.3.0,3.3.1)',\
+	org.openhab.core.io.jetty.certificate;version='[4.0.0,4.0.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'