Skip to content

Commit 72fba8b

Browse files
federicorispofedericorispo
committed
feat: downgrade jakarta to version 5 for retro-compatibility
- Renamed and updated: add-javax-suffix.sh script to add-jakarta5-suffix.sh - Updated the release and snapshot github workflows to test and build only the jakarta5 flavour - Downgraded jakarta to version 5 in build.gradle
1 parent 81510b2 commit 72fba8b

File tree

5 files changed

+12
-179
lines changed

5 files changed

+12
-179
lines changed

.github/add-javax-suffix.sh renamed to .github/add-jakarta5-suffix.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ addSuffix() {
1111

1212
updateLocalDependencies() {
1313
for module in "${modules[@]}"; do
14-
cp -rf "$module" "$module"-javax
14+
cp -rf "$module" "$module"-jakarta5
1515
rm -rf "$module"
1616

1717
for dependency in "${modules[@]}"; do
18-
sed -i -E "s/project\(('|\"):${dependency}('|\")\)/project\(':${dependency}-javax'\)/" "$module"-"javax"/build.gradle
18+
sed -i -E "s/project\(('|\"):${dependency}('|\")\)/project\(':${dependency}-jakarta5'\)/" "$module"-"jakarta5"/build.gradle
1919
done
2020
done
2121

@@ -24,14 +24,14 @@ updateLocalDependencies() {
2424

2525
updateGradleSettings() {
2626
for module in "${modules[@]}"; do
27-
echo "Replace ${module} with ${module}-javax in settings.gradle"
28-
sed -i -E "s/('|\"):${module}('|\")/':${module}-javax'/" settings.gradle
27+
echo "Replace ${module} with ${module}-jakarta5 in settings.gradle"
28+
sed -i -E "s/('|\"):${module}('|\")/':${module}-jakarta5'/" settings.gradle
2929
done
3030

3131
cat settings.gradle
3232
}
3333

34-
echo "Add suffix -javax to modules"
34+
echo "Add suffix -jakarta5 to modules"
3535
addSuffix
3636

3737
ls -lh

‎.github/release.sh‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
#!/bin/bash
22
set -ev
33

4-
FLAVOUR="${1}"
5-
64
removeSnapshots() {
75
sed -i 's/-SNAPSHOT//' gradle.properties
86
}
97

108
echo "Publishing release to Maven Central"
119
removeSnapshots
12-
13-
if [ "${FLAVOUR}" == 'javax' ]; then
14-
.github/add-javax-suffix.sh
15-
fi
16-
10+
.github/add-jakarta5-suffix.sh
1711
./gradlew clean build publishToSonatype closeAndReleaseSonatypeStagingRepository

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- uses: actions/checkout@v3
1010
- uses: gradle/wrapper-validation-action@v1
1111

12-
test-jakarta:
12+
test-jakarta5:
1313
name: Test run jakarta
1414
needs: validation
1515
runs-on: ubuntu-latest
@@ -37,9 +37,9 @@ jobs:
3737
- name: Gradle Check
3838
run: ./gradlew --info check
3939

40-
build-jakarta:
40+
build-jakarta5:
4141
name: Publish release jakarta
42-
needs: test-jakarta
42+
needs: test-jakarta5
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Checkout
@@ -73,98 +73,3 @@ jobs:
7373
OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
7474
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
7575
run: .github/release.sh
76-
77-
test-javax:
78-
name: Test run javax
79-
needs: validation
80-
runs-on: ubuntu-latest
81-
steps:
82-
- name: Checkout
83-
uses: actions/checkout@v3
84-
- name: Setup Java
85-
uses: actions/setup-java@v3
86-
with:
87-
distribution: 'zulu'
88-
java-version: 11
89-
- name: Cache Gradle
90-
uses: actions/cache@v3
91-
env:
92-
java-version: 11
93-
with:
94-
path: |
95-
~/.gradle/caches
96-
~/.gradle/wrapper
97-
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
98-
restore-keys: |
99-
${{ runner.os }}-${{ env.java-version }}-gradle-
100-
- name: Make gradlew executable
101-
run: chmod +x ./gradlew
102-
- name: Replace jakarta with javax
103-
run: .github/replaceJakartaWithJavax.sh
104-
- name: Gradle Check
105-
run: ./gradlew --info check
106-
107-
build-javax:
108-
name: Publish release javax
109-
needs: test-javax
110-
runs-on: ubuntu-latest
111-
steps:
112-
- name: Checkout
113-
uses: actions/checkout@v3
114-
- name: Setup Java
115-
uses: actions/setup-java@v3
116-
with:
117-
distribution: 'zulu'
118-
java-version: 11
119-
120-
- name: Cache Gradle
121-
uses: actions/cache@v3
122-
env:
123-
java-version: 11
124-
with:
125-
path: |
126-
~/.gradle/caches
127-
~/.gradle/wrapper
128-
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
129-
restore-keys: |
130-
${{ runner.os }}-${{ env.java-version }}-gradle-
131-
- name: Prepare environment
132-
env:
133-
GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
134-
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.GPG_SIGNING_SECRET_KEY_RING_FILE }}
135-
run: sudo bash -c "echo '$GPG_KEY_CONTENTS' | base64 -d > '$SIGNING_SECRET_KEY_RING_FILE'"
136-
- name: Replace jakarta with javax
137-
run: .github/replaceJakartaWithJavax.sh
138-
- name: Publish release
139-
env:
140-
SIGNING_KEY_ID: ${{ secrets.GPG_SIGNING_KEY_ID }}
141-
SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
142-
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.GPG_SIGNING_SECRET_KEY_RING_FILE }}
143-
OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
144-
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
145-
run: .github/release.sh javax
146-
tag:
147-
name: Tag release
148-
needs: [ build-jakarta, build-javax ]
149-
runs-on: ubuntu-latest
150-
steps:
151-
- name: Checkout
152-
uses: actions/checkout@v3
153-
- name: Setup Java
154-
uses: actions/setup-java@v3
155-
with:
156-
distribution: 'zulu'
157-
java-version: 17
158-
- name: Cache Gradle
159-
uses: actions/cache@v3
160-
env:
161-
java-version: 17
162-
with:
163-
path: |
164-
~/.gradle/caches
165-
~/.gradle/wrapper
166-
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
167-
restore-keys: |
168-
${{ runner.os }}-${{ env.java-version }}-gradle-
169-
- name: Tag release
170-
run: .github/tag-release.sh

‎.github/workflows/snapshot.yml‎

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v3
1313
- uses: gradle/wrapper-validation-action@v1
1414

15-
test-jakarta:
15+
test-jakarta5:
1616
name: Test run jakarta
1717
needs: validation
1818
runs-on: ubuntu-latest
@@ -40,7 +40,7 @@ jobs:
4040
- name: Gradle Check
4141
run: ./gradlew --info check
4242

43-
build-jakarta:
43+
build-jakarta5:
4444
name: Publish snapshot jakarta
4545
needs: test-jakarta
4646
runs-on: ubuntu-latest
@@ -72,72 +72,6 @@ jobs:
7272
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
7373
run: ./gradlew clean build publish -x test
7474

75-
test-javax:
76-
name: Test run javax
77-
needs: validation
78-
runs-on: ubuntu-latest
79-
steps:
80-
- name: Checkout
81-
uses: actions/checkout@v3
82-
- name: Setup Java
83-
uses: actions/setup-java@v3
84-
with:
85-
distribution: 'zulu'
86-
java-version: 11
87-
- name: Cache Gradle
88-
uses: actions/cache@v3
89-
env:
90-
java-version: 11
91-
with:
92-
path: |
93-
~/.gradle/caches
94-
~/.gradle/wrapper
95-
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
96-
restore-keys: |
97-
${{ runner.os }}-${{ env.java-version }}-gradle-
98-
- name: Make gradlew executable
99-
run: chmod +x ./gradlew
100-
- name: Replace jakarta with javax
101-
run: .github/replaceJakartaWithJavax.sh
102-
- name: Gradle Check
103-
run: ./gradlew --info check
104-
105-
build-javax:
106-
name: Publish snapshot javax
107-
needs: test-javax
108-
runs-on: ubuntu-latest
109-
steps:
110-
- name: Checkout
111-
uses: actions/checkout@v3
112-
- name: Setup Java
113-
uses: actions/setup-java@v3
114-
with:
115-
distribution: 'zulu'
116-
java-version: 11
117-
- name: Cache Gradle
118-
uses: actions/cache@v3
119-
env:
120-
java-version: 11
121-
with:
122-
path: |
123-
~/.gradle/caches
124-
~/.gradle/wrapper
125-
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
126-
restore-keys: |
127-
${{ runner.os }}-${{ env.java-version }}-gradle-
128-
- name: Make gradlew executable
129-
run: chmod +x ./gradlew
130-
- name: Replace jakarta with javax
131-
run: .github/replaceJakartaWithJavax.sh
132-
- name: Add suffix to modules
133-
run: .github/add-javax-suffix.sh
134-
- name: Gradle Publish Snapshot
135-
if: env.OSS_USER_TOKEN_KEY != null
136-
env:
137-
OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
138-
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
139-
run: ./gradlew clean build publish -x test
140-
14175
sonar:
14276
name: Sonar analysis
14377
needs: validation

‎graphql-java-servlet/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
api(project(':graphql-java-kickstart'))
1717

1818
// Servlet
19-
compileOnly "jakarta.servlet:jakarta.servlet-api:6.0.0"
19+
compileOnly "jakarta.servlet:jakarta.servlet-api:5.0.0"
2020
compileOnly "jakarta.websocket:jakarta.websocket-api:2.1.0"
2121
compileOnly "jakarta.websocket:jakarta.websocket-client-api:2.1.0"
2222
implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER"

0 commit comments

Comments
 (0)