Skip to content

Commit a36d097

Browse files
Drop transitive dependency on bcprov
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 62c369d commit a36d097

2 files changed

Lines changed: 10 additions & 14 deletions

File tree

bundles/org.openhab.binding.knx/NOTICE

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,8 @@ calimero
1818
* License: GPL v2 License with CLASSPATH EXCEPTION
1919
* Project: http://calimero-project.github.io
2020
* Source: https://github.com/calimero-project
21+
22+
TSS.MSR / TSS.java
23+
* License: The MIT License (MIT)
24+
* Project: https://github.com/microsoft/TSS.MSR
25+
* Source: https://github.com/microsoft/TSS.MSR/tree/main/TSS.Java

bundles/org.openhab.binding.knx/pom.xml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<name>openHAB Add-ons :: Bundles :: KNX Binding</name>
1616

1717
<properties>
18-
<bnd.importpackage>javax.microedition.io.*;resolution:="optional",javax.usb.*;resolution:="optional",org.usb4java.*;resolution:="optional"</bnd.importpackage>
18+
<bnd.importpackage>javax.microedition.io.*;resolution:="optional",javax.usb.*;resolution:="optional",org.usb4java.*;resolution:="optional",org.bouncycastle.*;resolution:="optional"</bnd.importpackage>
1919
</properties>
2020

2121
<dependencies>
@@ -62,12 +62,6 @@
6262
<version>1.0.0</version>
6363
<scope>provided</scope>
6464
</dependency>
65-
<dependency>
66-
<groupId>org.bouncycastle</groupId>
67-
<!-- last version of 1.5 branch is bcprov-jdk15on 1.70 -->
68-
<artifactId>bcprov-jdk18on</artifactId>
69-
<version>1.77</version>
70-
</dependency>
7165
</dependencies>
7266

7367
<build>
@@ -121,15 +115,13 @@
121115
</goals>
122116
<configuration>
123117
<target>
124-
<echo file="${project.build.outputDirectory}/deps.txt"
125-
message="compile classpath: ${compile_classpath}"/>
126118
<echo>"Fixing TSS.Java for OSGI"</echo>
127119
<delete>
128-
<fileset dir="${project.build.directory}/classes" includes="TSSMain.class"/>
120+
<fileset dir="${project.build.directory}/classes" includes="*"/>
121+
</delete>
122+
<delete includeemptydirs="true" failonerror="false">
123+
<fileset dir="${project.build.directory}/classes/samples"/>
129124
</delete>
130-
<jar destfile="${project.build.directory}/TSS.Java-fixed-1.0.0.jar">
131-
<fileset dir="${project.build.directory}/classes/tss"/>
132-
</jar>
133125
</target>
134126
</configuration>
135127
</execution>
@@ -150,7 +142,6 @@ Require-Capability:
150142
cardinality:=multiple
151143
SPI-Provider: tuwien.auto.calimero.serial.spi.SerialCom
152144
SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class[tuwien.auto.calimero.serial.spi.SerialCom])
153-
-includeresource: "target/TSS.Java-fixed-1.0.0.jar";lib:=true
154145
]]>
155146
</bnd>
156147
</configuration>

0 commit comments

Comments
 (0)