You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2016/05/29 21:19:59 UTC
maven-surefire git commit: refactoring of
maven-surefire-report-plugin/pom.xml
Repository: maven-surefire
Updated Branches:
refs/heads/master 3de31efd5 -> b1913455d
refactoring of maven-surefire-report-plugin/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/b1913455
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/b1913455
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/b1913455
Branch: refs/heads/master
Commit: b1913455d7289a7d914582fb3a4fc7622f5fe717
Parents: 3de31ef
Author: Tibor17 <ti...@lycos.com>
Authored: Sun May 29 23:19:33 2016 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Sun May 29 23:19:33 2016 +0200
----------------------------------------------------------------------
maven-surefire-report-plugin/pom.xml | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b1913455/maven-surefire-report-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index 37e421d..9fc60d7 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -76,33 +76,22 @@
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-sink-api</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
<version>1.6</version>
</dependency>
- <dependency> <!-- //todo Someone, somewhere is missing doxia own -pu dep -->
+ <dependency>
+ <!-- using the same transient version 3.0.15 from doxia-site-renderer:1.6 which is in conflict
+ with version 1.5.15 in maven-project:2.2.1 on the same level of dependency tree -->
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.15</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-utils</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>1.2</version>
@@ -160,7 +149,7 @@
<plugins>
<plugin>
<artifactId>maven-docck-plugin</artifactId>
- <version>1.0-beta-1</version>
+ <version>1.1</version>
<executions>
<execution>
<goals>