You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/02/01 14:12:41 UTC
[32/35] jena git commit: Pull in ver.jackson.
Pull in ver.jackson.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f57057d6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f57057d6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f57057d6
Branch: refs/heads/master
Commit: f57057d633c6712da5c76cd4f2bcb2042bcb64d2
Parents: 27bc237
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Feb 1 13:07:46 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Feb 1 13:07:46 2015 +0000
----------------------------------------------------------------------
jena-parent/pom.xml | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f57057d6/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index 0b8ba30..cd2094b 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -51,11 +51,14 @@
<ver.log4j>1.2.17</ver.log4j>
<ver.junit>4.11</ver.junit>
<ver.xerces>2.11.0</ver.xerces>
+
<ver.jsonldjava>0.5.1</ver.jsonldjava>
+ <!-- Used by jena-osgi and must be in-step with jsonldjava -->
+ <ver.jackson>2.3.3</ver.jackson>
<!-- These are connected because solr4j depends on httpclient as well -->
<ver.httpclient>4.2.6</ver.httpclient>
- <ver.httpcore>4.2.5</ver.httpcore> <!--always -1 from httpclient, it seems-->
+ <ver.httpcore>4.2.5</ver.httpcore>
<ver.lucene>4.6.1</ver.lucene>
<ver.solr>4.6.1</ver.solr>
<ver.spatial4j>0.4</ver.spatial4j>
@@ -341,8 +344,7 @@
<version>1.7.0</version>
</requireJavaVersion>
<requirePluginVersions>
- <message>Best practice is to always define plugin
- versions!</message>
+ <message>Best practice is to always define plugin versions!</message>
<banLatest>true</banLatest>
<banRelease>true</banRelease>
</requirePluginVersions>
@@ -474,8 +476,9 @@
</configuration>
</plugin>
- <!-- Avoid the warning from m2e: "maven-remote-resources-plugin (goal
- "process") is ignored by m2e." -->
+ <!-- Avoid the warning from m2e:
+ "maven-remote-resources-plugin (goal "process") is ignored by m2e."
+ -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
@@ -484,8 +487,10 @@
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
- <!-- Warning: "maven-remote-resources-plugin (goal "process") is
- ignored by m2e." -->
+ <!--
+ Warning:
+ "maven-remote-resources-plugin (goal "process") is ignored by m2e."
+ -->
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -499,8 +504,7 @@
</action>
</pluginExecution>
<pluginExecution>
- <!-- Warning: "maven-enforcer-plugin (goal "enforce") is ignored
- by m2e." -->
+ <!-- Warning: "maven-enforcer-plugin (goal "enforce") is ignored by m2e." -->
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -572,7 +576,6 @@
<link>http://jena.apache.org/documentation/javadoc/fuseki/</link>
<link>http://jena.apache.org/documentation/javadoc/security/</link>
<link>http://jena.apache.org/documentation/javadoc/jdbc/</link>
- <link>http://jena.apache.org/documentation/javadoc/sdb/</link>
</links>
</configuration>
</plugin>
@@ -636,8 +639,7 @@
<configuration>
<rules>
<requirePluginVersions>
- <message>Best practice is to always define plugin
- versions!</message>
+ <message>Best practice is to always define plugin versions!</message>
<banLatest>true</banLatest>
<banRelease>true</banRelease>
</requirePluginVersions>