You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by sa...@apache.org on 2013/02/13 21:50:46 UTC
svn commit: r1445916 - in /jena/trunk: jena-arq/pom.xml jena-fuseki/pom.xml
jena-parent/pom.xml
Author: sallen
Date: Wed Feb 13 20:50:45 2013
New Revision: 1445916
URL: http://svn.apache.org/r1445916
Log:
1) Resolve conflicting httpclient dependencies,
2) Run enforcer plugin automatically during compile
Modified:
jena/trunk/jena-arq/pom.xml
jena/trunk/jena-fuseki/pom.xml
jena/trunk/jena-parent/pom.xml
Modified: jena/trunk/jena-arq/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/pom.xml?rev=1445916&r1=1445915&r2=1445916&view=diff
==============================================================================
--- jena/trunk/jena-arq/pom.xml (original)
+++ jena/trunk/jena-arq/pom.xml Wed Feb 13 20:50:45 2013
@@ -53,9 +53,6 @@
<properties>
<this.root>${project.artifactId}-${project.version}</this.root>
- <ver.httpclient>4.2.2</ver.httpclient>
- <ver.httpcore>4.2.3</ver.httpcore>
- <ver.commons-codec>1.5</ver.commons-codec>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<build.time.xsd>${maven.build.timestamp}</build.time.xsd>
</properties>
@@ -77,12 +74,6 @@
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${ver.commons-codec}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${ver.httpclient}</version>
@@ -102,12 +93,6 @@
<version>${ver.slf4j}</version>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${ver.httpcore}</version>
- </dependency>
-
</dependencies>
<build>
Modified: jena/trunk/jena-fuseki/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/pom.xml?rev=1445916&r1=1445915&r2=1445916&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/pom.xml (original)
+++ jena/trunk/jena-fuseki/pom.xml Wed Feb 13 20:50:45 2013
@@ -80,10 +80,7 @@
<!-- <ver.jetty>8.1.7.v20120910</ver.jetty> -->
<ver.velocity>1.7</ver.velocity>
- <ver.httpclient>4.2.2</ver.httpclient>
- <ver.httpcore>4.2.3</ver.httpcore>
<ver.commons-fileupload>1.2.2</ver.commons-fileupload>
- <ver.commons-codec>1.5</ver.commons-codec>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<build.time.xsd>${maven.build.timestamp}</build.time.xsd>
Modified: jena/trunk/jena-parent/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-parent/pom.xml?rev=1445916&r1=1445915&r2=1445916&view=diff
==============================================================================
--- jena/trunk/jena-parent/pom.xml (original)
+++ jena/trunk/jena-parent/pom.xml Wed Feb 13 20:50:45 2013
@@ -57,6 +57,8 @@
<ver.log4j>1.2.16</ver.log4j>
<ver.junit>4.9</ver.junit>
+ <ver.httpclient>4.2.3</ver.httpclient>
+
<jdk.version>1.6</jdk.version>
<targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
@@ -116,15 +118,13 @@
<build>
<!-- Run the enforcer plugin automatically at compile time -->
-<!--
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
</plugins>
--->
-
+
<!-- Plugin version list: http://maven.apache.org/plugins/index.html -->
<pluginManagement>
<plugins>
@@ -141,7 +141,7 @@
<target>${jdk.version}</target>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -153,7 +153,7 @@
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -207,7 +207,7 @@
<encoding>UTF-8</encoding>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>