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

changed groupId to org.openhab.core

Browse Source 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer 2015-12-27 22:57:41 +01:00
parent a5b86617a6
commit 78a586b378
26 changed files with 199 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/*features*/*/src/main/history/
maven-metadata-local.xml
dependency-reduced-pom.xml

4
bundles/org.openhab.core.compat1x.test/pom.xml
View File

@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

4
bundles/org.openhab.core.compat1x/pom.xml
View File

@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

4
bundles/org.openhab.core.init/pom.xml
View File

@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

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

@ -6,8 +6,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

4
bundles/org.openhab.core/pom.xml
View File

@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

90
bundles/org.openhab.io.jetty.certificate/dependency-reduced-pom.xml
View File

@ -1,90 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>pom</artifactId>
<groupId>org.openhab.bundles</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.openhab.io.jetty.certificate</artifactId>
<packaging>eclipse-plugin</packaging>
<name>openHAB SSL Certificate Generator</name>
<build>
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<artifactSet>
<includes>
<include>org.bouncycastle:*</include>
</includes>
</artifactSet>
<filters>
<filter>
<artifact>org.bouncycastle:*</artifact>
<excludes>
<exclude>META-INF/BCKEY.*</exclude>
</excludes>
</filter>
</filters>
<minimizeJar>true</minimizeJar>
<transformers>
<transformer>
<manifestEntries>
<Bundle-Classpath>.</Bundle-Classpath>
</manifestEntries>
</transformer>
</transformers>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
<version>3.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openhab.bundles</groupId>
<artifactId>org.openhab.io.jetty.certificate</artifactId>
<version>2.0.0.qualifier</version>
<classifier>lib/bcpkix-jdk15on-1.52.jar</classifier>
<scope>system</scope>
<systemPath>/Users/kai/Documents/dev/openhab2/oh-core/openhab2/bundles/org.openhab.io.jetty.certificate/lib/bcpkix-jdk15on-1.52.jar</systemPath>
</dependency>
<dependency>
<groupId>org.openhab.bundles</groupId>
<artifactId>org.openhab.io.jetty.certificate</artifactId>
<version>2.0.0.qualifier</version>
<classifier>lib/bcprov-jdk15on-1.52.jar</classifier>
<scope>system</scope>
<systemPath>/Users/kai/Documents/dev/openhab2/oh-core/openhab2/bundles/org.openhab.io.jetty.certificate/lib/bcprov-jdk15on-1.52.jar</systemPath>
</dependency>
<dependency>
<groupId>p2.eclipse-plugin</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.10.2.v20150203-1939</version>
<scope>system</scope>
<systemPath>/Users/kai/.m2/repository/p2/osgi/bundle/org.eclipse.osgi/3.10.2.v20150203-1939/org.eclipse.osgi-3.10.2.v20150203-1939.jar</systemPath>
</dependency>
<dependency>
<groupId>p2.eclipse-plugin</groupId>
<artifactId>org.slf4j.api</artifactId>
<version>1.7.2.v20121108-1250</version>
<scope>system</scope>
<systemPath>/Users/kai/.m2/repository/p2/osgi/bundle/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar</systemPath>
</dependency>
</dependencies>
</project>

4
bundles/org.openhab.io.jetty.certificate/pom.xml
View File

@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

4
bundles/org.openhab.io.rest.docs/pom.xml
View File

@ -4,8 +4,8 @@
<packaging>eclipse-plugin</packaging>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

4
bundles/org.openhab.io.transport.serial/pom.xml
View File

@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

4
bundles/org.openhab.ui.basicui/pom.xml
View File

@ -6,8 +6,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

4
bundles/org.openhab.ui.classicui/pom.xml
View File

@ -6,8 +6,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

4
bundles/org.openhab.ui.dashboard/pom.xml
View File

@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

4
bundles/org.openhab.ui.iconset.classic/pom.xml
View File

@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

4
bundles/org.openhab.ui.paperui/pom.xml
View File

@ -6,8 +6,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

5
bundles/pom.xml
View File

@ -2,15 +2,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.openhab</groupId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-tycho</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../poms/tycho/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.openhab.bundles</groupId>
<artifactId>pom</artifactId>
<artifactId>pom-bundles</artifactId>
<name>openHAB Bundles</name>

10
features/karaf/pom.xml
View File

@ -4,21 +4,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.features</groupId>
<artifactId>pom</artifactId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-features</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.openhab.features.karaf</artifactId>
<artifactId>openhab-core</artifactId>
<packaging>feature</packaging>
<name>openHAB Karaf Features</name>
<description>openHAB Core Features</description>
<dependencies>
<!-- add the artifacts that should be in the kar in the dependencies set -->
</dependencies>
<build>
<plugins>
<plugin>

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

@ -11,17 +11,6 @@
-->
<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<feature name="openhab-runtime" description="${project.name}" version="${project.version}">
<details>${project.description}</details>
<feature>shk-esh-io-console-karaf</feature>
<feature>openhab-runtime-base</feature>
<feature>openhab-ui-dashboard</feature>
<feature>openhab-ui-basic</feature>
<feature>openhab-ui-paper</feature>
<feature>openhab-misc-restdocs</feature>
<feature>openhab-misc-certificate</feature>
</feature>
<feature name="openhab-runtime-base" description="openHAB Minimal Runtime" version="${project.version}">
<feature>shk-esh-base</feature>
<bundle start-level="90">mvn:org.openhab.core/org.openhab.core/${project.version}</bundle>
@ -32,9 +21,76 @@
<bundle>mvn:org.openhab.core/org.openhab.core.karaf/${project.version}</bundle>
</feature>
<feature name="openhab-runtime" description="${project.name}" version="${project.version}">
<details>${project.description}</details>
<feature>shk-esh-io-console-karaf</feature>
<feature>openhab-runtime-base</feature>
<feature>openhab-ui-dashboard</feature>
<feature>openhab-misc-restdocs</feature>
<feature>openhab-misc-certificate</feature>
</feature>
<feature name="openhab-runtime-compat1x" description="Compatibility layer for openHAB 1 addons" version="${project.version}">
<feature>openhab-runtime-base</feature>
<bundle>mvn:org.openhab.core/org.openhab.core.compat1x/${project.version}</bundle>
</feature>
<feature name="openhab-transport-mdns" description="mDNS Transport" version="${project.version}">
<feature>shk-esh-io-transport-mdns</feature>
</feature>
<feature name="openhab-transport-mqtt" description="MQTT Transport" version="${project.version}">
<feature>shk-esh-io-transport-mqtt</feature>
</feature>
<feature name="openhab-transport-serial" description="Serial Transport" version="${project.version}">
<feature>openhab-runtime-base</feature>
<bundle start-level="80">mvn:org.openhab.core/org.openhab.io.transport.serial/${project.version}</bundle>
</feature>
<feature name="openhab-transport-upnp" description="UPnP Transport" version="${project.version}">
<feature>shk-esh-io-transport-upnp</feature>
</feature>
<feature name="openhab-misc-restdocs" description="REST Documentation" version="${project.version}">
<feature>shk-esh-base</feature>
<feature>shk-jax-rs-provider-swagger</feature>
<feature>openhab-ui-dashboard</feature>
<bundle>mvn:org.openhab.core/org.openhab.io.rest.docs/${project.version}</bundle>
</feature>
<feature name="openhab-misc-certificate" description="SSL Generator" version="${project.version}">
<bundle start-level="20">mvn:org.openhab.core/org.openhab.io.jetty.certificate/${project.version}</bundle>
</feature>
<!-- ui -->
<feature name="openhab-ui-dashboard" description="Dashboard" version="${project.version}">
<feature>shk-esh-base</feature>
<bundle>mvn:org.openhab.core/org.openhab.ui.dashboard/${project.version}</bundle>
</feature>
<feature name="openhab-ui-basic" description="Basic UI" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature>openhab-ui-dashboard</feature>
<feature>shk-esh-ui-basic</feature>
<bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.basicui/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.iconset.classic/${project.version}</bundle>
</feature>
<feature name="openhab-ui-classic" description="Classic UI" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature>openhab-ui-dashboard</feature>
<feature>shk-esh-ui-classic</feature>
<bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.classicui/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.iconset.classic/${project.version}</bundle>
</feature>
<feature name="openhab-ui-paper" description="Paper UI" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature>openhab-ui-dashboard</feature>
<feature>shk-esh-ui-paper</feature>
<bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.paperui/${project.version}</bundle>
</feature>
</features>

2
features/p2/pom.xml
View File

@ -2,7 +2,7 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.openhab</groupId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-tycho</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../../poms/tycho/pom.xml</relativePath>

6
features/pom.xml
View File

@ -2,14 +2,13 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.openhab</groupId>
<groupId>org.openhab.core</groupId>
<artifactId>pom</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.openhab.features</groupId>
<artifactId>pom</artifactId>
<artifactId>pom-features</artifactId>
<name>openHAB Features</name>
@ -17,6 +16,7 @@
<modules>
<module>karaf</module>
<module>verify-karaf</module>
<module>p2</module>
<module>repo</module>
</modules>

4
features/repo/pom.xml
View File

@ -2,14 +2,14 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.openhab</groupId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-tycho</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../../poms/tycho/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.openhab.features</groupId>
<groupId>org.openhab.core.features</groupId>
<artifactId>org.openhab.repo</artifactId>
<name>openHAB P2 Repository</name>

88
features/verify-karaf/pom.xml Normal file
View File

@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab.core</groupId>
<artifactId>pom-features</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.openhab.features.karaf.verify</artifactId>
<packaging>pom</packaging>
<name>openHAB Karaf Feature Verification</name>
<description>openHAB Core Feature Verification</description>
<dependencies>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
<version>${dep.karaf.version}</version>
<type>kar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.maggu2810.playground.shk</groupId>
<artifactId>shk-feature-base</artifactId>
<version>1.0.3</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.openhab.core</groupId>
<artifactId>openhab-core</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<startLevel>80</startLevel>
<aggregateFeatures>true</aggregateFeatures>
<!-- <resolver>(obr)</resolver> -->
<checkDependencyChange>true</checkDependencyChange>
<failOnDependencyChange>false</failOnDependencyChange>
<logDependencyChanges>true</logDependencyChanges>
<overwriteChangedDependencies>true</overwriteChangedDependencies>
</configuration>
<executions>
<execution>
<id>verify</id>
<phase>process-resources</phase>
<goals>
<goal>verify</goal>
</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:de.maggu2810.playground.shk/shk-feature-base/1.0.3/xml/features</descriptor>
<descriptor>mvn:org.openhab.core/openhab-core/${project.version}/xml/features</descriptor>
</descriptors>
<distribution>org.apache.karaf.features:framework</distribution>
<javase>1.8</javase>
<framework>
<feature>framework</feature>
</framework>
<features>
<feature>openhab-*</feature>
</features>
<verifyTransitive>false</verifyTransitive>
<ignoreMissingConditions>true</ignoreMissingConditions>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

4
pom.xml
View File

@ -6,7 +6,7 @@
<maven>3.0</maven>
</prerequisites>
<groupId>org.openhab</groupId>
<groupId>org.openhab.core</groupId>
<artifactId>pom</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@ -52,6 +52,8 @@
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
<esh.version>0.8.0-SNAPSHOT</esh.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>

2
poms/pom.xml
View File

@ -7,7 +7,7 @@
</prerequisites>
<parent>
<groupId>org.openhab</groupId>
<groupId>org.openhab.core</groupId>
<artifactId>pom</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

2
poms/tycho/pom.xml
View File

@ -7,7 +7,7 @@
</prerequisites>
<parent>
<groupId>org.openhab</groupId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundle-spec</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

2
targetplatform/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab</groupId>
<groupId>org.openhab.core</groupId>
<artifactId>pom-tycho</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../poms/tycho/pom.xml</relativePath>