From 9cb480be6f2d91d4738c48d997420601f5487b21 Mon Sep 17 00:00:00 2001
From: ipa-nhg <nadia.hammoudeh.garcia@ipa.fraunhofer.de>
Date: Mon, 4 Dec 2023 12:30:28 +0100
Subject: [PATCH] Fix CI issues: use the correct version of tycho (3.0.0) and
 the jdk (19)

---
 .github/workflows/build.yml                   | 18 +++++++++++++++---
 plugins/de.fraunhofer.ipa.ros.feature/pom.xml |  2 +-
 plugins/de.fraunhofer.ipa.ros.parent/pom.xml  |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b52bcf4d5..b04959ac3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: ros-model CI
+name: RosTooling CI
 
 on: [push,pull_request]
 
@@ -10,8 +10,20 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
       with:
-        path: ros-model
+        path: RosTooling
+    - name: Install jdk 19
+      run: sudo apt install -y openjdk-19-jre
+    - name: Set up Java
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '19'
+    - name: Debug
+      run: |
+        uname -a
+        mvn --version
+        java --version
     - name: Build and test with Maven
       run: |
-        pushd ros-model
+        pushd RosTooling
         mvn clean verify -f plugins/de.fraunhofer.ipa.ros.parent/pom.xml
diff --git a/plugins/de.fraunhofer.ipa.ros.feature/pom.xml b/plugins/de.fraunhofer.ipa.ros.feature/pom.xml
index ab25b6d51..ec073eed7 100644
--- a/plugins/de.fraunhofer.ipa.ros.feature/pom.xml
+++ b/plugins/de.fraunhofer.ipa.ros.feature/pom.xml
@@ -17,7 +17,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <!-- Tycho settings -->
-        <tycho-version>2.7.4</tycho-version>
+        <tycho-version>3.0.0</tycho-version>
         <tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
         <mwe2Version>2.14.0</mwe2Version>
     </properties>
diff --git a/plugins/de.fraunhofer.ipa.ros.parent/pom.xml b/plugins/de.fraunhofer.ipa.ros.parent/pom.xml
index 28617f6e3..9a30d38a4 100644
--- a/plugins/de.fraunhofer.ipa.ros.parent/pom.xml
+++ b/plugins/de.fraunhofer.ipa.ros.parent/pom.xml
@@ -13,7 +13,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <!-- Tycho settings -->
-        <tycho-version>2.7.4</tycho-version>
+        <tycho-version>3.0.0</tycho-version>
         <tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
         <mwe2Version>2.14.0</mwe2Version>
     </properties>