Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
- Rust QS enable dynamic toolchain/version support ([#1119](https://github.com/opendevstack/ods-quickstarters/issues/1119))

### Fixed

- Fix Springboot version parameter ([#1138](https://github.com/opendevstack/ods-quickstarters/issues/1138))

## [4.10.0] - 2025-10-13
### Changed
Expand Down
31 changes: 17 additions & 14 deletions be-java-springboot/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,25 @@ odsQuickstarterPipeline(

stage('Build spring project') {
dir(context.targetDir) {
def springBootVersion = '3.3.3'
def springBootVersion = '4.0.0'
echo "--- create spring boot (v${springBootVersion}) project via spring initializr ---"

sh "curl https://start.spring.io/starter.tgz \
-d type=gradle-project \
-d language=java \
-d dependencies='web,data-rest,data-jpa,h2,security,devtools' \
-d platformVersion=${springBootVersion} \
-d packaging=jar \
-d jvmVersion=${javaVersion} \
-d groupId=${context.projectId} \
-d artifactId=${context.componentId} \
-d name=${context.componentId} \
-d description='OpenDevStack%20Demo%20Project%20for%20Spring%20Boot' \
-d packageName='${context.packageName}' \
| tar -zxvf - "
def springInitializrUrl = "https://start.spring.io/starter.tgz?" +
"type=gradle-project&" +
"language=java&" +
"dependencies=web,data-rest,data-jpa,h2,security,devtools&" +
"bootVersion=${springBootVersion}&" +
"packaging=jar&" +
"jvmVersion=${javaVersion}&" +
"groupId=${context.projectId}&" +
"artifactId=${context.componentId}&" +
"name=${context.componentId}&" +
"description=OpenDevStack%20Demo%20Project%20for%20Spring%20Boot&" +
"packageName=${context.packageName}"

sh """
curl -L "${springInitializrUrl}" | tar -xzvf -
"""

echo "--- configure application.properties ---"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 5 additions & 5 deletions docs/modules/quickstarters/pages/be-java-springboot.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ The quickstarter uses the spring boot project generator service hosted by Spring

This is implemented in the quickstarter jenkins build script called `Jenkinsfile` (open it to understand the internal of the code generation of this quickstarter).

When provisioning this quickstarter in the provisioning app a spring boot project based on version `3.3.3` will be generated and pushed to your git repository.
When provisioning this quickstarter in the provisioning app a spring boot project based on version `4.0.0` will be generated and pushed to your git repository.

The generated project requires `java 21` and includes the required gradle build and wrapper artifact based on gradle version `8.10`.
The generated project requires `java 21` and includes the required gradle build and wrapper artifact based on gradle version `9.2.1`.

== Project Structure

Expand Down Expand Up @@ -111,7 +111,7 @@ version: 1.0.1
type: ods
role: backend
runtime: spring-boot
runtimeVersion: 3.3.3
runtimeVersion: 4.0.0
```

== How this quickstarter is built thru jenkins
Expand Down Expand Up @@ -149,9 +149,9 @@ The default version is `java 17`. This makes the agent backwards compatible.
If you are migrating an ODS-based spring boot project to `java 21` following instructions provide a some guidance about the typical steps to achieve this:

- change the agent version as indicated in https://github.com/opendevstack/ods-quickstarters/tree/master/common/jenkins-agents/jdk[jdk builder agent]
- upgrade the gradle wrapper to version `8.10` running this gradle command at the root folder of your spring project:
- upgrade the gradle wrapper to version `9.2.1` running this gradle command at the root folder of your spring project:
```
gradle wrapper --gradle-version 8.10 --distribution-type bin
gradle wrapper --gradle-version 9.2.1 --distribution-type bin
```
NOTE: this command use just `gradle` instead of the wrapper.

Expand Down