You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by st...@apache.org on 2016/10/26 11:51:44 UTC
[42/50] [abbrv] incubator-commonsrdf git commit: Keep all dependency
versions in top pom.xml
Keep all dependency versions in top pom.xml
.. as <properties>
Also slf4j-simple set as logging backend for Jena
and JSONLD-Java during tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/49601fed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/49601fed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/49601fed
Branch: refs/heads/COMMONSRDF-46
Commit: 49601fed85787296d42b53fbdd074deded7f5e9b
Parents: 887c9e6
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Oct 26 11:40:27 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Oct 26 11:40:51 2016 +0100
----------------------------------------------------------------------
integration-tests/pom.xml | 15 ---------------
jena/pom.xml | 9 ++-------
jsonld-java/pom.xml | 7 +------
pom.xml | 37 +++++++++++++++++++++++++++++++------
rdf4j/pom.xml | 10 +---------
5 files changed, 35 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/49601fed/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 57835e5..8487ac9 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -56,20 +56,5 @@
<artifactId>commons-rdf-jsonld-java</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>commons-rdf-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
-
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/49601fed/jena/pom.xml
----------------------------------------------------------------------
diff --git a/jena/pom.xml b/jena/pom.xml
index f8a2dc4..ab9ff8b 100644
--- a/jena/pom.xml
+++ b/jena/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
- <version>${ver.jena}</version>
+ <version>${jena.version}</version>
<type>pom</type>
<scope>optional</scope>
</dependency>
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-osgi</artifactId>
- <version>${ver.jena}</version>
+ <version>${jena.version}</version>
</dependency>
<!-- Additional bundles needed by jena-osgi -->
@@ -85,11 +85,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/49601fed/jsonld-java/pom.xml
----------------------------------------------------------------------
diff --git a/jsonld-java/pom.xml b/jsonld-java/pom.xml
index 6a4826c..ad8645c 100644
--- a/jsonld-java/pom.xml
+++ b/jsonld-java/pom.xml
@@ -54,14 +54,9 @@
<dependency>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java</artifactId>
- <version>0.8.2</version>
+ <version>${jsonldjava.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/49601fed/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 22c01c3..9ef400a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,11 +52,26 @@
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commonsrdf/content/</commons.scmPubUrl>
<commons.scmPubCheckoutDirectory>${project.build.directory}/site-content</commons.scmPubCheckoutDirectory>
<commons.javadoc.java.link>https://docs.oracle.com/javase/8/docs/api/</commons.javadoc.java.link>
- <!-- upgrade from 0.8.0 -->
- <commons.japicmp.version>0.9.1</commons.japicmp.version>
- <ver.jena>3.1.0</ver.jena>
+
+ <!-- upgrade from 0.8.0 for Java 8 support -->
+ <commons.japicmp.version>0.9.1</commons.japicmp.version>
+
+
+ <!-- NOTE: jsonldjava is also used by rdf4j and jena, check -->
+ <jsonldjava.version>0.8.2</jsonldjava.version>
+ <rdf4j.version>2.0</rdf4j.version>
+ <jena.version>3.1.0</jena.version>
+ <!-- NOTE: dexx and xerces versions should match
+ the versions marked as <optional> in jena-osgi pom
+ -->
<dexx.collection.version>0.6</dexx.collection.version>
<servicemix.xerces.version>2.11.0_1</servicemix.xerces.version>
+
+
+ <!-- Test dependencies -->
+ <slf4j.version>1.7.20</slf4j.version>
+ <junit.version>4.12</junit.version>
+
</properties>
<scm>
@@ -224,16 +239,26 @@
<module>integration-tests</module>
</modules>
- <dependencyManagement>
+ <!--
+ Common dependencies across modules.
+ Keep this list small and only <scope>test</scope> !
+ -->
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <!-- System.err logging for Jena, JSONLD-Java, RDF4J
+ -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- </dependencyManagement>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/49601fed/rdf4j/pom.xml
----------------------------------------------------------------------
diff --git a/rdf4j/pom.xml b/rdf4j/pom.xml
index 0c6cb28..f833b67 100644
--- a/rdf4j/pom.xml
+++ b/rdf4j/pom.xml
@@ -30,9 +30,6 @@
<artifactId>commons-rdf-rdf4j</artifactId>
<packaging>jar</packaging>
- <properties>
- <rdf4j.version>2.0</rdf4j.version>
- </properties>
<name>Commons RDF: Integration: RDF4j</name>
<description>Eclipse RDF4j implementation of Commons RDF API</description>
@@ -81,7 +78,7 @@
<artifactId>rdf4j-repository-api</artifactId>
</dependency>
- <!-- For RDF4JParserBuilder, these are the RIO dependencies for the standard
+ <!-- For RDF4JParser, these are the RIO dependencies for the standard
RDF 1.1 languages -->
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
@@ -145,11 +142,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>