Merge pull request #547 from graphql-java-kickstart/rebase-jakarta5-branch

chore: align jakarta5 branch to master

Author: federicorispo

.github/workflows/pull-request.yml

@@ -8,7 +8,7 @@ jobs:
     name: Gradle Wrapper Validation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
 
   test:
@@ -22,9 +22,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
@@ -56,13 +56,13 @@ jobs:
     env:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - 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 17
         if: env.SONAR_TOKEN != null
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17

.github/workflows/release.yml

@@ -6,18 +6,18 @@ jobs:
     name: Gradle Wrapper Validation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
 
-  test-jakarta5:
+  test-jakarta:
     name: Test run jakarta
     needs: validation
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
@@ -43,9 +43,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17

.github/workflows/snapshot.yml

@@ -9,7 +9,7 @@ jobs:
     name: Gradle Wrapper Validation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
 
   test-jakarta5:
@@ -18,9 +18,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
@@ -46,9 +46,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
@@ -77,11 +77,11 @@ jobs:
     needs: validation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17

README.md

@@ -22,17 +22,53 @@ regarding GraphQL Java itself.
 We try to stay up to date with GraphQL Java as much as possible maintaining the retro-compatibility
 with javax and Springframework 5.
 
-On each release we publish two flavours of this project:
- - the main one is using `jakarta` and Springframework `6.*` 
- - the legacy one is using `javax` and Springframework `5.*`
+On each release we publish three flavours of this project:
+ - [latest jakarta](#jakarta-and-springframework-6)
+ - [jakarta5](#jakarta5)
+ - [javax](#javax-and-springframework-5)
+ 
+All of them also supports legacy projects that can compile with older JDK versions: the minimum JDK
+version supported is the `11`.
 
-On maven central you can distinguish them from the version because the `javax` flavor has the 
-suffix `-javax`.
+## Jakarta and Springframework 6.*
+This is the main flavour using the latest version of `Jakarta` (currently the `6.*`) and the latest
+version of `Springframework` (currently the `6.*`). All the codebase can be found in the branch: 
+`master`
 
-Both of them also supports legacy projects that can compile with older JDK versions: the oldest
-supported one is the `11`.
+```xml
+<dependency>
+    <groupId>com.graphql-java-kickstart</groupId>
+    <artifactId>graphql-java-servlet</artifactId>
+    <version>${graphql-java-servlet.version}</version>
+</dependency>
+```
+
+## Jakarta5
+This flavour use the `jakarta` version `5.*` and it is meant to be used for all the projects that 
+are already migrated to jakarta, but they are waiting that `jakarta6` will become more broadly used.
+All the codebase can be found in the branch: `jakarta5`
+
+```xml
+<dependency>
+    <groupId>com.graphql-java-kickstart</groupId>
+    <artifactId>graphql-java-servlet-jakarta5</artifactId>
+    <version>${graphql-java-servlet-jakarta5.version}</version>
+</dependency>
+```
+
+## Javax and Springframework 5.*
+This is the legacy flavour using the `javax` dependency and the version `5.*` of `Springframework` 
+(since it is still broadly used by a lot of projects). All the codebase can be found in the branch: 
+`master` 
+
+```xml
+<dependency>
+    <groupId>com.graphql-java-kickstart</groupId>
+    <artifactId>graphql-java-servlet-javax</artifactId>
+    <version>${graphql-java-servlet.version}</version>
+</dependency>
+```
 
-See [gradle.properties](gradle.properties) to see currently supported versions.
 
 ## Installation and getting started
 

build.gradle

@@ -28,7 +28,7 @@ buildscript {
 
 plugins {
     id "biz.aQute.bnd.builder" version "6.4.0" apply false
-    id "org.sonarqube" version "4.2.1.3168"
+    id "org.sonarqube" version "4.4.1.3373"
     id "jacoco"
     id "io.github.gradle-nexus.publish-plugin" version '1.3.0'
 }

gradle.properties

@@ -7,10 +7,10 @@ PROJECT_LICENSE=MIT
 PROJECT_LICENSE_URL=https://github.com/graphql-java-kickstart/spring-java-servlet/blob/master/LICENSE.md
 PROJECT_DEV_ID=oliemansm
 PROJECT_DEV_NAME=Michiel Oliemans
-LIB_GRAPHQL_JAVA_VER=20.4
-LIB_JACKSON_VER=2.15.2
-LIB_SLF4J_VER=2.0.7
-LIB_LOMBOK_VER=1.18.28
+LIB_GRAPHQL_JAVA_VER=21.3
+LIB_JACKSON_VER=2.16.1
+LIB_SLF4J_VER=2.0.9
+LIB_LOMBOK_VER=1.18.30
 # These constants are necessary to the automatic release of javax flavour
 LIB_JAVAX_SERVLET=4.0.1
 LIB_JAVAX_WEBSOCKET=1.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

graphql-java-kickstart/build.gradle

@@ -14,6 +14,6 @@ dependencies {
     // JSON
     api "com.fasterxml.jackson.core:jackson-core:$LIB_JACKSON_VER"
     api "com.fasterxml.jackson.core:jackson-annotations:$LIB_JACKSON_VER"
-    api "com.fasterxml.jackson.core:jackson-databind:2.15.2"
+    api "com.fasterxml.jackson.core:jackson-databind:2.16.1"
     api "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$LIB_JACKSON_VER"
 }

graphql-java-servlet/build.gradle

@@ -17,8 +17,8 @@ dependencies {
 
     // Servlet
     compileOnly "jakarta.servlet:jakarta.servlet-api:5.0.0"
-    compileOnly "jakarta.websocket:jakarta.websocket-api:2.1.0"
-    compileOnly "jakarta.websocket:jakarta.websocket-client-api:2.1.0"
+    compileOnly "jakarta.websocket:jakarta.websocket-api:2.1.1"
+    compileOnly "jakarta.websocket:jakarta.websocket-client-api:2.1.1"
     implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER"
 
     // OSGi
@@ -32,15 +32,15 @@ dependencies {
     testImplementation 'io.github.graphql-java:graphql-java-annotations:9.1'
 
     // Unit testing
-    testImplementation "org.apache.groovy:groovy-all:4.0.12"
+    testImplementation "org.apache.groovy:groovy-all:4.0.17"
     testImplementation "org.spockframework:spock-core:2.3-groovy-4.0"
-    testRuntimeOnly "cglib:cglib-nodep:3.3.0"
+    testRuntimeOnly "net.bytebuddy:byte-buddy:1.14.11"
     testRuntimeOnly "org.objenesis:objenesis:3.3"
     testImplementation "org.slf4j:slf4j-simple:$LIB_SLF4J_VER"
-    testImplementation "org.springframework:spring-test:6.0.10"
-    testRuntimeOnly "org.springframework:spring-web:6.0.10"
-    testImplementation 'com.google.guava:guava:32.0.1-jre'
+    testImplementation "org.springframework:spring-test:6.1.2"
+    testRuntimeOnly "org.springframework:spring-web:6.1.2"
+    testImplementation 'com.google.guava:guava:33.0.0-jre'
     testImplementation "jakarta.servlet:jakarta.servlet-api:6.0.0"
-    testImplementation "jakarta.websocket:jakarta.websocket-api:2.1.0"
-    testImplementation "jakarta.websocket:jakarta.websocket-client-api:2.1.0"
+    testImplementation "jakarta.websocket:jakarta.websocket-api:2.1.1"
+    testImplementation "jakarta.websocket:jakarta.websocket-client-api:2.1.1"
 }