lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'eclipse/master'

Browse Source
This commit is contained in:
Kai Zimmermann
2016-01-22 14:14:16 +01:00
parent e6041c3b0f f5ae40ac17
commit ad04d9b479
1 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
pom.xml
View File

@@ -98,27 +98,27 @@
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<!-- Jacoco version to use --> <!-- Jacoco version to use -->
<jacoco.version>0.7.2.201409121644</jacoco.version> <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 --> per test -->
<sonar-jacoco-listeners.version>1.4</sonar-jacoco-listeners.version> <sonar-jacoco-listeners.version>1.4</sonar-jacoco-listeners.version>
<!-- Don't let Sonar execute tests. We will ask it to Maven --> <!-- Don't let Sonar execute tests. We will ask it to Maven -->
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<!-- The system property jacoco.outputDir needs to be override on the <!-- 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 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 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 project in the root directory of the workspace : mvn clean install -Prun-its,coverage
-Djacoco.outputDir=${WORKSPACE}/target Note that unfortunately using the -Djacoco.outputDir=${WORKSPACE}/target Note that unfortunately using the
following does not work because of http://jira.codehaus.org/browse/SONAR-3427: following does not work because of http://jira.codehaus.org/browse/SONAR-3427:
<jacoco.outputDir>${session.executionRootDirectory}/target/</jacoco.outputDir> --> <jacoco.outputDir>${session.executionRootDirectory}/target/</jacoco.outputDir> -->
<jacoco.outputDir>${project.basedir}/../target/</jacoco.outputDir> <jacoco.outputDir>${project.basedir}/../target/</jacoco.outputDir>
<!-- Jacoco output file for UTs --> <!-- Jacoco output file for UTs -->
<jacoco.out.ut.file>jacoco-ut.exec</jacoco.out.ut.file> <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 --> Unit Tests -->
<sonar.jacoco.reportPath>${jacoco.outputDir}/${jacoco.out.ut.file}</sonar.jacoco.reportPath> <sonar.jacoco.reportPath>${jacoco.outputDir}/${jacoco.out.ut.file}</sonar.jacoco.reportPath>
<!-- Jacoco output file for ITs --> <!-- Jacoco output file for ITs -->
<jacoco.out.it.file>jacoco-it.exec</jacoco.out.it.file> <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 --> Integration Tests -->
<sonar.jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</sonar.jacoco.itReportPath> <sonar.jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</sonar.jacoco.itReportPath>
<guava.version>19.0</guava.version> <guava.version>19.0</guava.version>
@@ -127,26 +127,26 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>com.mycila</groupId> <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<version>2.11</version> <version>2.11</version>
<configuration> <configuration>
<header>LICENCE_HEADER_TEMPLATE.txt</header> <header>LICENCE_HEADER_TEMPLATE.txt</header>
<excludes> <excludes>
<exclude>**/README</exclude> <exclude>**/README</exclude>
<exclude>3rd-dependencies/**</exclude> <exclude>3rd-dependencies/**</exclude>
<exclude>**/.git*</exclude> <exclude>**/.git*</exclude>
<exclude>.git*</exclude> <exclude>.git*</exclude>
<exclude>**/*.sql</exclude> <exclude>**/*.sql</exclude>
<exclude>**/*.sql</exclude> <exclude>**/*.sql</exclude>
<exclude>eclipse_codeformatter.xml</exclude> <exclude>eclipse_codeformatter.xml</exclude>
</excludes> </excludes>
<mapping> <mapping>
<scss>JAVADOC_STYLE</scss> <scss>JAVADOC_STYLE</scss>
</mapping> </mapping>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId> <artifactId>versions-maven-plugin</artifactId>
@@ -189,6 +189,18 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
@@ -348,9 +360,10 @@
<artifactId>vaadin-push</artifactId> <artifactId>vaadin-push</artifactId>
<version>${vaadin.version}</version> <version>${vaadin.version}</version>
</dependency> </dependency>
<!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory). For widgetset compilation, <!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory).
vaadin-client-compiler is automatically added on the compilation classpath by vaadin-maven-plugin so normally there is no For widgetset compilation, vaadin-client-compiler is automatically added
need for an explicit dependency. --> on the compilation classpath by vaadin-maven-plugin so normally there is
no need for an explicit dependency. -->
<dependency> <dependency>
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-client-compiler</artifactId> <artifactId>vaadin-client-compiler</artifactId>
@@ -488,7 +501,8 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Override of classmate version, that is a hibernate validator dependency. allow PB of CQ --> <!-- Override of classmate version, that is a hibernate validator
dependency. allow PB of CQ -->
<dependency> <dependency>
<groupId>com.fasterxml</groupId> <groupId>com.fasterxml</groupId>
<artifactId>classmate</artifactId> <artifactId>classmate</artifactId>