Drop transitive dependency on bcprov

Signed-off-by: Holger Friedrich <[email protected]>
openhab · Feb 25, 2024 · e0d7f3b · e0d7f3b
1 parent 812cbe8
commit e0d7f3b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/bundles/org.openhab.binding.knx/NOTICE b/bundles/org.openhab.binding.knx/NOTICE
@@ -18,3 +18,8 @@ calimero
 * License: GPL v2 License with CLASSPATH EXCEPTION
 * Project: http://calimero-project.github.io
 * Source: https:/calimero-project
+
+TSS.MSR / TSS.java
+* License: The MIT License (MIT)
+* Project: https:/microsoft/TSS.MSR
+* Source: https:/microsoft/TSS.MSR/tree/main/TSS.Java
diff --git a/bundles/org.openhab.binding.knx/pom.xml b/bundles/org.openhab.binding.knx/pom.xml
@@ -15,7 +15,7 @@
  <name>openHAB Add-ons :: Bundles :: KNX Binding</name>
 
  <properties>
- <bnd.importpackage>javax.microedition.io.*;resolution:="optional",javax.usb.*;resolution:="optional",org.usb4java.*;resolution:="optional"</bnd.importpackage>
+ <bnd.importpackage>javax.microedition.io.*;resolution:="optional",javax.usb.*;resolution:="optional",org.usb4java.*;resolution:="optional",org.bouncycastle.*;resolution:="optional"</bnd.importpackage>
  </properties>
 
  <dependencies>
@@ -55,12 +55,6 @@
  <version>1.0.0</version>
  <scope>provided</scope>
  </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <!-- last version of 1.5 branch is bcprov-jdk15on 1.70 -->
- <artifactId>bcprov-jdk18on</artifactId>
- <version>1.77</version>
- </dependency>
  </dependencies>
 
  <build>
@@ -114,15 +108,13 @@
  </goals>
  <configuration>
  <target>
- <echo file="${project.build.outputDirectory}/deps.txt"
- message="compile classpath: ${compile_classpath}"/>
  <echo>"Fixing TSS.Java for OSGI"</echo>
  <delete>
- <fileset dir="${project.build.directory}/classes" includes="TSSMain.class"/>
+ <fileset dir="${project.build.directory}/classes" includes="*"/>
+ </delete>
+ <delete includeemptydirs="true" failonerror="false">
+ <fileset dir="${project.build.directory}/classes/samples"/>
  </delete>
- <jar destfile="${project.build.directory}/TSS.Java-fixed-1.0.0.jar">
- <fileset dir="${project.build.directory}/classes/tss"/>
- </jar>
  </target>
  </configuration>
  </execution>
@@ -143,7 +135,6 @@ Require-Capability:
  cardinality:=multiple
 SPI-Provider: tuwien.auto.calimero.serial.spi.SerialCom
 SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class[tuwien.auto.calimero.serial.spi.SerialCom])
--includeresource: "target/TSS.Java-fixed-1.0.0.jar";lib:=true
  ]]>
  </bnd>
  </configuration>