demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 11:45:49 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

drop multiple karaf version declarations

Browse Source 
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
This commit is contained in:
Markus Rathgeb 2016-04-13 18:28:37 +02:00
parent 589f47727a
commit 7b0651ccde
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,17 +25,17 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
<version>${dep.karaf.version}</version>
<version>${karaf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId>
<version>${dep.karaf.version}</version>
<version>${karaf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.wrapper</groupId>
<artifactId>org.apache.karaf.wrapper.core</artifactId>
<version>${dep.karaf.version}</version>
<version>${karaf.version}</version>
</dependency>
</dependencies>

4
features/karaf/src/main/feature/feature.xml
View File

@ -38,8 +38,8 @@
<feature>openhab-runtime-certificate</feature>
<feature dependency="true">shell</feature>
<bundle start-level="90">mvn:org.openhab.core/org.openhab.core/${project.version}</bundle>
<bundle prerequisite="true">mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${dep.karaf.version}</bundle>
<bundle prerequisite="true">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.core/${dep.karaf.version}</bundle>
<bundle prerequisite="true">mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${karaf.version}</bundle>
<bundle prerequisite="true">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.core/${karaf.version}</bundle>
<bundle>mvn:org.openhab.core/org.openhab.core.karaf/${project.version}</bundle>
</feature>

6
features/verify-karaf/pom.xml
View File

@ -19,7 +19,7 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
<version>${dep.karaf.version}</version>
<version>${karaf.version}</version>
<type>kar</type>
<scope>provided</scope>
</dependency>
@ -71,8 +71,8 @@
</goals>
<configuration>
<descriptors>
<descriptor>mvn:org.apache.karaf.features/framework/${dep.karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/standard/${dep.karaf.version}/xml/features</descriptor>
<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.eclipse.smarthome/karaf/${esh.version}/xml/features</descriptor>
<descriptor>mvn:de.maggu2810.shk/shk-feature-base/${shk.version}/xml/features</descriptor>
<descriptor>mvn:org.openhab.core/openhab-core/${project.version}/xml/features</descriptor>

6
pom.xml
View File

@ -61,9 +61,7 @@
<shk.version>1.2</shk.version>
<jupnp.version>2.2.0</jupnp.version>
<jmdns.version>3.5.0</jmdns.version>
<dep.karaf.version>4.0.3</dep.karaf.version>
<karaf.maven.plugin.version>4.0.3</karaf.maven.plugin.version>
<karaf.features.version>4.0.3</karaf.features.version>
<karaf.version>4.0.3</karaf.version>
<maven.compiler.plugin.version>3.3</maven.compiler.plugin.version>
<build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
<license.maven.plugin.version>2.10</license.maven.plugin.version>
@ -93,7 +91,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>${karaf.maven.plugin.version}</version>
<version>${karaf.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>