Skip to content

Commit dad26b8

Browse files
[Java][resttemplate] fix spring-web dependency for gradle without jakarta enabled
1 parent 8087f2b commit dad26b8

3 files changed

Lines changed: 24 additions & 4 deletions

File tree

.github/workflows/samples-java-client-jdk11.yaml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,26 @@ jobs:
110110
path: |
111111
~/.m2
112112
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
113-
- name: Build
113+
- name: Build with Maven
114114
working-directory: ${{ matrix.sample }}
115115
run: mvn clean package --no-transfer-progress
116+
117+
- name: Cache gradle dependencies
118+
uses: actions/cache@v4
119+
env:
120+
cache-name: gradle-caches
121+
with:
122+
path: ~/.gradle/caches
123+
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
124+
125+
- name: Cache gradle wrapper
126+
uses: actions/cache@v4
127+
env:
128+
cache-name: gradle-wrapper
129+
with:
130+
path: ~/.gradle/wrapper
131+
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
132+
133+
- name: Build
134+
working-directory: ${{ matrix.sample }}
135+
run: ./gradlew build -x test

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,12 @@ ext {
121121
jackson_databind_nullable_version = "0.2.6"
122122
{{/openApiNullable}}
123123
{{#useJakartaEe}}
124-
spring_web_version = "6.1.5"
124+
spring_web_version = "6.1.20"
125125
jakarta_annotation_version = "2.1.1"
126126
beanvalidation_version = "3.0.2"
127127
{{/useJakartaEe}}
128128
{{^useJakartaEe}}
129-
spring_web_version = "6.1.20"
129+
spring_web_version = "5.3.33"
130130
jakarta_annotation_version = "1.3.5"
131131
beanvalidation_version = "2.0.2"
132132
{{/useJakartaEe}}

samples/client/petstore/java/resttemplate/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ext {
100100
jackson_version = "2.17.1"
101101
jackson_databind_version = "2.17.1"
102102
jackson_databind_nullable_version = "0.2.6"
103-
spring_web_version = "6.1.20"
103+
spring_web_version = "5.3.33"
104104
jakarta_annotation_version = "1.3.5"
105105
beanvalidation_version = "2.0.2"
106106
jodatime_version = "2.9.9"

0 commit comments

Comments
 (0)