You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/07/14 10:44:07 UTC
[34/38] isis git commit: ISIS-1353: fixes dependency convergence
issues in maven-plugin pom
ISIS-1353: fixes dependency convergence issues in maven-plugin pom
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/de5a3f36
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/de5a3f36
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/de5a3f36
Branch: refs/heads/master
Commit: de5a3f36518376a545492bbb6080c09d83dfcbe1
Parents: 19cf085
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 07:40:08 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:23:05 2016 +0100
----------------------------------------------------------------------
core/maven-plugin/pom.xml | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/de5a3f36/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index b90f396..75fc5fe 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -44,8 +44,6 @@
<maven-core.version>3.3.9</maven-core.version>
<maven-project.version>3.0-alpha-2</maven-project.version>
<maven-plugin-annotations.version>3.4</maven-plugin-annotations.version>
- <plexus-sec-dispatcher.version>1.4</plexus-sec-dispatcher.version>
- <plexus-utils.version>2.1</plexus-utils.version>
<plexus-container-default.version>1.7</plexus-container-default.version>
</properties>
@@ -124,12 +122,12 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven-core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>${plexus-utils.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -153,6 +151,14 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>:plexus-sec-dispatcher</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -270,18 +276,6 @@
</dependency>
<dependency>
- <groupId>org.sonatype.plexus</groupId>
- <artifactId>plexus-sec-dispatcher</artifactId>
- <version>${plexus-sec-dispatcher.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
<version>${maven-project.version}</version>