.github/add-javax-suffix.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+addSuffix() {
+  local result
+  result=$(grep include settings.gradle | awk '{print $2}' | tr -d "'" | tr -d ':')
+  readarray -t <<<"$result"
+  modules=("${MAPFILE[@]}")
+
+  updateLocalDependencies
+}
+
+updateLocalDependencies() {
+  for module in "${modules[@]}"; do
+    cp -rf "$module" "$module"-javax
+    rm -rf "$module"
+
+    for dependency in "${modules[@]}"; do
+      sed -i -E "s/project\(('|\"):${dependency}('|\")\)/project\(':${dependency}-javax'\)/" "$module"-"javax"/build.gradle
+    done
+  done
+
+  updateGradleSettings
+}
+
+updateGradleSettings() {
+  for module in "${modules[@]}"; do
+    echo "Replace ${module} with ${module}-javax in settings.gradle"
+    sed -i -E "s/('|\"):${module}('|\")/':${module}-javax'/" settings.gradle
+  done
+
+  cat settings.gradle
+}
+
+echo "Add suffix -javax to modules"
+addSuffix
+
+ls -lh

.github/release.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -ev
+
+FLAVOUR="${1}"
+
+removeSnapshots() {
+  sed -i 's/-SNAPSHOT//' gradle.properties
+}
+
+echo "Publishing release to Maven Central"
+removeSnapshots
+
+if [ "${FLAVOUR}" == 'javax' ]; then
+  .github/add-javax-suffix.sh
+fi
+
+./gradlew clean build publishToSonatype closeAndReleaseSonatypeStagingRepository

.github/replaceJakartaWithJavax.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Set jdk11 as source and target
+sed -i 's/SOURCE_COMPATIBILITY=.*/SOURCE_COMPATIBILITY=11/' gradle.properties
+sed -i 's/TARGET_COMPATIBILITY=.*/TARGET_COMPATIBILITY=11/' gradle.properties
+
+# Replace jakarta imports and dependencies with javax
+grep -rl 'import jakarta' ./graphql-java-servlet | xargs sed -i 's/import jakarta/import javax/g'
+sed -i 's/.*jakarta.websocket:jakarta.websocket-client-api.*//' graphql-java-servlet/build.gradle
+sed -i \
+  's/jakarta.servlet:jakarta.servlet-api.*/javax.servlet:javax.servlet-api:$LIB_JAVAX_SERVLET"/' \
+  graphql-java-servlet/build.gradle
+sed -i \
+  's/jakarta.websocket.*/javax.websocket:javax.websocket-api:$LIB_JAVAX_WEBSOCKET"/' \
+  graphql-java-servlet/build.gradle
+
+# Final check if there are something else to replace
+grep -rl 'jakarta' ./graphql-java-servlet | xargs sed -i 's/jakarta/javax/g'
+
+# Set the version 5 for spring framework
+sed -i \
+  's/org.springframework:spring-test.*/org.springframework:spring-test:$LIB_SPRINGFRAMEWORK_5"/' \
+  graphql-java-servlet/build.gradle
+sed -i \
+  's/org.springframework:spring-web.*/org.springframework:spring-web:$LIB_SPRINGFRAMEWORK_5"/' \
+  graphql-java-servlet/build.gradle
+
+echo "Replaced jakarta occurrences with javax"

github-build.sh → .github/tag-release.sh

@@ -10,14 +10,16 @@ removeSnapshots() {
 }
 
 commitRelease() {
-  local APP_VERSION=$(getVersion)
+  local APP_VERSION
+  APP_VERSION=$(getVersion)
   git commit -a -m "Update version for release"
   git tag -a "v${APP_VERSION}" -m "Tag release version"
 }
 
 bumpVersion() {
   echo "Bump version number"
-  local APP_VERSION=$(getVersion | xargs)
+  local APP_VERSION
+  APP_VERSION=$(getVersion | xargs)
   local SEMANTIC_REGEX='^([0-9]+)\.([0-9]+)(\.([0-9]+))?$'
   if [[ ${APP_VERSION} =~ ${SEMANTIC_REGEX} ]]; then
     if [[ ${BASH_REMATCH[4]} ]]; then
@@ -30,24 +32,17 @@ bumpVersion() {
 
     echo "Next version: ${nextVersion}"
     sed -i -E "s/^version(\s)?=.*/version=${nextVersion}/" gradle.properties
+    git commit -a -m "Bumped version for next release"
   else
     echo "No semantic version and therefore cannot publish to maven repository: '${APP_VERSION}'"
   fi
 }
 
-commitNextVersion() {
-  git commit -a -m "Update version for release"
-}
-
 git config --global user.email "actions@github.com"
 git config --global user.name "GitHub Actions"
 
 echo "Deploying release to Maven Central"
 removeSnapshots
-
-./gradlew clean build publish closeAndReleaseRepository
-
 commitRelease
 bumpVersion
-commitNextVersion
-git push --follow-tags
+git push --follow-tags

.github/workflows/pull-request.yml

@@ -8,28 +8,28 @@ jobs:
     name: Gradle Wrapper Validation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v3
 
   test:
     name: Test run
     strategy:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        java: [ 8, 11, 15 ]
+        java: [ 17, 19 ]
     needs: validation
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
       - name: Cache Gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           java-version: ${{ matrix.java }}
         with:
@@ -56,26 +56,26 @@ jobs:
     env:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         if: env.SONAR_TOKEN != null
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         if: env.SONAR_TOKEN != null
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - name: Cache SonarCloud packages
         if: env.SONAR_TOKEN != null
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Gradle packages
         if: env.SONAR_TOKEN != null
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

.github/workflows/release.yml

@@ -6,25 +6,25 @@ jobs:
     name: Gradle Wrapper Validation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v3
 
-  test:
-    name: Test run
+  test-jakarta:
+    name: Test run jakarta
     needs: validation
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 8
+          java-version: 17
       - name: Cache Gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
-          java-version: 8
+          java-version: 17
         with:
           path: |
             ~/.gradle/caches
@@ -37,22 +37,59 @@ jobs:
       - name: Gradle Check
         run: ./gradlew --info check
 
-  build:
-    name: Publish release
-    needs: test
+  build-jakarta:
+    name: Publish release jakarta
+    needs: test-jakarta
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 8
+          java-version: 17
       - name: Cache Gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
-          java-version: 8
+          java-version: 17
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.java-version }}-gradle-
+      - name: Prepare environment
+        env:
+          GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
+          SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.GPG_SIGNING_SECRET_KEY_RING_FILE }}
+        run: sudo bash -c "echo '$GPG_KEY_CONTENTS' | base64 -d > '$SIGNING_SECRET_KEY_RING_FILE'"
+      - name: Publish release
+        env:
+          SIGNING_KEY_ID: ${{ secrets.GPG_SIGNING_KEY_ID }}
+          SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
+          SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.GPG_SIGNING_SECRET_KEY_RING_FILE }}
+          OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
+          OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
+        run: .github/release.sh
+
+  test-javax:
+    name: Test run javax
+    needs: validation
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 11
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        env:
+          java-version: 11
         with:
           path: |
             ~/.gradle/caches
@@ -62,16 +99,72 @@ jobs:
             ${{ runner.os }}-${{ env.java-version }}-gradle-
       - name: Make gradlew executable
         run: chmod +x ./gradlew
+      - name: Replace jakarta with javax
+        run: .github/replaceJakartaWithJavax.sh
+      - name: Gradle Check
+        run: ./gradlew --info check
+
+  build-javax:
+    name: Publish release javax
+    needs: test-javax
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 11
+
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        env:
+          java-version: 11
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.java-version }}-gradle-
       - name: Prepare environment
         env:
           GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
           SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.GPG_SIGNING_SECRET_KEY_RING_FILE }}
         run: sudo bash -c "echo '$GPG_KEY_CONTENTS' | base64 -d > '$SIGNING_SECRET_KEY_RING_FILE'"
+      - name: Replace jakarta with javax
+        run: .github/replaceJakartaWithJavax.sh
       - name: Publish release
         env:
           SIGNING_KEY_ID: ${{ secrets.GPG_SIGNING_KEY_ID }}
           SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
           SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.GPG_SIGNING_SECRET_KEY_RING_FILE }}
           OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
           OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
-        run: bash github-build.sh
+        run: .github/release.sh javax
+  tag:
+    name: Tag release
+    needs: [ build-jakarta, build-javax ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 17
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        env:
+          java-version: 17
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.java-version }}-gradle-
+      - name: Tag release
+        run: .github/tag-release.sh