demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

differ between min. karaf version (OSGi) und karaf compilation tooling (#740)

Browse Source 
Related to: https://github.com/openhab/openhab-core/pull/723#issuecomment-483595667

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
This commit is contained in:
Markus Rathgeb 2019-04-16 22:41:27 +02:00 committed by Kai Kreuzer
parent 0c07ac99d6
commit 32845ef36d
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.core.io.console.karaf/pom.xml
View File

@ -17,7 +17,7 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId>
<version>${karaf.version}</version>
<version>${karaf.compile.version}</version>
<scope>provided</scope>
</dependency>
<dependency>

6
bundles/org.openhab.core.karaf/pom.xml
View File

@ -22,19 +22,19 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
<version>${karaf.version}</version>
<version>${karaf.compile.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId>
<version>${karaf.version}</version>
<version>${karaf.compile.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.wrapper</groupId>
<artifactId>org.apache.karaf.wrapper.core</artifactId>
<version>${karaf.version}</version>
<version>${karaf.compile.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

10
features/karaf/pom.xml
View File

@ -25,7 +25,7 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
<version>${karaf.version}</version>
<version>${karaf.tooling.version}</version>
<type>kar</type>
<scope>provided</scope>
</dependency>
@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>standard</artifactId>
<version>${karaf.version}</version>
<version>${karaf.tooling.version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>provided</scope>
@ -47,7 +47,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>${karaf.version}</version>
<version>${karaf.tooling.version}</version>
<extensions>true</extensions>
<configuration>
<startLevel>80</startLevel>
@ -74,8 +74,8 @@
<configuration>
<descriptors combine.children="append">
<!-- Apache Karaf -->
<descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/framework/${karaf.tooling.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/standard/${karaf.tooling.version}/xml/features</descriptor>
<!-- Current feature under verification -->
<descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
</descriptors>

3
pom.xml
View File

@ -56,7 +56,8 @@
<maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
<bnd.version>4.2.0</bnd.version>
<karaf.version>4.2.1</karaf.version>
<karaf.compile.version>4.2.1</karaf.compile.version>
<karaf.tooling.version>4.2.4</karaf.tooling.version>
<sat.version>0.6.1</sat.version>
<slf4j.version>1.7.21</slf4j.version>
<xtext.version>2.17.0</xtext.version>