OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update sat configuration and version (#262) 

* Add config file to the build
* Change to new artifact ID and version of SAT
* Bump to new version

Signed-off-by: Svilen Valkanov <svilen.valkanov@musala.com>
pull/284/head
Svilen 2018-01-26 10:47:44 +02:00 committed by Martin van Wingerden
parent 660fa9fbd6
commit 16ac7f16ca
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pom.xml
View File

@ -1,13 +1,13 @@
<?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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.openhab</groupId>
<artifactId>pom-tycho</artifactId>
<version>2.3.0-SNAPSHOT</version>
<relativePath>poms/tycho/pom.xml</relativePath>
</parent>
<groupId>org.openhab.core</groupId>
<artifactId>pom</artifactId>
<version>2.3.0-SNAPSHOT</version>
@ -64,11 +64,27 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.openhab.tools.sat</groupId>
<artifactId>sat-plugin</artifactId>
<version>${sat.version}</version>
<configuration>
<checkstyleProperties>${basedirRoot}/tools/checkstyle.properties</checkstyleProperties>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.commonjava.maven.plugins</groupId>
<artifactId>directory-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.commonjava.maven.plugins</groupId>
<artifactId>directory-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

14
poms/pom.xml
View File

@ -63,7 +63,7 @@
<karaf.version>4.1.3</karaf.version>
<jetty.version>9.3.22.v20171030</jetty.version>
<jackson.version>1.9.13</jackson.version>
<sat.version>0.3.0</sat.version>
<sat.version>0.4.1</sat.version>
<nrjavaserial.version>3.12.0.OH</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>
@ -250,8 +250,8 @@
<pluginManagement>
<plugins>
<plugin>
<groupId>org.openhab.tools</groupId>
<artifactId>static-code-analysis</artifactId>
<groupId>org.openhab.tools.sat</groupId>
<artifactId>sat-plugin</artifactId>
<version>${sat.version}</version>
<executions>
<execution>
@ -279,8 +279,8 @@
<build>
<plugins>
<plugin>
<groupId>org.openhab.tools</groupId>
<artifactId>static-code-analysis</artifactId>
<groupId>org.openhab.tools.sat</groupId>
<artifactId>sat-plugin</artifactId>
<version>${sat.version}</version>
</plugin>
</plugins>
@ -296,8 +296,8 @@
<build>
<plugins>
<plugin>
<groupId>org.openhab.tools</groupId>
<artifactId>static-code-analysis</artifactId>
<groupId>org.openhab.tools.sat</groupId>
<artifactId>${sat.plugin}</artifactId>
<version>${sat.version}</version>
</plugin>
</plugins>

2
tools/checkstyle.properties Normal file
View File

@ -0,0 +1,2 @@
checkstyle.headerCheck.content=^/\\*\\*$\\n^ \\* Copyright \\(c\\) {0}-{1} by the respective copyright holders\\.$\\n^ \\*$\\n^ \\* All rights reserved\\. This program and the accompanying materials$\\n^ \\* are made available under the terms of the Eclipse Public License v1\\.0$\\n^ \\* which accompanies this distribution, and is available at$\\n^ \\* http://www.eclipse.org/legal/epl\\-v10\\.html$
checkstyle.headerCheck.values=2015,2018