Repository: maven-surefire Updated Branches: refs/heads/master 5693c8117 -> 33e6819ab
update to maven-parent:26, fix configuration for rat-plugin, update release-plugin to 2.5.1 and add workaround for MRELEASE-799 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/33e6819a Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/33e6819a Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/33e6819a Branch: refs/heads/master Commit: 33e6819abce2b64b994612869bc73180f8502fd2 Parents: 5693c81 Author: Andreas Gudian <agud...@apache.org> Authored: Mon Dec 22 14:10:53 2014 +0100 Committer: Andreas Gudian <agud...@apache.org> Committed: Mon Dec 22 15:00:50 2014 +0100 ---------------------------------------------------------------------- maven-failsafe-plugin/pom.xml | 2 +- maven-surefire-common/pom.xml | 2 +- maven-surefire-plugin/pom.xml | 2 +- pom.xml | 70 +++++++++++++-------------- surefire-api/pom.xml | 2 +- surefire-booter/pom.xml | 2 +- surefire-grouper/pom.xml | 2 +- surefire-integration-tests/pom.xml | 6 +-- surefire-providers/pom.xml | 4 +- surefire-report-parser/pom.xml | 2 +- surefire-setup-integration-tests/pom.xml | 2 +- surefire-shadefire/pom.xml | 8 +-- 12 files changed, 52 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/maven-failsafe-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 894d910..4e7dee1 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -105,7 +105,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/maven-surefire-common/pom.xml ---------------------------------------------------------------------- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 0c675b1..0904048 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -124,7 +124,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/maven-surefire-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 6c46660..07ea80f 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -97,7 +97,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 34c4a19..093fe51 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>maven-parent</artifactId> <groupId>org.apache.maven</groupId> - <version>25</version> + <version>26</version> <relativePath>../pom/maven/pom.xml</relativePath> </parent> @@ -85,7 +85,7 @@ <properties> <mavenVersion>2.2.1</mavenVersion> - <shadedVersion>2.12.4</shadedVersion> + <!-- <shadedVersion>2.12.4</shadedVersion> commented out due to http://jira.codehaus.org/browse/MRELEASE-799 --> <mavenPluginPluginVersion>3.3</mavenPluginPluginVersion> <maven.surefire.scm.devConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection> <maven.site.path>surefire-archives/surefire-LATEST</maven.site.path> @@ -271,7 +271,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> <configuration> <!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! --> <useSystemClassLoader>false</useSystemClassLoader> @@ -279,7 +279,7 @@ </plugin> <plugin> <artifactId>maven-release-plugin</artifactId> - <version>2.2.1</version> + <version>2.5.1</version> <configuration> <autoVersionSubmodules>true</autoVersionSubmodules> <preparationGoals>clean install</preparationGoals> @@ -296,36 +296,6 @@ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> </configuration> </plugin> - <plugin><!-- TODO remove when upgrading maven-parent to 25 --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>.git/**/*</exclude> - <exclude>**/.idea</exclude> - <exclude>**/.svn/**/*</exclude> - <exclude>src/test/resources/**/*</exclude> - <exclude>**/*.jj</exclude> - <exclude>src/test/resources/**/*.css</exclude> - <exclude>**/*.iml</exclude> - <exclude>**/*.ipr</exclude> - <exclude>**/*.iws</exclude> - <exclude>**/*.versionsBackup</exclude> - <exclude>**/dependency-reduced-pom.xml</exclude> - <exclude>.gitignore</exclude> - <exclude>DEPENDENCIES</exclude> - <exclude>src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider - </exclude> - </excludes> - </configuration> - </plugin> </plugins> </pluginManagement> <plugins> @@ -333,6 +303,36 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <executions> + <execution> + <id>rat-check</id> + <goals> + <goal>check</goal> + </goals> + <configuration> + <excludes combine.children="append"> + <exclude>.git/**/*</exclude> + <exclude>**/.idea</exclude> + <exclude>**/.svn/**/*</exclude> + <exclude>src/test/resources/**/*</exclude> + <exclude>**/*.jj</exclude> + <exclude>src/test/resources/**/*.css</exclude> + <exclude>**/*.iml</exclude> + <exclude>**/*.ipr</exclude> + <exclude>**/*.iws</exclude> + <exclude>**/*.versionsBackup</exclude> + <exclude>**/dependency-reduced-pom.xml</exclude> + <exclude>.gitignore</exclude> + <exclude>src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider + </exclude> + </excludes> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -373,7 +373,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </plugin> <!-- plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/surefire-api/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml index 5d0fa9f..716b7d6 100644 --- a/surefire-api/pom.xml +++ b/surefire-api/pom.xml @@ -46,7 +46,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/surefire-booter/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml index 29036b1..71d872a 100644 --- a/surefire-booter/pom.xml +++ b/surefire-booter/pom.xml @@ -46,7 +46,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/surefire-grouper/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-grouper/pom.xml b/surefire-grouper/pom.xml index 8b7db3b..14ff51e 100644 --- a/surefire-grouper/pom.xml +++ b/surefire-grouper/pom.xml @@ -57,7 +57,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/surefire-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml index c84751f..7b20aa4 100644 --- a/surefire-integration-tests/pom.xml +++ b/surefire-integration-tests/pom.xml @@ -94,7 +94,7 @@ </plugin> <plugin> <artifactId>maven-failsafe-plugin</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> <configuration> <threadCount>1</threadCount> <perCoreThreadCount>false</perCoreThreadCount> @@ -123,7 +123,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-junit47</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> </dependencies> @@ -241,7 +241,7 @@ </plugin> <plugin> <artifactId>maven-failsafe-plugin</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> <configuration> <excludedGroups>org.apache.maven.surefire.its.Not2xCompatible</excludedGroups> </configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/surefire-providers/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-providers/pom.xml b/surefire-providers/pom.xml index b13965b..9fe633a 100644 --- a/surefire-providers/pom.xml +++ b/surefire-providers/pom.xml @@ -56,12 +56,12 @@ <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> <dependencies> <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/surefire-report-parser/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml index 7ab3fcb..45b245d 100644 --- a/surefire-report-parser/pom.xml +++ b/surefire-report-parser/pom.xml @@ -58,7 +58,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/surefire-setup-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-setup-integration-tests/pom.xml b/surefire-setup-integration-tests/pom.xml index c67fa43..af8f3b3 100644 --- a/surefire-setup-integration-tests/pom.xml +++ b/surefire-setup-integration-tests/pom.xml @@ -219,7 +219,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/33e6819a/surefire-shadefire/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml index 2116997..0f035f6 100644 --- a/surefire-shadefire/pom.xml +++ b/surefire-shadefire/pom.xml @@ -46,17 +46,17 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-junit3</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-api</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-booter</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> </dependency> </dependencies> @@ -93,7 +93,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>${shadedVersion}</version> + <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to http://jira.codehaus.org/browse/MRELEASE-799 --> <configuration> <skip>true</skip> </configuration>
