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:
Kai Kreuzer 2019-02-08 19:17:16 +01:00 committed by Markus Rathgeb
parent 0904bfcc4b
commit 4d9de63ca6
5 changed files with 33 additions and 27 deletions

View File

@ -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.*,*

View File

@ -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,7 +24,13 @@
<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>
<executions>
<execution>
<goals>
<goal>shade</goal>
</goals>
<phase>package</phase>
<configuration> <configuration>
<artifactSet> <artifactSet>
<includes> <includes>
@ -50,12 +55,6 @@
</transformer> </transformer>
</transformers> </transformers>
</configuration> </configuration>
<executions>
<execution>
<goals>
<goal>shade</goal>
</goals>
<phase>package</phase>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>

View File

@ -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>