mirror of
https://github.com/danieldemus/openhab-core.git
synced 2025-01-25 11:45:49 +01:00
added missing versions for features and fixed assembly of jetty certificate bundle (#547)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
parent
0904bfcc4b
commit
4d9de63ca6
@ -1,2 +1,3 @@
|
|||||||
Bundle-SymbolicName: ${project.artifactId}
|
Bundle-SymbolicName: ${project.artifactId}
|
||||||
Bundle-Activator: org.openhab.io.jetty.certificate.internal.CertificateGenerator
|
Bundle-Activator: org.openhab.io.jetty.certificate.internal.CertificateGenerator
|
||||||
|
Import-Package: !org.bouncycastle.*,*
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -16,7 +16,6 @@
|
|||||||
<groupId>org.bouncycastle</groupId>
|
<groupId>org.bouncycastle</groupId>
|
||||||
<artifactId>bcpkix-jdk15on</artifactId>
|
<artifactId>bcpkix-jdk15on</artifactId>
|
||||||
<version>1.52</version>
|
<version>1.52</version>
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
@ -25,37 +24,37 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
<version>2.4.1</version>
|
<version>3.2.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>
|
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>shade</goal>
|
<goal>shade</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<phase>package</phase>
|
<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>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
@ -14,6 +14,12 @@
|
|||||||
<name>openHAB Core :: Features :: Karaf :: Core</name>
|
<name>openHAB Core :: Features :: Karaf :: Core</name>
|
||||||
<description>openHAB Core Features</description>
|
<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>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
Loading…
Reference in New Issue
Block a user