Moves BouncyCastle to main pom

Signed-off-by: Ben Rosenblum <rosenblumb@gmail.com>
openhab · Jul 10, 2023 · d24f998 · d24f998
1 parent dfcdc20
commit d24f998
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 28 deletions.
diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
@@ -18,6 +18,7 @@
 
  <properties>
  <californium.version>2.7.4</californium.version>
+ <bouncycastle.version>1.75</bouncycastle.version>
  <jetty.version>9.4.50.v20221201</jetty.version>
  <pax.web.version>8.0.15</pax.web.version>
  <swagger.version>2.1.9</swagger.version>
@@ -88,6 +89,26 @@
  <scope>compile</scope>
  </dependency>
 
+ <!-- BouncyCastle -->
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ <version>${bouncycastle.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk18on</artifactId>
+ <version>${bouncycastle.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcutil-jdk18on</artifactId>
+ <version>${bouncycastle.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
  <!-- Californium -->
  <dependency>
  <groupId>org.eclipse.californium</groupId>

diff --git a/bundles/org.openhab.core.crypto.cryptostore/NOTICE b/bundles/org.openhab.core.crypto.cryptostore/NOTICE
@@ -11,13 +11,3 @@ https://www.eclipse.org/legal/epl-2.0/.
 == Source Code
 
 https://github.com/openhab/openhab-core
-
-## Third-party Content
-
-bcpkix-jdk18on
-bcprov-jdk18on
-bcutil-jdk18on
-* License: Bouncy Castle License
-* Project: https://www.bouncycastle.org
-* Source: https://github.com/bcgit/bc-java
-
diff --git a/bundles/org.openhab.core.crypto.cryptostore/pom.xml b/bundles/org.openhab.core.crypto.cryptostore/pom.xml
@@ -19,24 +19,6 @@
  <artifactId>org.openhab.core</artifactId>
  <version>${project.version}</version>
  </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk18on</artifactId>
- <version>1.75</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <version>1.75</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcutil-jdk18on</artifactId>
- <version>1.75</version>
- <scope>compile</scope>
- </dependency>
  </dependencies>
 
 </project>