diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b262bce..59bff77 100644 --- 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 index a470d02..f1f52f6 100644 --- 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 index 0524ad4..548d4a5 100644 --- 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 index 631fc1c..267a316 100644 --- 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 index 814779a..36f0aae 100644 --- a/CrySLParser/pom.xml +++ b/CrySLParser/pom.xml @@ -37,6 +37,11 @@ + + org.ow2.asm + asm + 9.7.1 + ${project.groupId} de.darmstadt.tu.crossing.CrySL @@ -67,6 +72,16 @@ org.eclipse.emf.ecore ${emfVersion} + + com.google.guava + guava + 33.3.1-jre + + + com.google.inject + guice + 7.0.0 + javax.servlet javax.servlet-api diff --git a/pom.xml b/pom.xml index 11b438e..84f8655 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 2.35.0 2.19.0 UTF-8 - 11 + 17