Upgrade to Jena 3.17

Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
eclipse · Dec 8, 2020 · b1ddcd8 · b1ddcd8
1 parent a60f96c
commit b1ddcd8
Show file tree

Hide file tree

Showing 28 changed files with 50 additions and 61 deletions.
diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.eclipse.lyo.clients</groupId>
     <artifactId>clients-parent</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>oslc-client-base</artifactId>
-  <version>4.0.0.RC</version>
+  <version>4.1.0-SNAPSHOT</version>
   <name>Lyo :: Client :: Base</name>
 
   <properties>

diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml
@@ -5,12 +5,12 @@
     <parent>
       <groupId>org.eclipse.lyo.clients</groupId>
       <artifactId>clients-parent</artifactId>
-      <version>4.0.0.RC</version>
+      <version>4.1.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>oslc-client</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
     <name>Lyo :: Client :: OSLC JAX-RS 2.0 (new)</name>
     <description>Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0</description>
 

diff --git a/client/oslc-java-client-resources/pom.xml b/client/oslc-java-client-resources/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.eclipse.lyo.clients</groupId>
     <artifactId>clients-parent</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>oslc-java-client-resources</artifactId>
-  <version>4.0.0.RC</version>
+  <version>4.1.0-SNAPSHOT</version>
   <name>Lyo :: Client :: Resources (legacy)</name>
 
   <properties>

diff --git a/client/oslc-java-client/pom.xml b/client/oslc-java-client/pom.xml
@@ -4,10 +4,10 @@
   <parent>
     <groupId>org.eclipse.lyo.clients</groupId>
     <artifactId>clients-parent</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>oslc-java-client</artifactId>
-  <version>4.0.0.RC</version>
+  <version>4.1.0-SNAPSHOT</version>
   <name>Lyo :: Client :: OSLC Wink (legacy)</name>
 
   <description>Eclipse Lyo OSLC Java client based on OSLC4J and Apache Wink.</description>

diff --git a/client/pom.xml b/client/pom.xml
@@ -6,13 +6,13 @@
 
   <groupId>org.eclipse.lyo.clients</groupId>
   <artifactId>clients-parent</artifactId>
-  <version>4.0.0.RC</version>
+  <version>4.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Lyo :: Client :: _Parent</name>
   <parent>
     <groupId>org.eclipse.lyo</groupId>
     <artifactId>lyo-parent</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/core/oslc-query/pom.xml b/core/oslc-query/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.lyo.oslc4j.core</groupId>
     <artifactId>oslc4j-core-build</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
     <relativePath>../oslc4j-core-build/pom.xml</relativePath>
   </parent>
 

diff --git a/core/oslc-trs/pom.xml b/core/oslc-trs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.lyo.oslc4j.core</groupId>
     <artifactId>oslc4j-core-build</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
     <relativePath>../oslc4j-core-build/pom.xml</relativePath>
   </parent>
 

diff --git a/core/oslc4j-core-build/pom.xml b/core/oslc4j-core-build/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.eclipse.lyo</groupId>
     <artifactId>lyo-parent</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
 
   <properties>

diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.lyo.oslc4j.core</groupId>
     <artifactId>oslc4j-core-build</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
     <relativePath>../oslc4j-core-build/pom.xml</relativePath>
   </parent>
   <artifactId>oslc4j-core</artifactId>

diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.eclipse.lyo.oslc4j.core</groupId>
         <artifactId>oslc4j-core-build</artifactId>
-        <version>4.0.0.RC</version>
+        <version>4.1.0-SNAPSHOT</version>
         <relativePath>../oslc4j-core-build/pom.xml</relativePath>
     </parent>
     <artifactId>oslc4j-jena-provider</artifactId>

diff --git a/core/oslc4j-json4j-provider/pom.xml b/core/oslc4j-json4j-provider/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.eclipse.lyo.oslc4j.core</groupId>
         <artifactId>oslc4j-core-build</artifactId>
-        <version>4.0.0.RC</version>
+        <version>4.1.0-SNAPSHOT</version>
         <relativePath>../oslc4j-core-build/pom.xml</relativePath>
     </parent>
     <artifactId>oslc4j-json4j-provider</artifactId>

diff --git a/core/oslc4j-utils/pom.xml b/core/oslc4j-utils/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.eclipse.lyo.oslc4j.core</groupId>
         <artifactId>oslc4j-core-build</artifactId>
-        <version>4.0.0.RC</version>
+        <version>4.1.0-SNAPSHOT</version>
         <relativePath>../oslc4j-core-build/pom.xml</relativePath>
     </parent>
     <name>Lyo :: Core :: Utilities</name>

diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.lyo.oslc4j.core</groupId>
     <artifactId>oslc4j-core-build</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
     <relativePath>../oslc4j-core-build/pom.xml</relativePath>
   </parent>
 

diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml
@@ -9,14 +9,14 @@
     <parent>
         <groupId>org.eclipse.lyo</groupId>
         <artifactId>lyo-parent</artifactId>
-        <version>4.0.0.RC</version>
+        <version>4.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <!-- End of user code
     -->
     <groupId>org.eclipse.lyo</groupId>
     <artifactId>oslc-domains</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Lyo :: Domains</name>
     <properties>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.lyo</groupId>
   <artifactId>lyo-parent</artifactId>
-  <version>4.0.0.RC</version>
+  <version>4.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Lyo :: _Parent</name>
 
@@ -15,9 +15,9 @@
     <maven.compiler.target>1.8</maven.compiler.target>
 
     <v.lyo>${project.version}</v.lyo>
-    <v.jena>3.14.0</v.jena>
+    <v.jena>3.17.0</v.jena>
     <v.jersey>2.25.1</v.jersey>
-    <v.slf4j>1.7.26</v.slf4j>
+    <v.slf4j>1.7.30</v.slf4j>
     <v.servlet>3.1.0</v.servlet>
     <v.httpclient>4.5.13</v.httpclient>
   </properties>
@@ -316,7 +316,7 @@
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.13</version>
+        <version>1.15</version>
       </dependency>
       <dependency>
         <groupId>org.objenesis</groupId>
@@ -328,6 +328,12 @@
         <artifactId>javax.annotation-api</artifactId>
         <version>1.3.2</version>
       </dependency>
+      <dependency>
+        <!--es.weso:shaclex_2.12:pom:0.0.87-->
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.8.0</version>
+      </dependency>
 
       <!--Convergence-->
       <dependency>
@@ -336,12 +342,6 @@
         <artifactId>jena-arq</artifactId>
         <version>${v.jena}</version>
       </dependency>
-      <dependency>
-        <!--es.weso:shaclex_2.12:pom:0.0.87-->
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.6</version>
-      </dependency>
       <dependency>
         <!--net.oauth.core:oauth-httpclient4:jar:20090913-->
         <groupId>net.oauth.core</groupId>

diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.eclipse.lyo.oslc4j.server</groupId>
         <artifactId>lyo-server-build</artifactId>
-        <version>4.0.0.RC</version>
+        <version>4.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.eclipse.lyo.server</groupId>

diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.eclipse.lyo.oslc4j.server</groupId>
         <artifactId>lyo-server-build</artifactId>
-        <version>4.0.0.RC</version>
+        <version>4.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.eclipse.lyo.server</groupId>

diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.eclipse.lyo.oslc4j.server</groupId>
         <artifactId>lyo-server-build</artifactId>
-        <version>4.0.0.RC</version>
+        <version>4.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.eclipse.lyo.server</groupId>

diff --git a/server/oslc4j-registry/pom.xml b/server/oslc4j-registry/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.lyo.oslc4j.server</groupId>
     <artifactId>lyo-server-build</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.lyo.oslc4j.core</groupId>

diff --git a/server/oslc4j-wink/pom.xml b/server/oslc4j-wink/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.lyo.oslc4j.server</groupId>
     <artifactId>lyo-server-build</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.lyo.oslc4j.core</groupId>

diff --git a/server/pom.xml b/server/pom.xml
@@ -4,14 +4,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.lyo.oslc4j.server</groupId>
   <artifactId>lyo-server-build</artifactId>
-  <version>4.0.0.RC</version>
+  <version>4.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Lyo :: OAuth :: _Parent</name>
 
   <parent>
     <groupId>org.eclipse.lyo</groupId>
     <artifactId>lyo-parent</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -23,10 +23,6 @@
     <module>oslc4j-wink</module>
   </modules>
 
-  <properties>
-    <version.jena>3.14.0</version.jena>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -63,14 +59,9 @@
       <dependency>
         <groupId>org.apache.jena</groupId>
         <artifactId>apache-jena-libs</artifactId>
-        <version>${version.jena}</version>
+        <version>${v.jena}</version>
         <type>pom</type>
       </dependency>
-      <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>1.13</version>
-      </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>

diff --git a/store/pom.xml b/store/pom.xml
@@ -6,14 +6,14 @@
 
   <groupId>org.eclipse.lyo.store</groupId>
   <artifactId>store-parent</artifactId>
-  <version>4.0.0.RC</version>
+  <version>4.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Lyo :: Store :: _Parent</name>
 
   <parent>
     <groupId>org.eclipse.lyo</groupId>
     <artifactId>lyo-parent</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -22,8 +22,6 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-
-    <version.jena>3.14.0</version.jena>
   </properties>
 
   <modules>
@@ -37,13 +35,13 @@
       <dependency>
         <groupId>org.apache.jena</groupId>
         <artifactId>apache-jena-libs</artifactId>
-        <version>${version.jena}</version>
+        <version>${v.jena}</version>
         <type>pom</type>
       </dependency>
        <dependency>
         <groupId>org.apache.jena</groupId>
         <artifactId>jena-querybuilder</artifactId>
-        <version>${version.jena}</version>
+        <version>${v.jena}</version>
       </dependency>
       <!-- Generic -->
       <dependency>

diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.lyo.store</groupId>
     <artifactId>store-parent</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.lyo.trs</groupId>
     <artifactId>trs-parent</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>client-source-mqtt</artifactId>

diff --git a/trs/client/pom.xml b/trs/client/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.eclipse.lyo</groupId>
     <artifactId>lyo-parent</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/trs/client/trs-client/pom.xml b/trs/client/trs-client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.lyo.trs</groupId>
     <artifactId>trs-parent</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>trs-client</artifactId>

diff --git a/trs/server/pom.xml b/trs/server/pom.xml
@@ -20,13 +20,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.lyo.trs</groupId>
   <artifactId>trs-server</artifactId>
-  <version>4.0.0.RC</version>
+  <version>4.1.0-SNAPSHOT</version>
   <name>Lyo :: TRS :: Server</name>
 
   <parent>
     <groupId>org.eclipse.lyo</groupId>
     <artifactId>lyo-parent</artifactId>
-    <version>4.0.0.RC</version>
+    <version>4.1.0-SNAPSHOT</version>
   </parent>
 
   <properties>