mirror of
https://github.com/danieldemus/openhab-core.git
synced 2025-01-10 21:31:53 +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-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>
|
||||
<artifactId>bcpkix-jdk15on</artifactId>
|
||||
<version>1.52</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
@ -25,7 +24,13 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>2.4.1</version>
|
||||
<version>3.2.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
<phase>package</phase>
|
||||
<configuration>
|
||||
<artifactSet>
|
||||
<includes>
|
||||
@ -50,12 +55,6 @@
|
||||
</transformer>
|
||||
</transformers>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
<phase>package</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
@ -14,6 +14,12 @@
|
||||
<name>openHAB Core :: Features :: Karaf :: Core</name>
|
||||
<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>
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
Loading…
Reference in New Issue
Block a user