Publish via Central Portal and update dependencies (Java 17, Xtext 2.42, Gradle 8, Tycho 4)

.github/workflows/build_master.yml

@@ -47,11 +47,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
     - name: Install Graphviz
       run: sudo apt-get -y install graphviz
     - name: Cache local Maven repository
@@ -107,8 +107,8 @@ jobs:
       env:
         GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
         GPG_KEY_PASSPHRASE: ${{ secrets.GPG_KEY_PASSPHRASE }}
-        OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-        OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+        CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
+        CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
 
   publish_eclipse_snapshot:
     name: Publish Snapshot of Eclipse Plugin (P2 repo)
@@ -121,11 +121,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
     - name: Install Graphviz
       run: sudo apt-get -y install graphviz
     - name: Cache local Maven repository

.github/workflows/build_standard.yml

@@ -44,11 +44,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
     - name: Install Graphviz
       run: sudo apt-get -y install graphviz
     - name: Cache local Maven repository

.github/workflows/release-trigger.yml

@@ -13,11 +13,11 @@ jobs:
       with:
         fetch-depth: 0
         persist-credentials: false
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
     - name: Configure Git user
       run: |
         git config user.email "contextmapper-ci@kapferer.ch"

.github/workflows/release.yml

@@ -43,11 +43,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
     - name: Install Graphviz
       run: sudo apt-get -y install graphviz
     - name: Cache local Maven repository
@@ -102,8 +102,18 @@ jobs:
       env:
         GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
         GPG_KEY_PASSPHRASE: ${{ secrets.GPG_KEY_PASSPHRASE }}
-        OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-        OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+        CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
+        CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
+    # The OSSRH Staging API only stages the upload; this hands it over to the Central Portal,
+    # where the deployment has to be published manually (https://central.sonatype.com/publishing/deployments).
+    - name: Transfer release to Central Portal
+      run: |
+        TOKEN=$(printf "%s:%s" "$CENTRAL_USERNAME" "$CENTRAL_PASSWORD" | base64 -w0)
+        curl --fail-with-body -X POST -H "Authorization: Bearer $TOKEN" \
+          "https://ossrh-staging-api.central.sonatype.com/manual/upload/defaultRepository/org.contextmapper?publishing_type=user_managed"
+      env:
+        CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
+        CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
 
   publish_eclipse:
     name: Publish Eclipse Plugin (P2 repo)
@@ -115,11 +125,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
     - name: Install Graphviz
       run: sudo apt-get -y install graphviz
     - name: Cache local Maven repository

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip

README.md

@@ -36,7 +36,7 @@ The Context Mapper project has originally been developed as part of research pro
 ## System Requirements
 To use the ContextMapper DSL (CML) you need the following tools:
 
-* [Java JDK](https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) (JDK 11 or newer)
+* [Java JDK](https://adoptium.net/) (JDK 17 or newer)
 * [Eclipse](https://www.eclipse.org/downloads/packages/) or [Visual Studio Code](https://code.visualstudio.com/)
 * If you want to use our [Context Map generator](https://contextmapper.org/docs/context-map-generator/) you need to have [Graphviz](https://www.graphviz.org/) installed on your system.
     * Ensure that the binaries are part of the _PATH_ environment variable and can be called from the terminal.

build.gradle

@@ -4,14 +4,14 @@ buildscript {
 		gradlePluginPortal()
 	}
 	dependencies {
-		classpath 'org.xtext:xtext-gradle-plugin:3.0.2'
+		classpath 'org.xtext:xtext-gradle-plugin:4.0.0'
 	}
 }
 
-def pomXml = new XmlSlurper().parse('pom.xml')
+def pomXml = new groovy.xml.XmlSlurper().parse('pom.xml')
 
 subprojects {
-	ext.xtextVersion = '2.32.0'
+	ext.xtextVersion = '2.42.0'
 	repositories {
 		mavenCentral()
 	}
@@ -30,8 +30,10 @@ subprojects {
 	group = 'org.contextmapper'
 	version = pomXml.version
 
-	sourceCompatibility = '11'
-	targetCompatibility = '11'
+	java {
+		sourceCompatibility = JavaVersion.VERSION_17
+		targetCompatibility = JavaVersion.VERSION_17
+	}
 
 	configurations.all {
 		exclude group: 'asm'

gradle.properties

@@ -1,2 +1,5 @@
-ossSnapshotRepository=https://oss.sonatype.org/content/repositories/snapshots/
-ossReleaseStagingRepository=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+centralSnapshotRepository=https://central.sonatype.com/repository/maven-snapshots/
+centralReleaseStagingRepository=https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/
+
+# Gradle 7.x needs this on JDK 17+ for the Ant-based Jacoco report task
+org.gradle.jvmargs=--add-opens=java.prefs/java.util.prefs=ALL-UNNAMED

gradle/source-layout.gradle

@@ -7,15 +7,15 @@ if (name.endsWith("-tests")) {
 		test {
 			java.srcDirs = ['src', 'src-gen', 'xtend-gen']
 			resources.srcDirs = ['src', 'src-gen']
-			xtendOutputDir = 'xtend-gen'
+			xtend.outputDir = 'xtend-gen'
 		}
 	}
 } else {
 	sourceSets {
 		main {
 			java.srcDirs = ['src', 'src-gen', 'xtend-gen']
 			resources.srcDirs = ['src', 'src-gen']
-			xtendOutputDir = 'xtend-gen'
+			xtend.outputDir = 'xtend-gen'
 		}
 		test {
 			java.srcDirs = []

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Mon Sep 30 23:33:31 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip