Switch to Lyo 6 (#142)

OSLC · Oct 5, 2024 · 2f5aae5 · 2f5aae5
1 parent eb15868
commit 2f5aae5
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 25 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -17,20 +17,22 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main' }}
 
 jobs:
-  build:
+  build-client-samples:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        java-version: ['17', '21']
-        distribution: ['zulu', 'oracle', 'corretto', 'liberica']
+#        java-version: ['17', '21']
+#        distribution: ['zulu', 'oracle', 'corretto', 'liberica']
         include:
           - java-version: '17'
             distribution: 'temurin'
-          - java-version: '17'
-            distribution: 'microsoft'
-        #   - java-version: '22-ea'
-        #     distribution: zulu
+          - java-version: '21'
+            distribution: 'liberica'
+          - java-version: '23'
+            distribution: 'oracle'
+          - java-version: '24-ea'
+            distribution: 'zulu'
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java-version }}
@@ -43,7 +45,7 @@ jobs:
         run: |
           mvn -B clean verify --file lyo-client-samples/pom.xml
 
-  build-legacy:
+  build-oauth-legacy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/lyo-client-samples/pom.xml b/lyo-client-samples/pom.xml
@@ -11,8 +11,8 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.release>17</maven.compiler.release>
-        <v.lyo>5.1.1.Final</v.lyo>
-        <v.jersey>2.35</v.jersey>
+        <v.lyo>6.0.0.Final</v.lyo>
+        <v.jersey>3.1.8</v.jersey> <!--same as refimpl-->
     </properties>
 
     <dependencies>

diff --git a/lyo-client-samples/src/main/java/org/eclipse/lyo/samples/client/CMSample.java b/lyo-client-samples/src/main/java/org/eclipse/lyo/samples/client/CMSample.java
@@ -34,8 +34,8 @@
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
 
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.core.Response;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/lyo-client-samples/src/main/java/org/eclipse/lyo/samples/client/ERMSample.java b/lyo-client-samples/src/main/java/org/eclipse/lyo/samples/client/ERMSample.java
@@ -26,8 +26,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.core.Response;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;

diff --git a/lyo-client-samples/src/main/java/org/eclipse/lyo/samples/client/ETMSample.java b/lyo-client-samples/src/main/java/org/eclipse/lyo/samples/client/ETMSample.java
@@ -46,8 +46,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.core.Response;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/lyo-client-samples/src/main/java/org/eclipse/lyo/samples/client/EWMSample.java b/lyo-client-samples/src/main/java/org/eclipse/lyo/samples/client/EWMSample.java
@@ -24,9 +24,9 @@
 import java.io.InputStreamReader;
 import java.net.URI;
 
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.core.Response;
 import javax.xml.namespace.QName;
 
 import org.apache.commons.cli.CommandLine;

diff --git a/lyo-client-samples/src/main/java/org/eclipse/lyo/samples/client/RMSample.java b/lyo-client-samples/src/main/java/org/eclipse/lyo/samples/client/RMSample.java
@@ -23,7 +23,7 @@
 import java.util.logging.Logger;
 
 import org.apache.http.HttpStatus;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.client.oslc.resources.Requirement;

diff --git a/...nt-samples/src/main/java/org/eclipse/lyo/samples/client/automation/AutomationAdapter.java b/...nt-samples/src/main/java/org/eclipse/lyo/samples/client/automation/AutomationAdapter.java
@@ -27,7 +27,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -612,7 +612,7 @@ private void completeRequest(AutomationRequest request)
 		request.getExtendedProperties().remove(PROPERTY_RQM_PROGRESS);
 
 		request.getExtendedProperties().put(PROPERTY_RQM_PROGRESS,
-				new Integer(100));
+				Integer.valueOf(100));
 
 		URI updateUri = appendOslcProperties(request.getAbout(),
 				"oslc_auto:state", "rqm_auto:progress");
@@ -1234,7 +1234,7 @@ public void sendProgressForRequest(int i, AutomationRequest request)
 		AutomationRequest requestCopy = new AutomationRequest(request.getAbout());
 
 		requestCopy.getExtendedProperties().put(PROPERTY_RQM_PROGRESS,
-				new Integer(i));
+				Integer.valueOf(i));
 
 		URI updateUri = appendOslcProperties(requestCopy.getAbout(),
 				"rqm_auto:progress");

diff --git a/...-samples/src/main/java/org/eclipse/lyo/samples/client/automation/ETMAutomationSample.java b/...-samples/src/main/java/org/eclipse/lyo/samples/client/automation/ETMAutomationSample.java
@@ -25,7 +25,7 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
-import javax.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.ClientBuilder;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -72,7 +72,6 @@ public static void main(String[] args) throws Exception {
 	 * Login to the Automation Service Provider and start polling for Automation
 	 * Requests
 	 *
-	 * @param args
 	 * @throws Exception
 	 */
 	private void begin() throws Exception {