Change version to Java 17

CROSSINGTUD · Nov 27, 2024 · bf1e765 · bf1e765
1 parent 533eaf8
commit bf1e765
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,7 +6,3 @@ updates:
     interval: weekly
     time: "04:00"
   open-pull-requests-limit: 10
-  # tycho 3 and tycho 4 requires Java version 17 to be built
-  ignore:
-    - dependency-name: "org.eclipse.tycho:tycho-maven-plugin"
-      versions: ["3.x.x", "4.x.x"]
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           distribution: 'adopt'
           java-package: 'jdk'
-          java-version: '11'
+          java-version: '17'
           server-id: 'ossrh' # must match the serverId configured for the nexus-staging-maven-plugin
           server-username: OSSRH_USERNAME # Env var that holds your OSSRH user name
           server-password: OSSRH_PASSWORD # Env var that holds your OSSRH user pw

diff --git a/.github/workflows/main_build.yml b/.github/workflows/main_build.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           distribution: 'adopt'
           java-package: jdk
-          java-version: '11'
+          java-version: '17'
       # Restores Maven dependecies
       - name: Restore local Maven repository
         uses: actions/cache@v3

diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           distribution: 'adopt'
           java-package: jdk
-          java-version: '11'
+          java-version: '17'
       # Semantic versioning
       - name: Semantic versioning
         id: versioning

diff --git a/CrySLParser/pom.xml b/CrySLParser/pom.xml
@@ -37,6 +37,11 @@
     </scm>
 
     <dependencies>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>9.7.1</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>de.darmstadt.tu.crossing.CrySL</artifactId>
@@ -67,6 +72,16 @@
             <artifactId>org.eclipse.emf.ecore</artifactId>
             <version>${emfVersion}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>33.3.1-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>7.0.0</version>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
         <xtextVersion>2.35.0</xtextVersion>
         <emfVersion>2.19.0</emfVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
     </properties>
 
     <build>