Prepare for JDK11 build (#222)

eclipse-lyo · Dec 14, 2021 · 3c63bcd · 3c63bcd
1 parent 96d5d71
commit 3c63bcd
Show file tree

Hide file tree

Showing 17 changed files with 164 additions and 701 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -12,20 +12,40 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        jdk: ['8', '11']
+        # temurin is Eclipse/AdoptOpenJDK/Adoptium
+        # liberica is a build of Oracle GraalVM
+        distribution: ['temurin', 'zulu', 'liberica']
+        experimental: [false]
+        # jena 3.x has some locking problems under JDK 16/17
+#        include:
+#          - jdk: '16'
+#            experimental: true
+#            distribution: zulu
+#          - jdk: '17'
+#            experimental: true
+#            distribution: zulu
+##          - jdk: '18-ea'
+#            experimental: true
+    continue-on-error: ${{ matrix.experimental }}
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK ${{ matrix.jdk }}
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: ${{ matrix.distribution }}
+          java-version: ${{ matrix.jdk }}
       - uses: actions/cache@v1
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-maven-
+            ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-
       - name: Build with Maven
         run: |
           mvn -B package --file pom.xml
diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml
@@ -107,17 +107,14 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.23.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <!--CQ 13719-->
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
@@ -146,18 +143,4 @@
             </plugin>
         </plugins>
     </build>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>xml-apis</groupId>
-                <artifactId>xml-apis</artifactId>
-                <version>1.3.04</version>
-            </dependency>
-            <dependency>
-                <groupId>xerces</groupId>
-                <artifactId>xercesImpl</artifactId>
-                <version>2.12.0</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>
diff --git a/client/oslc-java-client/pom.xml b/client/oslc-java-client/pom.xml
@@ -64,7 +64,7 @@
       <groupId>org.apache.jena</groupId>
       <artifactId>apache-jena-libs</artifactId>
       <type>pom</type>
-      <version>3.14.0</version>
+      <version>3.16.0</version>
     </dependency>
     <dependency>
       <groupId>net.oauth.core</groupId>
@@ -143,10 +143,6 @@
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-    </dependency>
     <dependency> <!--See https://bugs.eclipse.org/bugs/show_bug.cgi?id=513048-->
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
@@ -168,13 +164,12 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.8.5</version>
+      <version>3.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -230,13 +225,6 @@
   </build>
   <dependencyManagement>
     <dependencies>
-<!--
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore</artifactId>
-        <version>4.5.13</version>
-      </dependency>
--->
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
@@ -250,7 +238,7 @@
       <dependency>
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
-        <version>1.3.04</version>
+        <version>1.4.01</version>
       </dependency>
       <dependency>
         <groupId>xerces</groupId>
@@ -262,6 +250,11 @@
         <artifactId>jaxb-impl</artifactId>
         <version>2.2</version>
       </dependency>
+      <dependency>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <version>2.2.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>
diff --git a/core/oslc4j-core/pom.xml b/core/oslc4j-core/pom.xml
@@ -11,10 +11,6 @@
   <name>Lyo :: Core :: OSLC</name>
   <description>Core components of the Eclipse Lyo OSLC4J SDK.</description>
 
-  <properties>
-    <powermock.version>1.6.5</powermock.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
@@ -76,15 +72,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-      <version>${powermock.version}</version>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -116,7 +105,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.4.3</version>
       </plugin>
     </plugins>
   </build>

diff --git a/...oslc4j-core/src/test/java/org/eclipse/lyo/oslc4j/core/model/ResourceShapeFactoryTest.java b/...oslc4j-core/src/test/java/org/eclipse/lyo/oslc4j/core/model/ResourceShapeFactoryTest.java
@@ -1,16 +1,13 @@
 package org.eclipse.lyo.oslc4j.core.model;
 
+import org.eclipse.lyo.oslc4j.core.exception.OslcCoreMissingSetMethodException;
+import org.junit.Test;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
-import org.eclipse.lyo.oslc4j.core.exception.OslcCoreMissingSetMethodException;
-import org.junit.Test;
 
-import static org.junit.Assert.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @version $version-stub$

diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml
@@ -46,7 +46,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.4.3</version>
       </plugin>
     </plugins>
   </build>