Skip to content

Commit 6feb893

Browse files
estal011estal011
committed
Merge branch '15.2' into 15.2Onepiece
* 15.2: (72 commits) Update version for release chore: bump version to 15.2.0 fix(deps): update all non-major dependencies to v2.0.12 chore(deps): update dependency gradle to v8.6 (graphql-java-kickstart#554) chore(deps): update gradle/wrapper-validation-action action to v2 chore(deps): update actions/cache action to v4 (graphql-java-kickstart#551) fix(deps): update dependency org.apache.groovy:groovy-all to v4.0.18 fix(deps): update all non-major dependencies to v6.1.3 fix(deps): update all non-major dependencies to v2.0.11 fix(deps): update all non-major dependencies to v2.0.10 fix(deps): update all non-major dependencies to v2.16.1 fix(deps): update dependency org.apache.groovy:groovy-all to v4.0.17 (graphql-java-kickstart#545) fix(deps): update dependency net.bytebuddy:byte-buddy to v1.14.11 fix(deps): update dependency com.google.guava:guava to v33 (graphql-java-kickstart#542) fix(deps): update all non-major dependencies (graphql-java-kickstart#533) chore(deps): replace cglib with byte-buddy (graphql-java-kickstart#543) chore(deps): update actions/setup-java action to v4 chore(deps): update actions/checkout action to v4 fix(deps): update dependency com.graphql-java:graphql-java to v21 fix(deps): update all non-major dependencies to v2.1.1 ... # Conflicts: # build.gradle # gradle.properties
2 parents 9013afc + 8791372 commit 6feb893

File tree

26 files changed

+435
-116
lines changed

26 files changed

+435
-116
lines changed

‎.github/add-javax-suffix.sh‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
addSuffix() {
4+
local result
5+
result=$(grep include settings.gradle | awk '{print $2}' | tr -d "'" | tr -d ':')
6+
readarray -t <<<"$result"
7+
modules=("${MAPFILE[@]}")
8+
9+
updateLocalDependencies
10+
}
11+
12+
updateLocalDependencies() {
13+
for module in "${modules[@]}"; do
14+
cp -rf "$module" "$module"-javax
15+
rm -rf "$module"
16+
17+
for dependency in "${modules[@]}"; do
18+
sed -i -E "s/project\(('|\"):${dependency}('|\")\)/project\(':${dependency}-javax'\)/" "$module"-"javax"/build.gradle
19+
done
20+
done
21+
22+
updateGradleSettings
23+
}
24+
25+
updateGradleSettings() {
26+
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
29+
done
30+
31+
cat settings.gradle
32+
}
33+
34+
echo "Add suffix -javax to modules"
35+
addSuffix
36+
37+
ls -lh

‎.github/release.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
set -ev
3+
4+
FLAVOUR="${1}"
5+
6+
removeSnapshots() {
7+
sed -i 's/-SNAPSHOT//' gradle.properties
8+
}
9+
10+
echo "Publishing release to Maven Central"
11+
removeSnapshots
12+
13+
if [ "${FLAVOUR}" == 'javax' ]; then
14+
.github/add-javax-suffix.sh
15+
fi
16+
17+
./gradlew clean build publishToSonatype closeAndReleaseSonatypeStagingRepository

‎.github/replaceJakartaWithJavax.sh‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/bin/bash
2+
3+
# Set jdk11 as source and target
4+
sed -i 's/SOURCE_COMPATIBILITY=.*/SOURCE_COMPATIBILITY=11/' gradle.properties
5+
sed -i 's/TARGET_COMPATIBILITY=.*/TARGET_COMPATIBILITY=11/' gradle.properties
6+
7+
# Replace jakarta imports and dependencies with javax
8+
grep -rl 'import jakarta' ./graphql-java-servlet | xargs sed -i 's/import jakarta/import javax/g'
9+
sed -i 's/.*jakarta.websocket:jakarta.websocket-client-api.*//' graphql-java-servlet/build.gradle
10+
sed -i \
11+
's/jakarta.servlet:jakarta.servlet-api.*/javax.servlet:javax.servlet-api:$LIB_JAVAX_SERVLET"/' \
12+
graphql-java-servlet/build.gradle
13+
sed -i \
14+
's/jakarta.websocket.*/javax.websocket:javax.websocket-api:$LIB_JAVAX_WEBSOCKET"/' \
15+
graphql-java-servlet/build.gradle
16+
17+
# Final check if there are something else to replace
18+
grep -rl 'jakarta' ./graphql-java-servlet | xargs sed -i 's/jakarta/javax/g'
19+
20+
# Set the version 5 for spring framework
21+
sed -i \
22+
's/org.springframework:spring-test.*/org.springframework:spring-test:$LIB_SPRINGFRAMEWORK_5"/' \
23+
graphql-java-servlet/build.gradle
24+
sed -i \
25+
's/org.springframework:spring-web.*/org.springframework:spring-web:$LIB_SPRINGFRAMEWORK_5"/' \
26+
graphql-java-servlet/build.gradle
27+
28+
echo "Replaced jakarta occurrences with javax"

‎github-build.sh‎ renamed to ‎.github/tag-release.sh‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ removeSnapshots() {
1010
}
1111

1212
commitRelease() {
13-
local APP_VERSION=$(getVersion)
13+
local APP_VERSION
14+
APP_VERSION=$(getVersion)
1415
git commit -a -m "Update version for release"
1516
git tag -a "v${APP_VERSION}" -m "Tag release version"
1617
}
1718

1819
bumpVersion() {
1920
echo "Bump version number"
20-
local APP_VERSION=$(getVersion | xargs)
21+
local APP_VERSION
22+
APP_VERSION=$(getVersion | xargs)
2123
local SEMANTIC_REGEX='^([0-9]+)\.([0-9]+)(\.([0-9]+))?$'
2224
if [[ ${APP_VERSION} =~ ${SEMANTIC_REGEX} ]]; then
2325
if [[ ${BASH_REMATCH[4]} ]]; then
@@ -30,24 +32,17 @@ bumpVersion() {
3032

3133
echo "Next version: ${nextVersion}"
3234
sed -i -E "s/^version(\s)?=.*/version=${nextVersion}/" gradle.properties
35+
git commit -a -m "Bumped version for next release"
3336
else
3437
echo "No semantic version and therefore cannot publish to maven repository: '${APP_VERSION}'"
3538
fi
3639
}
3740

38-
commitNextVersion() {
39-
git commit -a -m "Update version for release"
40-
}
41-
4241
git config --global user.email "[email protected]"
4342
git config --global user.name "GitHub Actions"
4443

4544
echo "Deploying release to Maven Central"
4645
removeSnapshots
47-
48-
./gradlew clean build publishToSonatype closeAndReleaseSonatypeStagingRepository
49-
5046
commitRelease
5147
bumpVersion
52-
commitNextVersion
53-
git push --follow-tags
48+
git push --follow-tags

‎.github/workflows/pull-request.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
name: Gradle Wrapper Validation
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
12-
- uses: gradle/wrapper-validation-action@v1
11+
- uses: actions/checkout@v4
12+
- uses: gradle/wrapper-validation-action@v2
1313

1414
test:
1515
name: Test run
@@ -22,14 +22,14 @@ jobs:
2222
runs-on: ${{ matrix.os }}
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626
- name: Setup Java
27-
uses: actions/setup-java@v3
27+
uses: actions/setup-java@v4
2828
with:
2929
distribution: 'zulu'
3030
java-version: ${{ matrix.java }}
3131
- name: Cache Gradle
32-
uses: actions/cache@v3
32+
uses: actions/cache@v4
3333
env:
3434
java-version: ${{ matrix.java }}
3535
with:
@@ -56,26 +56,26 @@ jobs:
5656
env:
5757
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
5858
steps:
59-
- uses: actions/checkout@v3
59+
- uses: actions/checkout@v4
6060
if: env.SONAR_TOKEN != null
6161
with:
6262
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
6363
- name: Set up JDK 17
6464
if: env.SONAR_TOKEN != null
65-
uses: actions/setup-java@v3
65+
uses: actions/setup-java@v4
6666
with:
6767
distribution: 'zulu'
6868
java-version: 17
6969
- name: Cache SonarCloud packages
7070
if: env.SONAR_TOKEN != null
71-
uses: actions/cache@v3
71+
uses: actions/cache@v4
7272
with:
7373
path: ~/.sonar/cache
7474
key: ${{ runner.os }}-sonar
7575
restore-keys: ${{ runner.os }}-sonar
7676
- name: Cache Gradle packages
7777
if: env.SONAR_TOKEN != null
78-
uses: actions/cache@v3
78+
uses: actions/cache@v4
7979
with:
8080
path: ~/.gradle/caches
8181
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

‎.github/workflows/release.yml‎

Lines changed: 107 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ jobs:
66
name: Gradle Wrapper Validation
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
10-
- uses: gradle/wrapper-validation-action@v1
9+
- uses: actions/checkout@v4
10+
- uses: gradle/wrapper-validation-action@v2
1111

12-
test:
13-
name: Test run
12+
test-jakarta:
13+
name: Test run jakarta
1414
needs: validation
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
- name: Setup Java
20-
uses: actions/setup-java@v3
20+
uses: actions/setup-java@v4
2121
with:
2222
distribution: 'zulu'
2323
java-version: 17
2424
- name: Cache Gradle
25-
uses: actions/cache@v3
25+
uses: actions/cache@v4
2626
env:
2727
java-version: 17
2828
with:
@@ -37,20 +37,20 @@ jobs:
3737
- name: Gradle Check
3838
run: ./gradlew --info check
3939

40-
build:
41-
name: Publish release
42-
needs: test
40+
build-jakarta:
41+
name: Publish release jakarta
42+
needs: test-jakarta
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Checkout
46-
uses: actions/checkout@v3
46+
uses: actions/checkout@v4
4747
- name: Setup Java
48-
uses: actions/setup-java@v3
48+
uses: actions/setup-java@v4
4949
with:
5050
distribution: 'zulu'
5151
java-version: 17
5252
- name: Cache Gradle
53-
uses: actions/cache@v3
53+
uses: actions/cache@v4
5454
env:
5555
java-version: 17
5656
with:
@@ -60,18 +60,111 @@ jobs:
6060
key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
6161
restore-keys: |
6262
${{ runner.os }}-${{ env.java-version }}-gradle-
63+
- name: Prepare environment
64+
env:
65+
GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
66+
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.GPG_SIGNING_SECRET_KEY_RING_FILE }}
67+
run: sudo bash -c "echo '$GPG_KEY_CONTENTS' | base64 -d > '$SIGNING_SECRET_KEY_RING_FILE'"
68+
- name: Publish release
69+
env:
70+
SIGNING_KEY_ID: ${{ secrets.GPG_SIGNING_KEY_ID }}
71+
SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
72+
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.GPG_SIGNING_SECRET_KEY_RING_FILE }}
73+
OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
74+
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
75+
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@v4
84+
- name: Setup Java
85+
uses: actions/setup-java@v4
86+
with:
87+
distribution: 'zulu'
88+
java-version: 11
89+
- name: Cache Gradle
90+
uses: actions/cache@v4
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-
63100
- name: Make gradlew executable
64101
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@v4
114+
- name: Setup Java
115+
uses: actions/setup-java@v4
116+
with:
117+
distribution: 'zulu'
118+
java-version: 11
119+
120+
- name: Cache Gradle
121+
uses: actions/cache@v4
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-
65131
- name: Prepare environment
66132
env:
67133
GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
68134
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.GPG_SIGNING_SECRET_KEY_RING_FILE }}
69135
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
70138
- name: Publish release
71139
env:
72140
SIGNING_KEY_ID: ${{ secrets.GPG_SIGNING_KEY_ID }}
73141
SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
74142
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.GPG_SIGNING_SECRET_KEY_RING_FILE }}
75143
OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
76144
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
77-
run: bash github-build.sh
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@v4
153+
- name: Setup Java
154+
uses: actions/setup-java@v4
155+
with:
156+
distribution: 'zulu'
157+
java-version: 17
158+
- name: Cache Gradle
159+
uses: actions/cache@v4
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

0 commit comments

Comments
 (0)