diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc9f40b0a9..f3f9021d2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,10 +30,10 @@ jobs: path: models # Provide Java - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' # Configure maven artifact caching @@ -238,10 +238,10 @@ jobs: steps: # Setup - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'adopt' - name: Cache local Maven repository @@ -266,10 +266,10 @@ jobs: steps: # Setup - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'adopt' - name: Cache local Maven repository diff --git a/build/de.cau.cs.kieler.semantics.repository/category.xml b/build/de.cau.cs.kieler.semantics.repository/category.xml index e9bc350894..1e59a34d13 100644 --- a/build/de.cau.cs.kieler.semantics.repository/category.xml +++ b/build/de.cau.cs.kieler.semantics.repository/category.xml @@ -36,8 +36,8 @@ - - - + + + diff --git a/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target b/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target index fe4c356df8..382c3032c8 100644 --- a/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target +++ b/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target @@ -10,7 +10,9 @@ - + + + @@ -21,12 +23,7 @@ - - - - - - + @@ -36,17 +33,17 @@ - + - + - + diff --git a/build/pom.xml b/build/pom.xml index a7c5ec230f..d08e5fde32 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -10,23 +10,23 @@ - 0.9.1 - 3.0.2.v20240507 - 0.23.0 - 0.51.0.v20240410 + 0.10.0 + 3.1.0.v20250428 + 0.23.1 + 0.52.0.v20250429 - 2.36.0 - 2.36.0 + 2.37.0 + 2.37.0 - 2.7.5 + 4.0.12 true - 11 - 11 - 11 + 21 + 21 + 21  (Sources) diff --git a/features/de.cau.cs.kieler.esterel.feature/pom.xml b/features/de.cau.cs.kieler.esterel.feature/pom.xml index d664bb032a..71f0534860 100644 --- a/features/de.cau.cs.kieler.esterel.feature/pom.xml +++ b/features/de.cau.cs.kieler.esterel.feature/pom.xml @@ -15,15 +15,15 @@ - org.eclipse.tycho.extras - tycho-source-feature-plugin + org.eclipse.tycho + tycho-source-plugin ${tycho-version} - source-feature + feature-source package - source-feature + feature-source diff --git a/features/de.cau.cs.kieler.framework.feature/pom.xml b/features/de.cau.cs.kieler.framework.feature/pom.xml index f0f8d6a0ad..c3320a7b29 100644 --- a/features/de.cau.cs.kieler.framework.feature/pom.xml +++ b/features/de.cau.cs.kieler.framework.feature/pom.xml @@ -15,15 +15,15 @@ - org.eclipse.tycho.extras - tycho-source-feature-plugin + org.eclipse.tycho + tycho-source-plugin ${tycho-version} - source-feature + feature-source package - source-feature + feature-source ${sourceFeatureLabelSuffix} diff --git a/features/de.cau.cs.kieler.sccharts.feature/pom.xml b/features/de.cau.cs.kieler.sccharts.feature/pom.xml index 67bdd672e4..0e69954ca6 100644 --- a/features/de.cau.cs.kieler.sccharts.feature/pom.xml +++ b/features/de.cau.cs.kieler.sccharts.feature/pom.xml @@ -15,15 +15,15 @@ - org.eclipse.tycho.extras - tycho-source-feature-plugin + org.eclipse.tycho + tycho-source-plugin ${tycho-version} - source-feature + feature-source package - source-feature + feature-source ${sourceFeatureLabelSuffix} diff --git a/language-server/de.cau.cs.kieler.language.server/.classpath b/language-server/de.cau.cs.kieler.language.server/.classpath index 575acb3fec..09dd3861ec 100644 --- a/language-server/de.cau.cs.kieler.language.server/.classpath +++ b/language-server/de.cau.cs.kieler.language.server/.classpath @@ -1,6 +1,6 @@ - + diff --git a/language-server/de.cau.cs.kieler.language.server/.settings/org.eclipse.jdt.core.prefs b/language-server/de.cau.cs.kieler.language.server/.settings/org.eclipse.jdt.core.prefs index 3a393899fe..cf58660fd6 100644 --- a/language-server/de.cau.cs.kieler.language.server/.settings/org.eclipse.jdt.core.prefs +++ b/language-server/de.cau.cs.kieler.language.server/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=21 diff --git a/language-server/de.cau.cs.kieler.language.server/pom.xml b/language-server/de.cau.cs.kieler.language.server/pom.xml index 729306eaab..e4d5e36aa4 100644 --- a/language-server/de.cau.cs.kieler.language.server/pom.xml +++ b/language-server/de.cau.cs.kieler.language.server/pom.xml @@ -140,12 +140,12 @@ org.eclipse.platform org.eclipse.core.runtime - 3.31.100 + 3.32.0 org.eclipse.platform org.eclipse.equinox.common - 3.19.100 + 3.19.200 @@ -160,7 +160,7 @@ org.eclipse.jdt org.eclipse.jdt.core - 3.39.0 + 3.40.0