You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by bi...@apache.org on 2014/06/27 13:33:23 UTC
svn commit: r1606036 - /jena/trunk/jena-maven-tools/pom.xml
Author: bimargulies
Date: Fri Jun 27 11:33:22 2014
New Revision: 1606036
URL: http://svn.apache.org/r1606036
Log:
JENA-731: deal with dependency convergence.
Modified:
jena/trunk/jena-maven-tools/pom.xml
Modified: jena/trunk/jena-maven-tools/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/pom.xml?rev=1606036&r1=1606035&r2=1606036&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/pom.xml (original)
+++ jena/trunk/jena-maven-tools/pom.xml Fri Jun 27 11:33:22 2014
@@ -56,7 +56,13 @@
<name>Ian Dickinson</name>
<email>ijd@apache.org</email>
<timezone>+0</timezone>
- </developer>
+ </developer>
+ <developer>
+ <id>bimargulies</id>
+ <name>Benson Margulies</name>
+ <email>bimargulies@apache.org</email>
+ <timezone>+5</timezone>
+ </developer>
</developers>
<licenses>
<license>
@@ -76,8 +82,9 @@
<url>http://www.apache.org</url>
</organization>
<properties>
- <jenaCoreVersion>2.12.0-SNAPSHOT</jenaCoreVersion>
- <version>${project.version}</version>
+ <jenaCoreVersion>2.12.0-SNAPSHOT</jenaCoreVersion>
+ <version>${project.version}</version>
+ <mavenVersion>3.0.4</mavenVersion>
</properties>
<build>
<plugins>
@@ -172,13 +179,17 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </exclusion>
</exclusions>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.1.1</version>
+ <version>${mavenVersion}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -218,8 +229,15 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.2.1</version>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<reporting>