Merge remote-tracking branch 'eclipse/master'

This commit is contained in:
Kai Zimmermann
2016-01-29 11:17:55 +01:00
2 changed files with 18 additions and 14 deletions

View File

@@ -1,5 +1,7 @@
# hawkbit-update-server
Build: [![Circle CI](https://circleci.com/gh/eclipse/hawkbit.svg?style=svg)](https://circleci.com/gh/eclipse/hawkbit)
Want to chat with the team behind hawkBit? [![Join the chat at https://gitter.im/eclipse/hawkbit](https://badges.gitter.im/eclipse/hawkbit.svg)](https://gitter.im/eclipse/hawkbit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[hawkBit](https://projects.eclipse.org/projects/iot.hawkbit) is an domain independent back end solution for rolling out software updates to constrained edge devices as well as more powerful controllers and gateways connected to IP based networking infrastructure.

30
pom.xml
View File

@@ -94,31 +94,33 @@
<!-- Sonar -->
<sonar.host.url>https://sonar.eu-gb.mybluemix.net</sonar.host.url>
<sonar.github.repository>bsinno/hawkbit-update-server</sonar.github.repository>
<sonar.github.repository>eclipse/hawkbit</sonar.github.repository>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.links.homepage>https://projects.eclipse.org/projects/iot.hawkbit</sonar.links.homepage>
<sonar.links.ci>https://circleci.com/gh/eclipse/hawkbit</sonar.links.ci>
<!-- Jacoco version to use -->
<jacoco.version>0.7.2.201409121644</jacoco.version>
<!-- The Sonar Jacoco Listener for JUnit to extract coverage details
<!-- The Sonar Jacoco Listener for JUnit to extract coverage details
per test -->
<sonar-jacoco-listeners.version>1.4</sonar-jacoco-listeners.version>
<!-- Don't let Sonar execute tests. We will ask it to Maven -->
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<!-- The system property jacoco.outputDir needs to be override on the
command line with an absolute path if you want to merge results from all
modules. Example in a Jenkisn build where ${WORKSPACE} is defined and your
project in the root directory of the workspace : mvn clean install -Prun-its,coverage
-Djacoco.outputDir=${WORKSPACE}/target Note that unfortunately using the
following does not work because of http://jira.codehaus.org/browse/SONAR-3427:
<!-- The system property jacoco.outputDir needs to be override on the
command line with an absolute path if you want to merge results from all
modules. Example in a Jenkisn build where ${WORKSPACE} is defined and your
project in the root directory of the workspace : mvn clean install -Prun-its,coverage
-Djacoco.outputDir=${WORKSPACE}/target Note that unfortunately using the
following does not work because of http://jira.codehaus.org/browse/SONAR-3427:
<jacoco.outputDir>${session.executionRootDirectory}/target/</jacoco.outputDir> -->
<jacoco.outputDir>${project.basedir}/../target/</jacoco.outputDir>
<!-- Jacoco output file for UTs -->
<jacoco.out.ut.file>jacoco-ut.exec</jacoco.out.ut.file>
<!-- Tells Sonar where the Jacoco coverage result file is located for
<!-- Tells Sonar where the Jacoco coverage result file is located for
Unit Tests -->
<sonar.jacoco.reportPath>${jacoco.outputDir}/${jacoco.out.ut.file}</sonar.jacoco.reportPath>
<!-- Jacoco output file for ITs -->
<jacoco.out.it.file>jacoco-it.exec</jacoco.out.it.file>
<!-- Tells Sonar where the Jacoco coverage result file is located for
<!-- Tells Sonar where the Jacoco coverage result file is located for
Integration Tests -->
<sonar.jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</sonar.jacoco.itReportPath>
<guava.version>19.0</guava.version>
@@ -360,9 +362,9 @@
<artifactId>vaadin-push</artifactId>
<version>${vaadin.version}</version>
</dependency>
<!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory).
For widgetset compilation, vaadin-client-compiler is automatically added
on the compilation classpath by vaadin-maven-plugin so normally there is
<!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory).
For widgetset compilation, vaadin-client-compiler is automatically added
on the compilation classpath by vaadin-maven-plugin so normally there is
no need for an explicit dependency. -->
<dependency>
<groupId>com.vaadin</groupId>
@@ -501,7 +503,7 @@
</exclusion>
</exclusions>
</dependency>
<!-- Override of classmate version, that is a hibernate validator
<!-- Override of classmate version, that is a hibernate validator
dependency. allow PB of CQ -->
<dependency>
<groupId>com.fasterxml</groupId>