Repository: flex-blazeds Updated Branches: refs/heads/develop 6985c527e -> 7f60fbbaf
- Updated spring(boot) versions - Added configuration for SonarQube Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/7f60fbba Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/7f60fbba Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/7f60fbba Branch: refs/heads/develop Commit: 7f60fbbafa1472add2b153a40d91c45274024c18 Parents: 6985c52 Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Sat Dec 17 16:47:06 2016 +0100 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Sat Dec 17 16:47:06 2016 +0100 ---------------------------------------------------------------------- opt/blazeds-spring-boot-starter/pom.xml | 8 +- opt/pom.xml | 8 +- pom.xml | 142 +++++++++++++++++++++++++++ 3 files changed, 150 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/7f60fbba/opt/blazeds-spring-boot-starter/pom.xml ---------------------------------------------------------------------- diff --git a/opt/blazeds-spring-boot-starter/pom.xml b/opt/blazeds-spring-boot-starter/pom.xml index 870d7f5..36d8fd0 100644 --- a/opt/blazeds-spring-boot-starter/pom.xml +++ b/opt/blazeds-spring-boot-starter/pom.xml @@ -32,12 +32,12 @@ limitations under the License. <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-autoconfigure</artifactId> - <version>1.3.3.RELEASE</version> + <version>1.4.1.RELEASE</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>4.2.3.RELEASE</version> + <version>4.3.3.RELEASE</version> </dependency> <!-- @@ -49,7 +49,7 @@ limitations under the License. <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>1.3.3.RELEASE</version> + <version>1.4.1.RELEASE</version> <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> @@ -60,7 +60,7 @@ limitations under the License. <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-jetty</artifactId> - <version>1.3.3.RELEASE</version> + <version>1.4.1.RELEASE</version> </dependency> <!-- Add a reference to Apache Flex BlazeDS --> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/7f60fbba/opt/pom.xml ---------------------------------------------------------------------- diff --git a/opt/pom.xml b/opt/pom.xml index 6800198..91b7378 100755 --- a/opt/pom.xml +++ b/opt/pom.xml @@ -20,7 +20,7 @@ limitations under the License. <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.flex.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>blazeds</artifactId> <version>4.7.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> @@ -30,8 +30,8 @@ limitations under the License. <packaging>pom</packaging> <modules> - <module>tomcat</module> - <!-- TODO: Commented out these project as they have third-party dependencies that might be problematic. --> + <module>tomcat</module> + <!-- TODO: Commented out these project as they have third-party dependencies that might be problematic. --> <!--module>websphere</module--> <!--module>weblogic</module--> <!--module>oracle</module--> @@ -40,7 +40,7 @@ limitations under the License. <dependencies> <dependency> - <groupId>org.apache.flex.blazeds</groupId> + <groupId>org.apache.flex.blazeds</groupId> <artifactId>flex-messaging-core</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/7f60fbba/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d4c5528..e0572fb 100755 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,16 @@ <name>Apache Flex: BlazeDS</name> + <properties> + <!-- URL of the ASF SonarQube server --> + <sonar.host.url>https://builds.apache.org/analysis</sonar.host.url> + <!-- Tell sonar where the coverage reports are located --> + <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco-ut.exec</sonar.jacoco.reportPath> + <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath> + <!-- Exclude all generated code --> + <sonar.exclusions>file:**/generated-sources/**</sonar.exclusions> + </properties> + <mailingLists> <mailingList> <name>Apache Flex Dev List</name> @@ -79,6 +89,87 @@ </plugin> <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.6.201602180812</version> + <executions> + <!-- + Prepares the property pointing to the JaCoCo runtime agent which + is passed as VM argument when Maven the Surefire plugin is executed. + --> + <execution> + <id>pre-unit-test</id> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <!-- Sets the path to the file which contains the execution data. --> + <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile> + <!-- + Sets the name of the property containing the settings + for JaCoCo runtime agent. + --> + <propertyName>surefireArgLine</propertyName> + </configuration> + </execution> + <!-- + Ensures that the code coverage report for unit tests is created after + unit tests have been run. + --> + <execution> + <id>post-unit-test</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <!-- Sets the path to the file which contains the execution data. --> + <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile> + <!-- Sets the output directory for the code coverage report. --> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> + </configuration> + </execution> + <!-- + Prepares the property pointing to the JaCoCo runtime agent which + is passed as VM argument when Maven the Failsafe plugin is executed. + --> + <execution> + <id>pre-integration-test</id> + <phase>pre-integration-test</phase> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <!-- Sets the path to the file which contains the execution data. --> + <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile> + <!-- + Sets the name of the property containing the settings + for JaCoCo runtime agent. + --> + <propertyName>failsafeArgLine</propertyName> + </configuration> + </execution> + <!-- + Ensures that the code coverage report for integration tests after + integration tests have been run. + --> + <execution> + <id>post-integration-test</id> + <phase>post-integration-test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <!-- Sets the path to the file which contains the execution data. --> + <dataFile>${project.build.directory}/coverage-reports/jacoco-it.exec</dataFile> + <!-- Sets the output directory for the code coverage report. --> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> @@ -133,9 +224,60 @@ </signature> </configuration> </plugin> + + <plugin> + <groupId>org.sonarsource.scanner.maven</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>3.0.2</version> + </plugin> </plugins> </build> + <reporting> + <plugins> + + <!-- Generates a changelog report from GIT commits --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-changelog-plugin</artifactId> + <version>2.3</version> + <configuration> + <!-- Automatically link Jira issues --> + <issueLinkUrl>https://issues.apache.org/jira/browse/%ISSUE%</issueLinkUrl> + </configuration> + </plugin> + + <!-- Generates a report with the details of the unit- and integrationtests --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.19.1</version> + </plugin> + + <!-- Generates a report with the test coverages --> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.6.201602180812</version> + </plugin> + + <!-- Generates a report with the SonarQube analysis reports --> + <plugin> + <groupId>org.codehaus.sonar-plugins</groupId> + <artifactId>maven-report</artifactId> + <version>0.1</version> + </plugin> + + <!-- Generate the JavaDoc API documentation --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + </plugin> + </plugins> + </reporting> + + <!-- When building on the apache ci server, we want to get some source-release archives --> <profiles>
