Upgrade to Jena 4.1.0 and fix the build

Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
eclipse · Dec 23, 2021 · d9476f2 · d9476f2
1 parent 16642fc
commit d9476f2
Show file tree

Hide file tree

Showing 52 changed files with 153 additions and 210 deletions.
diff --git a/client/oslc-client-base/pom.xml b/client/oslc-client-base/pom.xml
@@ -17,7 +17,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
 
   <build>

diff --git a/client/oslc-java-client-resources/pom.xml b/client/oslc-java-client-resources/pom.xml
@@ -17,7 +17,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
 
   <dependencies>

diff --git a/domains/oslc-domains/pom.xml b/domains/oslc-domains/pom.xml
@@ -23,7 +23,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.target>11</maven.compiler.target>
         <!-- Start of user code properties
             -->
             <!-- TODO: Add additional properties here to avoid them be overrriden upon future re-generation -->
@@ -58,7 +58,7 @@
             <groupId>org.eclipse.lyo.oslc4j.core</groupId>
             <artifactId>oslc4j-core</artifactId>
         </dependency>
-        
+
     </dependencies>
     <!-- Start of user code post_dependencies
     -->
@@ -73,7 +73,7 @@
           <artifactId>maven-javadoc-plugin</artifactId>
         </plugin>
       </plugins>
-    </build>    
+    </build>
     <!-- End of user code
     -->
 </project>
diff --git a/pom.xml b/pom.xml
@@ -17,13 +17,13 @@
     <v.kotlin>1.5.32</v.kotlin>
     <v.dokka>1.5.31</v.dokka>
 
-    <v.jena>4.0.0</v.jena>
+    <v.jena>4.1.0</v.jena>
     <v.jersey>2.25.1</v.jersey>
     <v.slf4j>1.7.32</v.slf4j>
     <v.servlet>3.1.0</v.servlet>
     <v.httpclient>4.5.13</v.httpclient>
     <v.guava>30.0-jre</v.guava>
-    <v.jackson-core>2.12.1</v.jackson-core>
+    <v.jackson-core>2.12.3</v.jackson-core>
   </properties>
 
 
@@ -230,12 +230,6 @@
         <artifactId>jcl-over-slf4j</artifactId>
         <version>${v.slf4j}</version>
       </dependency>
-      <dependency>
-        <!--CQ 6733-->
-        <groupId>org.apache.wink</groupId>
-        <artifactId>wink-json4j</artifactId>
-        <version>1.2.1-incubating</version>
-      </dependency>
       <dependency>
         <!--CQ 6582-->
         <groupId>stax</groupId>
@@ -264,12 +258,11 @@
         <type>pom</type>
       </dependency>
       <dependency>
-        <!--CQ 6780-->
-        <groupId>xml-apis</groupId>
-        <artifactId>xml-apis</artifactId>
-        <version>1.4.01</version>
-        <scope>provided</scope>
+        <groupId>org.glassfish.jersey.core</groupId>
+        <artifactId>jersey-client</artifactId>
+        <version>${v.jersey}</version>
       </dependency>
+
       <dependency>
         <groupId>jakarta.ws.rs</groupId>
         <artifactId>jakarta.ws.rs-api</artifactId>
@@ -320,13 +313,9 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.11</version>
+        <version>3.12.0</version>
       </dependency>
-<!--      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-compress</artifactId>
-        <version>1.21</version>
-      </dependency>-->
+
 
       <!--Test-->
       <dependency>
@@ -336,7 +325,6 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <!--CQ 13718-->
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>4.13.2</version>
@@ -350,13 +338,7 @@
         <artifactId>commons-codec</artifactId>
         <version>1.15</version>
       </dependency>
-<!--
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.7</version>
-      </dependency>
--->
+
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
@@ -369,12 +351,6 @@
       </dependency>
 
       <!--Convergence-->
-<!--      <dependency>
-        &lt;!&ndash;es.weso:shaclex_2.12:pom:0.0.87&ndash;&gt;
-        <groupId>org.apache.jena</groupId>
-        <artifactId>jena-arq</artifactId>
-        <version>${v.jena}</version>
-      </dependency>-->
       <dependency>
         <!--net.oauth.core:oauth-httpclient4:jar:20090913-->
         <groupId>net.oauth.core</groupId>
@@ -393,13 +369,46 @@
           <artifactId>tomcat-embed-core</artifactId>
           <version>8.5.73</version>
       </dependency>
-<!--      <dependency>
-        &lt;!&ndash;hk2 and powermock&ndash;&gt;
-        <groupId>org.javassist</groupId>
-        <artifactId>javassist</artifactId>
-        <version>3.27.0-GA</version>
-      </dependency>-->
 
+
+      <!--To remove-->
+      <!--      <dependency>
+              &lt;!&ndash;hk2 and powermock&ndash;&gt;
+              <groupId>org.javassist</groupId>
+              <artifactId>javassist</artifactId>
+              <version>3.27.0-GA</version>
+            </dependency>-->
+      <!--      <dependency>
+        &lt;!&ndash;es.weso:shaclex_2.12:pom:0.0.87&ndash;&gt;
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-arq</artifactId>
+        <version>${v.jena}</version>
+      </dependency>-->
+      <!--
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.7</version>
+      </dependency>
+-->
+      <!--      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-compress</artifactId>
+        <version>1.21</version>
+      </dependency>-->
+      <dependency>
+        <!--CQ 6780-->
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>1.4.01</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <!--CQ 6733-->
+        <groupId>org.apache.wink</groupId>
+        <artifactId>wink-json4j</artifactId>
+        <version>1.2.1-incubating</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -512,6 +521,14 @@
     </pluginManagement>
 
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>versions-maven-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+          <generateBackupPoms>false</generateBackupPoms>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
@@ -545,10 +562,10 @@
                 </bannedDependencies>
                 <banDuplicatePomDependencyVersions/>
                 <requireMavenVersion>
-                  <version>3.0</version>
+                  <version>3.1.1</version>
                 </requireMavenVersion>
                 <requireJavaVersion>
-                  <version>1.8</version>
+                  <version>11</version>
                 </requireJavaVersion>
                 <requireUpperBoundDeps>
                   <excludes>

diff --git a/server/oauth-consumer-store/pom.xml b/server/oauth-consumer-store/pom.xml
@@ -16,7 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.target>11</maven.compiler.target>
         <lyo.version>${project.parent.version}</lyo.version>
     </properties>
 

diff --git a/server/oauth-core/pom.xml b/server/oauth-core/pom.xml
@@ -17,7 +17,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.target>11</maven.compiler.target>
         <lyo.version>${project.parent.version}</lyo.version>
     </properties>
 

diff --git a/server/oauth-webapp/pom.xml b/server/oauth-webapp/pom.xml
@@ -17,7 +17,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.target>11</maven.compiler.target>
         <lyo.version>${project.parent.version}</lyo.version>
     </properties>
 

diff --git a/server/oslc-ui-model/pom.xml b/server/oslc-ui-model/pom.xml
@@ -17,7 +17,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/store/pom.xml b/store/pom.xml
@@ -21,7 +21,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
 
   <modules>

diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml
@@ -21,7 +21,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
 
   <dependencies>

diff --git a/trs/client/client-source-mqtt/pom.xml b/trs/client/client-source-mqtt/pom.xml
@@ -16,7 +16,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
 
 
@@ -55,6 +55,11 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>${v.kotlin}</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.paho</groupId>
       <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
@@ -65,6 +70,7 @@
       <!-- TODO move TrsProviderHandler out into client-core -->
       <groupId>org.eclipse.lyo.trs</groupId>
       <artifactId>trs-client</artifactId>
+      <version>${v.lyo}</version>
     </dependency>
 
     <dependency>
@@ -75,6 +81,7 @@
     <dependency>
       <groupId>org.eclipse.lyo</groupId>
       <artifactId>oslc-trs</artifactId>
+      <version>${v.lyo}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.lyo.oslc4j.core</groupId>