Apply POM Code Convention (#392)

Applies the POM Code Covention as used in OH2/ESH projects.

See also: https://maven.apache.org/developers/conventions/code.html

The executed command is:

mvn \
  com.github.ekryd.sortpom:sortpom-maven-plugin:sort \
  -Dsort.keepBlankLines=true \
  -Dsort.predefinedSortOrder=recommended_2008_06

Signed-off-by: Wouter Born <eclipse@maindrain.net>
This commit is contained in:
Wouter Born 2018-09-10 13:45:11 +02:00 committed by Kai Kreuzer
parent dbed3db57d
commit 8091914a4b
21 changed files with 1451 additions and 1433 deletions

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -9,9 +10,9 @@
</parent> </parent>
<artifactId>org.openhab.core.compat1x.test</artifactId> <artifactId>org.openhab.core.compat1x.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<name>openHAB Core 1.x Compatibility Layer Tests</name> <name>openHAB Core 1.x Compatibility Layer Tests</name>
<packaging>eclipse-test-plugin</packaging>
<build> <build>
<plugins> <plugins>
@ -19,7 +20,7 @@
<groupId>${tycho-groupid}</groupId> <groupId>${tycho-groupid}</groupId>
<artifactId>target-platform-configuration</artifactId> <artifactId>target-platform-configuration</artifactId>
<configuration> <configuration>
<environments combine.self="override"/> <environments combine.self="override"></environments>
<dependency-resolution> <dependency-resolution>
<extraRequirements> <extraRequirements>
<requirement> <requirement>

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -9,8 +10,8 @@
</parent> </parent>
<artifactId>org.openhab.core.compat1x</artifactId> <artifactId>org.openhab.core.compat1x</artifactId>
<name>openHAB Core 1.x Compatibility Layer</name>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
<name>openHAB Core 1.x Compatibility Layer</name>
</project> </project>

View File

@ -1,93 +1,94 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId> <artifactId>pom-bundles</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.openhab.core.karaf</artifactId> <artifactId>org.openhab.core.karaf</artifactId>
<packaging>eclipse-plugin</packaging>
<name>openHAB Karaf Integration</name> <name>openHAB Karaf Integration</name>
<packaging>eclipse-plugin</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.karaf.features</groupId> <groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId> <artifactId>org.apache.karaf.features.core</artifactId>
<version>${karaf.version}</version> <version>${karaf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.karaf.shell</groupId> <groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId> <artifactId>org.apache.karaf.shell.core</artifactId>
<version>${karaf.version}</version> <version>${karaf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.karaf.wrapper</groupId> <groupId>org.apache.karaf.wrapper</groupId>
<artifactId>org.apache.karaf.wrapper.core</artifactId> <artifactId>org.apache.karaf.wrapper.core</artifactId>
<version>${karaf.version}</version> <version>${karaf.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<configuration> <configuration>
<lifecycleMappingMetadata> <lifecycleMappingMetadata>
<pluginExecutions> <pluginExecutions>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId>org.eclipse.tycho</groupId> <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId> <artifactId>tycho-compiler-plugin</artifactId>
<versionRange>[1.0.0,)</versionRange> <versionRange>[1.0.0,)</versionRange>
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore/> <ignore></ignore>
</action> </action>
</pluginExecution> </pluginExecution>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<versionRange>[3.6.1,)</versionRange> <versionRange>[3.6.1,)</versionRange>
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore/> <ignore></ignore>
</action> </action>
</pluginExecution> </pluginExecution>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId>org.eclipse.tycho</groupId> <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId> <artifactId>tycho-packaging-plugin</artifactId>
<versionRange>[1.0.0,)</versionRange> <versionRange>[1.0.0,)</versionRange>
<goals> <goals>
<goal>build-qualifier</goal> <goal>build-qualifier</goal>
<goal>validate-id</goal> <goal>validate-id</goal>
<goal>validate-version</goal> <goal>validate-version</goal>
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore/> <ignore></ignore>
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
</project> </project>

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -9,8 +10,8 @@
</parent> </parent>
<artifactId>org.openhab.core</artifactId> <artifactId>org.openhab.core</artifactId>
<name>openHAB Core</name>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
<name>openHAB Core</name>
</project> </project>

View File

@ -1,65 +1,66 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?xml version="1.0" encoding="UTF-8"?>
<modelVersion>4.0.0</modelVersion> <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> <parent>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId> <artifactId>pom-bundles</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.openhab.io.jetty.certificate</artifactId> <artifactId>org.openhab.io.jetty.certificate</artifactId>
<name>openHAB SSL Certificate Generator</name>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
<name>openHAB SSL Certificate Generator</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId> <artifactId>bcpkix-jdk15on</artifactId>
<version>1.52</version> <version>1.52</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<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>2.4.1</version>
<configuration> <configuration>
<artifactSet> <artifactSet>
<includes> <includes>
<include>org.bouncycastle:*</include> <include>org.bouncycastle:*</include>
</includes> </includes>
</artifactSet> </artifactSet>
<filters> <filters>
<filter> <filter>
<artifact>org.bouncycastle:*</artifact> <artifact>org.bouncycastle:*</artifact>
<excludes> <excludes>
<!-- Exclude the JAR signing files --> <!-- Exclude the JAR signing files -->
<exclude>META-INF/BCKEY.*</exclude> <exclude>META-INF/BCKEY.*</exclude>
</excludes> </excludes>
</filter> </filter>
</filters> </filters>
<minimizeJar>true</minimizeJar> <minimizeJar>true</minimizeJar>
<transformers> <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries> <manifestEntries>
<Bundle-Classpath>.</Bundle-Classpath> <Bundle-Classpath>.</Bundle-Classpath>
</manifestEntries> </manifestEntries>
</transformer> </transformer>
</transformers> </transformers>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <goals>
<goals> <goal>shade</goal>
<goal>shade</goal> </goals>
</goals> <phase>package</phase>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?xml version="1.0" encoding="UTF-8"?>
<modelVersion>4.0.0</modelVersion> <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-bundles</artifactId>
<version>2.4.0-SNAPSHOT</version>
</parent>
<packaging>eclipse-plugin</packaging> <artifactId>org.openhab.io.rest.docs</artifactId>
<parent>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.4.0-SNAPSHOT</version>
</parent>
<artifactId>org.openhab.io.rest.docs</artifactId> <packaging>eclipse-plugin</packaging>
<name>openHAB REST API Documentation</name> <name>openHAB REST API Documentation</name>
</project> </project>

View File

@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?xml version="1.0" encoding="UTF-8"?>
<modelVersion>4.0.0</modelVersion> <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-bundles</artifactId>
<version>2.4.0-SNAPSHOT</version>
</parent>
<packaging>eclipse-plugin</packaging> <artifactId>org.openhab.io.sound</artifactId>
<parent>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.4.0-SNAPSHOT</version>
</parent>
<artifactId>org.openhab.io.sound</artifactId> <packaging>eclipse-plugin</packaging>
<name>openHAB Sound Support</name> <name>openHAB Sound Support</name>
</project> </project>

View File

@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId> <artifactId>pom-bundles</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.openhab.ui.basicui</artifactId> <artifactId>org.openhab.ui.basicui</artifactId>
<packaging>eclipse-plugin</packaging>
<name>openHAB Basic UI Dashboard Integration</name> <name>openHAB Basic UI Dashboard Integration</name>
<packaging>eclipse-plugin</packaging>
</project> </project>

View File

@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId> <artifactId>pom-bundles</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.openhab.ui.classicui</artifactId> <artifactId>org.openhab.ui.classicui</artifactId>
<packaging>eclipse-plugin</packaging>
<name>openHAB Classic UI Dashboard Integration</name> <name>openHAB Classic UI Dashboard Integration</name>
<packaging>eclipse-plugin</packaging>
</project> </project>

View File

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId> <artifactId>pom-bundles</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.openhab.ui.dashboard</artifactId> <artifactId>org.openhab.ui.dashboard</artifactId>
<name>openHAB Dashboard UI</name>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
<name>openHAB Dashboard UI</name>
</project> </project>

View File

@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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> <modelVersion>4.0.0</modelVersion>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion> <parent>
<groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId>
<version>2.4.0-SNAPSHOT</version>
</parent>
<artifactId>org.openhab.ui.homebuilder</artifactId> <artifactId>org.openhab.ui.homebuilder</artifactId>
<packaging>eclipse-plugin</packaging>
<name>openHAB HomeBuilder UI Dashboard Integration</name> <name>openHAB HomeBuilder UI Dashboard Integration</name>
<packaging>eclipse-plugin</packaging>
</project> </project>

View File

@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId> <artifactId>pom-bundles</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.openhab.ui.paperui</artifactId> <artifactId>org.openhab.ui.paperui</artifactId>
<packaging>eclipse-plugin</packaging>
<name>openHAB Paper UI Theme Fragment</name> <name>openHAB Paper UI Theme Fragment</name>
<packaging>eclipse-plugin</packaging>
</project> </project>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
@ -6,15 +9,13 @@
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
<artifactId>pom-bundles</artifactId> <artifactId>pom-bundles</artifactId>
<name>openHAB Bundles</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>openHAB Bundles</name>
<modules> <modules>
<module>org.openhab.core</module> <module>org.openhab.core</module>
<module>org.openhab.core.compat1x</module> <module>org.openhab.core.compat1x</module>
@ -31,51 +32,51 @@
</modules> </modules>
<dependencies> <dependencies>
<!-- Eclipse Smarthome dependencies specifically for the core --> <!-- Eclipse Smarthome dependencies specifically for the core -->
<dependency> <dependency>
<groupId>org.eclipse.smarthome.io</groupId> <groupId>org.eclipse.smarthome.io</groupId>
<artifactId>org.eclipse.smarthome.io.javasound</artifactId> <artifactId>org.eclipse.smarthome.io.javasound</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.io</groupId> <groupId>org.eclipse.smarthome.io</groupId>
<artifactId>org.eclipse.smarthome.io.rest.sitemap</artifactId> <artifactId>org.eclipse.smarthome.io.rest.sitemap</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.ui</groupId> <groupId>org.eclipse.smarthome.ui</groupId>
<artifactId>org.eclipse.smarthome.ui</artifactId> <artifactId>org.eclipse.smarthome.ui</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.extension.ui</groupId> <groupId>org.eclipse.smarthome.extension.ui</groupId>
<artifactId>org.eclipse.smarthome.ui.basic</artifactId> <artifactId>org.eclipse.smarthome.ui.basic</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.extension.ui</groupId> <groupId>org.eclipse.smarthome.extension.ui</groupId>
<artifactId>org.eclipse.smarthome.ui.classic</artifactId> <artifactId>org.eclipse.smarthome.ui.classic</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.extension.ui</groupId> <groupId>org.eclipse.smarthome.extension.ui</groupId>
<artifactId>org.eclipse.smarthome.ui.paper</artifactId> <artifactId>org.eclipse.smarthome.ui.paper</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.model</groupId> <groupId>org.eclipse.smarthome.model</groupId>
<artifactId>org.eclipse.smarthome.model.rule</artifactId> <artifactId>org.eclipse.smarthome.model.rule</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.model</groupId> <groupId>org.eclipse.smarthome.model</groupId>
<artifactId>org.eclipse.smarthome.model.rule.runtime</artifactId> <artifactId>org.eclipse.smarthome.model.rule.runtime</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.model</groupId> <groupId>org.eclipse.smarthome.model</groupId>
<artifactId>org.eclipse.smarthome.model.sitemap</artifactId> <artifactId>org.eclipse.smarthome.model.sitemap</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -1,36 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
<artifactId>pom-features</artifactId> <artifactId>pom-features</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openhab-core</artifactId> <artifactId>openhab-core</artifactId>
<packaging>feature</packaging> <packaging>feature</packaging>
<name>openHAB Karaf Features</name> <name>openHAB Karaf Features</name>
<description>openHAB Core Features</description> <description>openHAB Core Features</description>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.karaf.tooling</groupId> <groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId> <artifactId>karaf-maven-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<startLevel>80</startLevel> <startLevel>80</startLevel>
<aggregateFeatures>true</aggregateFeatures> <aggregateFeatures>true</aggregateFeatures>
<!-- <resolver>(obr)</resolver> --> <!-- <resolver>(obr)</resolver> -->
<checkDependencyChange>true</checkDependencyChange> <checkDependencyChange>true</checkDependencyChange>
<failOnDependencyChange>false</failOnDependencyChange> <failOnDependencyChange>false</failOnDependencyChange>
<logDependencyChanges>true</logDependencyChanges> <logDependencyChanges>true</logDependencyChanges>
<overwriteChangedDependencies>true</overwriteChangedDependencies> <overwriteChangedDependencies>true</overwriteChangedDependencies>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="MACROMAN" standalone="no"?><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"> <?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">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.openhab</groupId> <groupId>org.openhab</groupId>
@ -6,61 +9,59 @@
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
<relativePath>../../poms/tycho/pom.xml</relativePath> <relativePath>../../poms/tycho/pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.openhab.feature.p2</artifactId> <artifactId>org.openhab.feature.p2</artifactId>
<name>openHAB p2 Feature</name>
<packaging>eclipse-feature</packaging> <packaging>eclipse-feature</packaging>
<name>openHAB p2 Feature</name>
<dependencies> <dependencies>
<!-- Eclipse Smarthome dependencies specifically for the core --> <!-- Eclipse Smarthome dependencies specifically for the core -->
<dependency> <dependency>
<groupId>org.eclipse.smarthome.io</groupId> <groupId>org.eclipse.smarthome.io</groupId>
<artifactId>org.eclipse.smarthome.io.javasound</artifactId> <artifactId>org.eclipse.smarthome.io.javasound</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.io</groupId> <groupId>org.eclipse.smarthome.io</groupId>
<artifactId>org.eclipse.smarthome.io.rest.sitemap</artifactId> <artifactId>org.eclipse.smarthome.io.rest.sitemap</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.ui</groupId> <groupId>org.eclipse.smarthome.ui</groupId>
<artifactId>org.eclipse.smarthome.ui</artifactId> <artifactId>org.eclipse.smarthome.ui</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.extension.ui</groupId> <groupId>org.eclipse.smarthome.extension.ui</groupId>
<artifactId>org.eclipse.smarthome.ui.basic</artifactId> <artifactId>org.eclipse.smarthome.ui.basic</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.extension.ui</groupId> <groupId>org.eclipse.smarthome.extension.ui</groupId>
<artifactId>org.eclipse.smarthome.ui.classic</artifactId> <artifactId>org.eclipse.smarthome.ui.classic</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.extension.ui</groupId> <groupId>org.eclipse.smarthome.extension.ui</groupId>
<artifactId>org.eclipse.smarthome.ui.paper</artifactId> <artifactId>org.eclipse.smarthome.ui.paper</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.model</groupId> <groupId>org.eclipse.smarthome.model</groupId>
<artifactId>org.eclipse.smarthome.model.rule</artifactId> <artifactId>org.eclipse.smarthome.model.rule</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.model</groupId> <groupId>org.eclipse.smarthome.model</groupId>
<artifactId>org.eclipse.smarthome.model.rule.runtime</artifactId> <artifactId>org.eclipse.smarthome.model.rule.runtime</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.model</groupId> <groupId>org.eclipse.smarthome.model</groupId>
<artifactId>org.eclipse.smarthome.model.sitemap</artifactId> <artifactId>org.eclipse.smarthome.model.sitemap</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="MACROMAN" standalone="no"?><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"> <?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">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
@ -6,20 +9,18 @@
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<groupId>org.openhab.core</groupId>
<artifactId>pom-features</artifactId>
<modelVersion>4.0.0</modelVersion> <packaging>pom</packaging>
<groupId>org.openhab.core</groupId>
<artifactId>pom-features</artifactId>
<name>openHAB Features</name> <name>openHAB Features</name>
<packaging>pom</packaging> <modules>
<module>openhab-core</module>
<modules> <module>verify-karaf</module>
<module>openhab-core</module> <module>p2</module>
<module>verify-karaf</module> <module>repo</module>
<module>p2</module> </modules>
<module>repo</module>
</modules>
</project> </project>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.openhab</groupId> <groupId>org.openhab</groupId>
@ -6,93 +9,90 @@
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
<relativePath>../../poms/tycho/pom.xml</relativePath> <relativePath>../../poms/tycho/pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.openhab.core.features</groupId> <groupId>org.openhab.core.features</groupId>
<artifactId>org.openhab.repo</artifactId> <artifactId>org.openhab.repo</artifactId>
<name>openHAB Core P2 Repository</name>
<packaging>eclipse-repository</packaging> <packaging>eclipse-repository</packaging>
<build> <name>openHAB Core P2 Repository</name>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<executions>
<execution>
<id>default-resources</id>
<phase>process-resources</phase>
<goals>
<goal>resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>
</build>
<dependencies> <dependencies>
<!-- Eclipse Smarthome dependencies specifically for the core --> <!-- Eclipse Smarthome dependencies specifically for the core -->
<dependency> <dependency>
<groupId>org.eclipse.smarthome.io</groupId> <groupId>org.eclipse.smarthome.io</groupId>
<artifactId>org.eclipse.smarthome.io.javasound</artifactId> <artifactId>org.eclipse.smarthome.io.javasound</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.io</groupId> <groupId>org.eclipse.smarthome.io</groupId>
<artifactId>org.eclipse.smarthome.io.rest.sitemap</artifactId> <artifactId>org.eclipse.smarthome.io.rest.sitemap</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.ui</groupId> <groupId>org.eclipse.smarthome.ui</groupId>
<artifactId>org.eclipse.smarthome.ui</artifactId> <artifactId>org.eclipse.smarthome.ui</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.extension.ui</groupId> <groupId>org.eclipse.smarthome.extension.ui</groupId>
<artifactId>org.eclipse.smarthome.ui.basic</artifactId> <artifactId>org.eclipse.smarthome.ui.basic</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.extension.ui</groupId> <groupId>org.eclipse.smarthome.extension.ui</groupId>
<artifactId>org.eclipse.smarthome.ui.classic</artifactId> <artifactId>org.eclipse.smarthome.ui.classic</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.extension.ui</groupId> <groupId>org.eclipse.smarthome.extension.ui</groupId>
<artifactId>org.eclipse.smarthome.ui.paper</artifactId> <artifactId>org.eclipse.smarthome.ui.paper</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.model</groupId> <groupId>org.eclipse.smarthome.model</groupId>
<artifactId>org.eclipse.smarthome.model.rule</artifactId> <artifactId>org.eclipse.smarthome.model.rule</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.model</groupId> <groupId>org.eclipse.smarthome.model</groupId>
<artifactId>org.eclipse.smarthome.model.rule.runtime</artifactId> <artifactId>org.eclipse.smarthome.model.rule.runtime</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome.model</groupId> <groupId>org.eclipse.smarthome.model</groupId>
<artifactId>org.eclipse.smarthome.model.sitemap</artifactId> <artifactId>org.eclipse.smarthome.model.sitemap</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<resources>
<resource>
<filtering>true</filtering>
<directory>src/main/filtered-resources</directory>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<executions>
<execution>
<id>default-resources</id>
<goals>
<goal>resources</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>

View File

@ -1,96 +1,97 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
<artifactId>pom-features</artifactId> <artifactId>pom-features</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.openhab.features.karaf.verify</artifactId> <artifactId>org.openhab.features.karaf.verify</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>openHAB Karaf Feature Verification</name> <name>openHAB Karaf Feature Verification</name>
<description>openHAB Core Feature Verification</description> <description>openHAB Core Feature Verification</description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.karaf.features</groupId> <groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId> <artifactId>framework</artifactId>
<version>${karaf.version}</version> <version>${karaf.version}</version>
<type>kar</type> <type>kar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome</groupId> <groupId>org.eclipse.smarthome</groupId>
<artifactId>esh-core</artifactId> <artifactId>esh-core</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
<classifier>features</classifier> <classifier>features</classifier>
<type>xml</type> <type>xml</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.smarthome</groupId> <groupId>org.eclipse.smarthome</groupId>
<artifactId>esh-tp</artifactId> <artifactId>esh-tp</artifactId>
<version>${esh.version}</version> <version>${esh.version}</version>
<classifier>features</classifier> <classifier>features</classifier>
<type>xml</type> <type>xml</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openhab.core</groupId> <groupId>org.openhab.core</groupId>
<artifactId>openhab-core</artifactId> <artifactId>openhab-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<classifier>features</classifier> <classifier>features</classifier>
<type>xml</type> <type>xml</type>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.karaf.tooling</groupId> <groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId> <artifactId>karaf-maven-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<startLevel>80</startLevel> <startLevel>80</startLevel>
<aggregateFeatures>true</aggregateFeatures> <aggregateFeatures>true</aggregateFeatures>
<!-- <resolver>(obr)</resolver> --> <!-- <resolver>(obr)</resolver> -->
<checkDependencyChange>true</checkDependencyChange> <checkDependencyChange>true</checkDependencyChange>
<failOnDependencyChange>false</failOnDependencyChange> <failOnDependencyChange>false</failOnDependencyChange>
<logDependencyChanges>true</logDependencyChanges> <logDependencyChanges>true</logDependencyChanges>
<overwriteChangedDependencies>true</overwriteChangedDependencies> <overwriteChangedDependencies>true</overwriteChangedDependencies>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>verify</id> <id>verify</id>
<phase>process-resources</phase> <goals>
<goals> <goal>verify</goal>
<goal>verify</goal> </goals>
</goals> <phase>process-resources</phase>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>mvn:org.apache.karaf.features/framework/${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.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.eclipse.smarthome/esh-core/${esh.version}/xml/features</descriptor> <descriptor>mvn:org.eclipse.smarthome/esh-core/${esh.version}/xml/features</descriptor>
<descriptor>mvn:org.eclipse.smarthome/esh-tp/${esh.version}/xml/features</descriptor> <descriptor>mvn:org.eclipse.smarthome/esh-tp/${esh.version}/xml/features</descriptor>
<descriptor>mvn:org.openhab.core/openhab-core/${project.version}/xml/features</descriptor> <descriptor>mvn:org.openhab.core/openhab-core/${project.version}/xml/features</descriptor>
</descriptors> </descriptors>
<distribution>org.apache.karaf.features:framework</distribution> <distribution>org.apache.karaf.features:framework</distribution>
<javase>1.8</javase> <javase>1.8</javase>
<framework> <framework>
<feature>framework</feature> <feature>framework</feature>
</framework> </framework>
<features> <features>
<feature>openhab-*</feature> <feature>openhab-*</feature>
</features> </features>
<verifyTransitive>false</verifyTransitive> <verifyTransitive>false</verifyTransitive>
<ignoreMissingConditions>true</ignoreMissingConditions> <ignoreMissingConditions>true</ignoreMissingConditions>
<fail>first</fail> <fail>first</fail>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

147
pom.xml
View File

@ -1,86 +1,87 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?xml version="1.0" encoding="UTF-8"?>
<modelVersion>4.0.0</modelVersion> <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">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.openhab</groupId> <groupId>org.openhab</groupId>
<artifactId>pom-tycho</artifactId> <artifactId>pom-tycho</artifactId>
<version>2.4.0-SNAPSHOT</version>
<relativePath>poms/tycho/pom.xml</relativePath>
</parent>
<groupId>org.openhab.core</groupId>
<artifactId>pom</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging> <relativePath>poms/tycho/pom.xml</relativePath>
</parent>
<name>openHAB</name> <groupId>org.openhab.core</groupId>
<description>This project contains the core components of openHAB</description> <artifactId>pom</artifactId>
<version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties> <name>openHAB</name>
<scm.gitBaseUrl>https://github.com/openhab</scm.gitBaseUrl> <description>This project contains the core components of openHAB</description>
</properties>
<organization> <organization>
<name>openHAB.org</name> <name>openHAB.org</name>
<url>http://www.openhab.org</url> <url>http://www.openhab.org</url>
</organization> </organization>
<licenses> <licenses>
<license> <license>
<name>Eclipse Public License</name> <name>Eclipse Public License</name>
<url>http://www.eclipse.org/legal/epl-v10.html</url> <url>http://www.eclipse.org/legal/epl-v10.html</url>
</license> </license>
</licenses> </licenses>
<scm> <modules>
<connection>scm:git:${scm.gitBaseUrl}/openhab-core.git</connection> <module>poms</module>
<developerConnection>scm:git:${scm.gitBaseUrl}/openhab-core.git</developerConnection> <module>poms/tycho</module>
<url>${scm.gitBaseUrl}/openhab-core</url> <module>bundles</module>
<tag>HEAD</tag> <module>features</module>
</scm> </modules>
<issueManagement> <scm>
<url>https://github.com/openhab/openhab-core/issues</url> <connection>scm:git:${scm.gitBaseUrl}/openhab-core.git</connection>
<system>Github</system> <developerConnection>scm:git:${scm.gitBaseUrl}/openhab-core.git</developerConnection>
</issueManagement> <tag>HEAD</tag>
<url>${scm.gitBaseUrl}/openhab-core</url>
</scm>
<distributionManagement> <issueManagement>
<repository> <system>Github</system>
<id>bintray</id> <url>https://github.com/openhab/openhab-core/issues</url>
<url>https://api.bintray.com/maven/openhab/mvn/openhab-core/;publish=1</url> </issueManagement>
</repository>
<snapshotRepository>
<id>jfrog</id>
<url>https://openhab.jfrog.io/openhab/libs-snapshot-local</url>
</snapshotRepository>
</distributionManagement>
<modules> <distributionManagement>
<module>poms</module> <repository>
<module>poms/tycho</module> <id>bintray</id>
<module>bundles</module> <url>https://api.bintray.com/maven/openhab/mvn/openhab-core/;publish=1</url>
<module>features</module> </repository>
</modules> <snapshotRepository>
<id>jfrog</id>
<url>https://openhab.jfrog.io/openhab/libs-snapshot-local</url>
</snapshotRepository>
</distributionManagement>
<build> <properties>
<pluginManagement> <scm.gitBaseUrl>https://github.com/openhab</scm.gitBaseUrl>
<plugins> </properties>
<plugin>
<groupId>org.openhab.tools.sat</groupId> <build>
<artifactId>sat-plugin</artifactId> <pluginManagement>
<version>${sat.version}</version> <plugins>
<configuration> <plugin>
<checkstyleProperties>${basedirRoot}/tools/checkstyle.properties</checkstyleProperties> <groupId>org.openhab.tools.sat</groupId>
</configuration> <artifactId>sat-plugin</artifactId>
</plugin> <version>${sat.version}</version>
</plugins> <configuration>
</pluginManagement> <checkstyleProperties>${basedirRoot}/tools/checkstyle.properties</checkstyleProperties>
<plugins> </configuration>
<plugin> </plugin>
<groupId>org.commonjava.maven.plugins</groupId> </plugins>
<artifactId>directory-maven-plugin</artifactId> </pluginManagement>
</plugin> <plugins>
</plugins> <plugin>
</build> <groupId>org.commonjava.maven.plugins</groupId>
<artifactId>directory-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>

View File

@ -1,251 +1,337 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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"> <?xml version="1.0" encoding="UTF-8"?>
<modelVersion>4.0.0</modelVersion> <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">
<modelVersion>4.0.0</modelVersion>
<prerequisites> <groupId>org.openhab</groupId>
<maven>3.1</maven> <artifactId>pom</artifactId>
</prerequisites> <version>2.4.0-SNAPSHOT</version>
<groupId>org.openhab</groupId> <packaging>pom</packaging>
<artifactId>pom</artifactId> <name>openHAB</name>
<version>2.4.0-SNAPSHOT</version>
<name>openHAB</name>
<organization> <description>This is the open Home Automation Bus (openHAB)</description>
<name>openHAB.org</name>
<url>http://www.openhab.org</url>
</organization>
<licenses> <organization>
<license> <name>openHAB.org</name>
<name>Eclipse Public License</name> <url>http://www.openhab.org</url>
<url>http://www.eclipse.org/legal/epl-v10.html</url> </organization>
</license>
</licenses>
<scm> <licenses>
<connection>scm:git:${scm.gitBaseUrl}/openhab-core.git</connection> <license>
<developerConnection>scm:git:${scm.gitBaseUrl}/openhab-core.git</developerConnection> <name>Eclipse Public License</name>
<url>${scm.gitBaseUrl}/openhab-core</url> <url>http://www.eclipse.org/legal/epl-v10.html</url>
<tag>HEAD</tag> </license>
</scm> </licenses>
<issueManagement> <prerequisites>
<url>https://github.com/openhab/openhab-core/issues</url> <maven>3.1</maven>
<system>Github</system> </prerequisites>
</issueManagement>
<distributionManagement> <scm>
<repository> <connection>scm:git:${scm.gitBaseUrl}/openhab-core.git</connection>
<id>bintray</id> <developerConnection>scm:git:${scm.gitBaseUrl}/openhab-core.git</developerConnection>
<url>https://api.bintray.com/maven/openhab/mvn/openhab-core/;publish=1</url> <tag>HEAD</tag>
</repository> <url>${scm.gitBaseUrl}/openhab-core</url>
<snapshotRepository> </scm>
<id>jfrog</id>
<url>https://openhab.jfrog.io/openhab/libs-snapshot-local</url>
</snapshotRepository>
</distributionManagement>
<properties> <issueManagement>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <system>Github</system>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <url>https://github.com/openhab/openhab-core/issues</url>
<scm.gitBaseUrl>https://github.com/openhab</scm.gitBaseUrl> </issueManagement>
<maven.compiler.source>1.8</maven.compiler.source> <distributionManagement>
<maven.compiler.target>1.8</maven.compiler.target> <repository>
<maven.compiler.version>3.6.1</maven.compiler.version> <id>bintray</id>
<groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version> <url>https://api.bintray.com/maven/openhab/mvn/openhab-core/;publish=1</url>
<groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version> </repository>
<snapshotRepository>
<id>jfrog</id>
<url>https://openhab.jfrog.io/openhab/libs-snapshot-local</url>
</snapshotRepository>
</distributionManagement>
<ohdr.version>1.0.31</ohdr.version> <properties>
<esh.version>0.10.0-SNAPSHOT</esh.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<repo.version>2.4.x</repo.version> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<karaf.version>4.1.5</karaf.version> <scm.gitBaseUrl>https://github.com/openhab</scm.gitBaseUrl>
<jetty.version>9.3.21.v20170918</jetty.version>
<jackson.version>1.9.13</jackson.version>
<sat.version>0.5.0</sat.version>
<nrjavaserial.version>3.14.0</nrjavaserial.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>
<tycho-version>1.0.0</tycho-version>
<tycho-groupid>org.eclipse.tycho</tycho-groupid>
<jdt-annotations.version>2.1.0</jdt-annotations.version>
<ds-annotations.version>1.2.10</ds-annotations.version>
</properties>
<description>This is the open Home Automation Bus (openHAB)</description> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.version>3.6.1</maven.compiler.version>
<groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
<groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
<packaging>pom</packaging> <ohdr.version>1.0.31</ohdr.version>
<esh.version>0.10.0-SNAPSHOT</esh.version>
<repo.version>2.4.x</repo.version>
<karaf.version>4.1.5</karaf.version>
<jetty.version>9.3.21.v20170918</jetty.version>
<jackson.version>1.9.13</jackson.version>
<sat.version>0.5.0</sat.version>
<nrjavaserial.version>3.14.0</nrjavaserial.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>
<tycho-version>1.0.0</tycho-version>
<tycho-groupid>org.eclipse.tycho</tycho-groupid>
<jdt-annotations.version>2.1.0</jdt-annotations.version>
<ds-annotations.version>1.2.10</ds-annotations.version>
</properties>
<build> <repositories>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.commonjava.maven.plugins</groupId>
<artifactId>directory-maven-plugin</artifactId>
<version>0.2</version>
<executions>
<execution>
<id>directories</id>
<goals>
<goal>highest-basedir</goal>
</goals>
<phase>initialize</phase>
<configuration>
<property>basedirRoot</property>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>${karaf.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build.helper.maven.plugin.version}</version>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>3.0</version>
<configuration>
<basedir>${basedir}</basedir>
<header>src/etc/header.txt</header>
<quiet>false</quiet>
<failIfMissing>true</failIfMissing>
<strictCheck>true</strictCheck>
<aggregate>true</aggregate>
<mapping>
<xml>xml-header-style</xml>
</mapping>
<headerDefinitions>
<headerDefinition>src/etc/xml-header-style.xml</headerDefinition>
</headerDefinitions>
<includes>
<include>**/org/openhab/**/*.java</include>
<include>**/feature.xml</include>
<include>**/OSGI-INF/*.xml</include>
</includes>
<excludes>
<exclude>target/**</exclude>
<exclude>**/pom.xml</exclude>
<exclude>_*.java</exclude>
</excludes>
<useDefaultExcludes>true</useDefaultExcludes>
<properties>
<year>2018</year>
</properties>
<encoding>UTF-8</encoding>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>${tycho-groupid}</groupId>
<artifactId>tycho-versions-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.0.1</version>
<extensions>true</extensions>
<configuration>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
<supportedProjectType>bundle</supportedProjectType>
<supportedProjectType>eclipse-plugin</supportedProjectType>
</supportedProjectTypes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<version>1.24.0</version>
<configuration>
<supportedProjectTypes>
<supportedProjectType>eclipse-plugin</supportedProjectType>
</supportedProjectTypes>
</configuration>
</plugin>
<plugin>
<groupId>com.itemis.maven.plugins</groupId>
<artifactId>unleash-maven-plugin</artifactId>
<version>2.8.0</version>
<dependencies>
<dependency>
<groupId>com.itemis.maven.plugins</groupId>
<artifactId>unleash-scm-provider-git</artifactId>
<version>2.1.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.5</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<profiles> <!-- releases -->
<profile> <repository>
<id>prepare-release</id> <releases>
<build> <enabled>true</enabled>
<plugins> <updatePolicy>never</updatePolicy>
<plugin> </releases>
<groupId>org.eclipse.tycho</groupId> <snapshots>
<artifactId>tycho-versions-plugin</artifactId> <enabled>false</enabled>
<version>${tycho-version}</version> </snapshots>
<executions> <id>jcenter</id>
<execution> <name>JCenter Repository</name>
<id>update-version</id> <url>https://jcenter.bintray.com/</url>
<phase>initialize</phase> </repository>
<goals>
<goal>set-version</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile> <repository>
<id>prepare-next-snapshot</id> <releases>
<build> <enabled>true</enabled>
<plugins> <updatePolicy>never</updatePolicy>
<plugin> </releases>
<groupId>org.eclipse.tycho</groupId> <snapshots>
<artifactId>tycho-versions-plugin</artifactId> <enabled>false</enabled>
<version>${tycho-version}</version> </snapshots>
<executions> <id>bintray</id>
<execution> <name>openHAB SmartHome Repository</name>
<id>update-version</id> <url>https://api.bintray.com/maven/openhab/mvn/smarthome</url>
<phase>initialize</phase> </repository>
<goals>
<goal>set-version</goal> <repository>
</goals> <releases>
</execution> <enabled>true</enabled>
</executions> <updatePolicy>never</updatePolicy>
</plugin> </releases>
</plugins> <snapshots>
</build> <enabled>false</enabled>
</profile> </snapshots>
<id>openhab-artifactory-release</id>
<name>JFrog Artifactory Repository</name>
<url>https://openhab.jfrog.io/openhab/libs-release</url>
</repository>
<!-- snapshots -->
<repository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
<id>openhab-artifactory-snapshot</id>
<name>JFrog Artifactory Repository</name>
<url>https://openhab.jfrog.io/openhab/libs-snapshot</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>jcenter</id>
<name>JCenter Repository</name>
<url>https://jcenter.bintray.com/</url>
</pluginRepository>
<pluginRepository>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>artifactory</id>
<name>JFrog Artifactory Repository</name>
<url>https://openhab.jfrog.io/openhab/libs-release</url>
</pluginRepository>
</pluginRepositories>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.commonjava.maven.plugins</groupId>
<artifactId>directory-maven-plugin</artifactId>
<version>0.2</version>
<executions>
<execution>
<id>directories</id>
<goals>
<goal>highest-basedir</goal>
</goals>
<phase>initialize</phase>
<configuration>
<property>basedirRoot</property>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>${karaf.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build.helper.maven.plugin.version}</version>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>3.0</version>
<configuration>
<basedir>${basedir}</basedir>
<header>src/etc/header.txt</header>
<quiet>false</quiet>
<failIfMissing>true</failIfMissing>
<strictCheck>true</strictCheck>
<aggregate>true</aggregate>
<mapping>
<xml>xml-header-style</xml>
</mapping>
<headerDefinitions>
<headerDefinition>src/etc/xml-header-style.xml</headerDefinition>
</headerDefinitions>
<includes>
<include>**/org/openhab/**/*.java</include>
<include>**/feature.xml</include>
<include>**/OSGI-INF/*.xml</include>
</includes>
<excludes>
<exclude>target/**</exclude>
<exclude>**/pom.xml</exclude>
<exclude>_*.java</exclude>
</excludes>
<useDefaultExcludes>true</useDefaultExcludes>
<properties>
<year>2018</year>
</properties>
<encoding>UTF-8</encoding>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>${tycho-groupid}</groupId>
<artifactId>tycho-versions-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.0.1</version>
<extensions>true</extensions>
<configuration>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
<supportedProjectType>bundle</supportedProjectType>
<supportedProjectType>eclipse-plugin</supportedProjectType>
</supportedProjectTypes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<version>1.24.0</version>
<configuration>
<supportedProjectTypes>
<supportedProjectType>eclipse-plugin</supportedProjectType>
</supportedProjectTypes>
</configuration>
</plugin>
<plugin>
<groupId>com.itemis.maven.plugins</groupId>
<artifactId>unleash-maven-plugin</artifactId>
<version>2.8.0</version>
<dependencies>
<dependency>
<groupId>com.itemis.maven.plugins</groupId>
<artifactId>unleash-scm-provider-git</artifactId>
<version>2.1.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.5</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>prepare-release</id>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-versions-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>update-version</id>
<goals>
<goal>set-version</goal>
</goals>
<phase>initialize</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>prepare-next-snapshot</id>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-versions-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>update-version</id>
<goals>
<goal>set-version</goal>
</goals>
<phase>initialize</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!-- static code analysis profiles --> <!-- static code analysis profiles -->
<profile> <profile>
@ -264,13 +350,13 @@
<version>${sat.version}</version> <version>${sat.version}</version>
<executions> <executions>
<execution> <execution>
<phase>verify</phase>
<goals> <goals>
<goal>checkstyle</goal> <goal>checkstyle</goal>
<goal>pmd</goal> <goal>pmd</goal>
<goal>spotbugs</goal> <goal>spotbugs</goal>
<goal>report</goal> <goal>report</goal>
</goals> </goals>
<phase>verify</phase>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -288,9 +374,9 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.openhab.tools.sat</groupId> <groupId>org.openhab.tools.sat</groupId>
<artifactId>sat-plugin</artifactId> <artifactId>sat-plugin</artifactId>
<version>${sat.version}</version> <version>${sat.version}</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -305,98 +391,13 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.openhab.tools.sat</groupId> <groupId>org.openhab.tools.sat</groupId>
<artifactId>sat-plugin</artifactId> <artifactId>sat-plugin</artifactId>
<version>${sat.version}</version> <version>${sat.version}</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
<pluginRepositories>
<pluginRepository>
<id>jcenter</id>
<name>JCenter Repository</name>
<url>https://jcenter.bintray.com/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>artifactory</id>
<name>JFrog Artifactory Repository</name>
<url>https://openhab.jfrog.io/openhab/libs-release</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<repositories>
<!-- releases -->
<repository>
<id>jcenter</id>
<name>JCenter Repository</name>
<url>https://jcenter.bintray.com/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>bintray</id>
<name>openHAB SmartHome Repository</name>
<url>https://api.bintray.com/maven/openhab/mvn/smarthome</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>openhab-artifactory-release</id>
<name>JFrog Artifactory Repository</name>
<url>https://openhab.jfrog.io/openhab/libs-release</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!-- snapshots -->
<repository>
<id>openhab-artifactory-snapshot</id>
<name>JFrog Artifactory Repository</name>
<url>https://openhab.jfrog.io/openhab/libs-snapshot</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
</project> </project>

File diff suppressed because it is too large Load Diff