You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by wi...@apache.org on 2017/10/31 03:02:08 UTC
[1/2] commons-rdf git commit: COMMONSRDF-62: applied the fix to the
release profile, too
Repository: commons-rdf
Updated Branches:
refs/heads/master 5d69092f0 -> 5a998408f
COMMONSRDF-62: applied the fix to the release profile, too
Project: http://git-wip-us.apache.org/repos/asf/commons-rdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rdf/commit/df7d0a31
Tree: http://git-wip-us.apache.org/repos/asf/commons-rdf/tree/df7d0a31
Diff: http://git-wip-us.apache.org/repos/asf/commons-rdf/diff/df7d0a31
Branch: refs/heads/master
Commit: df7d0a31c5d94c527ac67239aa3853a846e320ed
Parents: 5d69092
Author: Sergio Fernández <se...@wikier.org>
Authored: Sun Oct 29 19:25:34 2017 -0700
Committer: Sergio Fernández <se...@wikier.org>
Committed: Mon Oct 30 19:32:36 2017 -0700
----------------------------------------------------------------------
pom.xml | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/df7d0a31/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 89cc66d..3f10521 100644
--- a/pom.xml
+++ b/pom.xml
@@ -590,14 +590,16 @@
</profile>
<profile>
<id>release</id>
- <!-- extends the release profile from commons -->
+ <properties>
+ <!-- COMMONSRDF-62 : JAPICMP does not handle 0.x release boundaries as defined in Semantic Versioning -->
+ <commons.japicmp.breakBuildOnBinaryIncompatibleModifications>false</commons.japicmp.breakBuildOnBinaryIncompatibleModifications>
+ </properties>
+ <!-- extends the release profile from commons -->
<build>
- <!--
- <finalName>apache-commons-rdf-${project.version}</finalName>
--->
+ <!-- <finalName>apache-commons-rdf-${project.version}</finalName> -->
<plugins>
<plugin>
- <!-- Avoid making *.asc.asc -->
+ <!-- Avoid making *.asc.asc -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
[2/2] commons-rdf git commit: few minor upgrades
Posted by wi...@apache.org.
few minor upgrades
Project: http://git-wip-us.apache.org/repos/asf/commons-rdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rdf/commit/5a998408
Tree: http://git-wip-us.apache.org/repos/asf/commons-rdf/tree/5a998408
Diff: http://git-wip-us.apache.org/repos/asf/commons-rdf/diff/5a998408
Branch: refs/heads/master
Commit: 5a998408fb6854ca6e955403e7b320736da294d0
Parents: df7d0a3
Author: Sergio Fernández <se...@wikier.org>
Authored: Mon Oct 30 20:02:01 2017 -0700
Committer: Sergio Fernández <se...@wikier.org>
Committed: Mon Oct 30 20:02:01 2017 -0700
----------------------------------------------------------------------
commons-rdf-rdf4j/pom.xml | 4 ----
pom.xml | 34 ++++++++++++++++++++++------------
2 files changed, 22 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/5a998408/commons-rdf-rdf4j/pom.xml
----------------------------------------------------------------------
diff --git a/commons-rdf-rdf4j/pom.xml b/commons-rdf-rdf4j/pom.xml
index 4448e74..2f9ddc3 100644
--- a/commons-rdf-rdf4j/pom.xml
+++ b/commons-rdf-rdf4j/pom.xml
@@ -126,7 +126,6 @@
rdf4j-rio-trix: unofficial standard
-->
-
<!-- There are multiple RDF4J sail/repository implementations, we use the
below from RDF4JFactory. -->
<dependency>
@@ -144,7 +143,6 @@
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>commons-rdf-api</artifactId>
@@ -154,8 +152,6 @@
</dependency>
</dependencies>
-
-
<!-- Ensure consistent rdf4j versions across the board -->
<dependencyManagement>
<dependencies>
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/5a998408/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3f10521..5062bb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
<commons.jira.pid>12316620</commons.jira.pid>
<commons.site.path>rdf</commons.site.path>
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-rdf/</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>
@@ -58,20 +58,19 @@
<commons.japicmp.version>0.11.0</commons.japicmp.version>
- <!-- NOTE: jsonldjava is also used by rdf4j and jena, check the version
- is cross-compatible -->
- <jsonldjava.version>0.9.0</jsonldjava.version>
+ <!-- NOTE: jsonldjava is also used by rdf4j and jena, check the version
+ is cross-compatible -->
+ <jsonldjava.version>0.11.1</jsonldjava.version>
<rdf4j.version>2.2.2</rdf4j.version>
<jena.version>3.4.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>
+ <dexx.collection.version>0.7</dexx.collection.version>
<servicemix.xerces.version>2.11.0_1</servicemix.xerces.version>
-
<!-- Test dependencies -->
- <slf4j.version>1.7.20</slf4j.version>
+ <slf4j.version>1.7.25</slf4j.version>
<junit.version>4.12</junit.version>
<skipAPICompatCheck>false</skipAPICompatCheck>
</properties>
@@ -245,6 +244,21 @@
<module>commons-rdf-integration-tests</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<!--
Common dependencies across modules.
Keep this list small and only <scope>test</scope> !
@@ -253,15 +267,12 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <!-- System.err logging for Jena, JSONLD-Java, RDF4J
- -->
+ <!-- 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>
@@ -624,5 +635,4 @@
<downloadUrl>${project.url}download.html</downloadUrl>
</distributionManagement>
-
</project>