From 7f24a4f103a29fefd3bdb2b102eac4aca393cb8f Mon Sep 17 00:00:00 2001 From: Martin Armbruster Date: Sat, 3 Jan 2026 10:52:35 +0100 Subject: [PATCH 1/2] Updated the GitHub actions. --- .github/workflows/build.yml | 8 ++++---- .github/workflows/nightly_on_develop.yml | 4 ++-- .github/workflows/release.yml | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9469c5d0..5d898ea6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ jobs: build: strategy: matrix: - os: [ubuntu-22.04, windows-2022] + os: [ubuntu-24.04, windows-2025] runs-on: ${{ matrix.os }} steps: - name: Enable Long Paths in Git (Linux) @@ -16,11 +16,11 @@ jobs: if: runner.os == 'Windows' run: git config --system core.longpaths true - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v6 with: submodules: true - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: 17 @@ -29,7 +29,7 @@ jobs: run: ./mvnw clean package - name: Store P2 Repository if: runner.os == 'Linux' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v6 with: name: p2-jamopp path: jamopp.p2/target/repository diff --git a/.github/workflows/nightly_on_develop.yml b/.github/workflows/nightly_on_develop.yml index 1d9a4b75..8f80f068 100644 --- a/.github/workflows/nightly_on_develop.yml +++ b/.github/workflows/nightly_on_develop.yml @@ -9,10 +9,10 @@ jobs: uses: ./.github/workflows/build.yml deploy-nightly: needs: build - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Download P2 Repository - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v6 with: name: p2-jamopp path: p2-jamopp diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 785095fb..d00ff4ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,12 +9,12 @@ on: type: string jobs: release: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: 17 @@ -36,19 +36,19 @@ jobs: release-version: ${{ inputs.release-version }} link-path: ${{ env.DEPLOY_PATH }} - name: Setup Apache Maven Central - uses: actions/setup-java@3.6.0 + uses: actions/setup-java@4.7.1 with: java-version: 17 distribution: 'temurin' - server-id: ossrh - server-username: OSSRH_USERNAME - server-password: OSSRH_PASSWORD + server-id: central + server-username: CENTRAL_USERNAME + server-password: CENTRAL_PASSWORD gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE cache: 'maven' - name: Deploy to Apache Maven Central run: mvn -Pdeploy-mvn-central deploy env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }} + CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} MAVEN_GPG_PASSPHRASE: $${{ secrets.MAVEN_GPG_PASSPHRASE }} \ No newline at end of file From 277416845a3709716e513e0d64c700160c0f5252 Mon Sep 17 00:00:00 2001 From: Martin Armbruster Date: Mon, 12 Jan 2026 18:54:30 +0100 Subject: [PATCH 2/2] Updated the build pipeline to fulfill the deployment requirements for Maven Central. --- .github/workflows/release.yml | 4 +- pom.xml | 106 +++++++++++++++++++++++++++++----- 2 files changed, 95 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d00ff4ee..b71e4421 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: java-version: 17 cache: 'maven' - name: Build Packages (without tests) - run: ./mvnw clean package -Dmaven.test.skip=true + run: ./mvnw -P build-deploy clean package -Dmaven.test.skip=true - name: Build Deploy Path shell: bash run: echo "DEPLOY_PATH=$( echo '${{ secrets.DEPLOYMENT_REMOTE_TARGET }}/extended-java-model-parser-and-printer' )" >> $GITHUB_ENV @@ -47,7 +47,7 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE cache: 'maven' - name: Deploy to Apache Maven Central - run: mvn -Pdeploy-mvn-central deploy + run: mvn -P deploy-mvn-central deploy env: CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }} CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} diff --git a/pom.xml b/pom.xml index 011e4ef9..e37b50c6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,29 @@ pom Extended JaMoPP Parent This package acts as the parent module for all extended JaMoPP modules. + https://github.com/MDSD-Tools/TheExtendedJavaModelParserAndPrinter + + + + Eclipse Public License - v 1.0 + https://www.eclipse.org/org/documents/epl-v10.html + + + + + + Martin Armbruster + martin.armbruster@kit.edu + MCSE, KIT + https://mcse.kastel.kit.edu + + + + + scm:git:git://github.com/MDSD-Tools/TheExtendedJavaModelParserAndPrinter.git + scm:git:https://github.com/MDSD-Tools/TheExtendedJavaModelParserAndPrinter.git + https://github.com/MDSD-Tools/TheExtendedJavaModelParserAndPrinter/tree/main + 17 @@ -161,8 +184,8 @@ org.apache.maven.plugins - maven-sources-plugin - 3.2.1 + maven-source-plugin + 3.4.0 org.apache.maven.plugins @@ -199,29 +222,75 @@ maven-surefire-plugin 3.1.0 + + org.apache.maven.plugins + maven-javadoc-plugin + 3.12.0 + + + + org.apache.maven.plugins + maven-source-plugin + + + + jar + + + + + + + build-deploy + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + jar + + + + + + + model + a + Model + + + generated + a + Generated + + + ordered + a + Ordered + + + all,-missing + + + + + deploy-mvn-central - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.2.7 sign-artifacts @@ -238,6 +307,17 @@ + + org.sonatype.central + central-publishing-maven-plugin + 0.9.0 + true + + central + true + published + +