Updated Branches: refs/heads/master b2d4b5c36 -> 36a709c52
o Swith to m-site-p 3.3 and remove the workaround for MSITE-670 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/3d3cc37b Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3d3cc37b Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3d3cc37b Branch: refs/heads/master Commit: 3d3cc37b18aabc85d2ee128d65dd6000c770df21 Parents: b9f3c39 Author: Andreas Gudian <[email protected]> Authored: Tue May 14 09:13:37 2013 +0200 Committer: Andreas Gudian <[email protected]> Committed: Tue May 14 09:13:37 2013 +0200 ---------------------------------------------------------------------- maven-surefire-plugin/pom.xml | 28 ---------------------------- pom.xml | 2 +- 2 files changed, 1 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3d3cc37b/maven-surefire-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 2a0379d..3bac556 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -117,34 +117,6 @@ </execution> </executions> </plugin> - <!-- BEGIN HACK: use replacer plugin to remove the second xml processing instruction (MSITE-670). --> - <!-- can be removed once maven-site-plugin 3.3 is released. --> - <plugin> - <groupId>com.google.code.maven-replacer-plugin</groupId> - <artifactId>replacer</artifactId> - <version>1.5.2</version> - <executions> - <execution> - <phase>pre-site</phase> - <goals> - <goal>replace</goal> - </goals> - </execution> - </executions> - <configuration> - <regexFlags> - <regexFlag>DOTALL</regexFlag> - </regexFlags> - <file>${project.build.directory}/source-site/site.xml</file> - <replacements> - <replacement> - <token>(.+)<\?xml [^>]+>(.*)</token> - <value>$1$2</value> - </replacement> - </replacements> - </configuration> - </plugin> - <!-- END HACK --> <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3d3cc37b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c60f378..da133ff 100644 --- a/pom.xml +++ b/pom.xml @@ -321,7 +321,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.2</version> + <version>3.3</version> <dependencies> <dependency> <groupId>org.apache.maven.doxia</groupId>
