Skip to content

Conversation

@ireneGonzalezRuiz
Copy link
Contributor

No description provided.

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Oct 14, 2025

CLA Signed

The committers listed above are authorized under a signed CLA.

@ireneGonzalezRuiz ireneGonzalezRuiz force-pushed the iglezruiz/cargo-migration branch from 943a3ed to 766abb3 Compare October 15, 2025 15:44
@strehle strehle requested a review from Copilot October 16, 2025 05:19
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

Migrates from legacy Cargo/Tomcat setup to a Spring Boot-centric workflow and upgrades Gradle to 9.0.0.

  • Replace references from scripts/cargo to scripts/boot and remove legacy Cargo/Tomcat initializer code.
  • Upgrade Gradle wrapper to 9.0.0 and modernize build script with tasks.register and related adjustments.
  • Update scripts and docs for Boot-based local and integration test workflows.

Reviewed Changes

Copilot reviewed 14 out of 17 changed files in this pull request and generated 6 comments.

Show a summary per file
File Description
uaa/src/test/java/org/cloudfoundry/identity/uaa/login/BootstrapTests.java Points LOGIN_CONFIG_URL at scripts/boot/uaa.yml for tests.
uaa/src/test/java/org/cloudfoundry/identity/uaa/UaaWebApplicationInitializerTest.java Removes test for the legacy servlet initializer.
uaa/src/main/java/org/cloudfoundry/identity/uaa/UaaWebApplicationInitializer.java Removes the legacy servlet initializer (Tomcat/Cargo era).
uaa/src/main/java/org/cloudfoundry/experimental/boot/UaaBootApplication.java Updates comment to reference scripts/boot.
uaa/build.gradle Gradle 9 updates: task registration, repo syntax, test/doc tasks, and bootBuildImage config.
scripts/integration_tests.sh Always boots the Spring Boot app for integration tests; switches config to scripts/boot.
scripts/cargo/uaa.yml Removes legacy Cargo UAA config.
scripts/cargo/log4j2.properties Removes legacy Cargo logging config.
scripts/boot/boot-with-tls.sh Switches to scripts/boot config and inlines TLS server properties.
scripts/boot/application.yml Removes TLS/server properties that are now passed via system properties.
k8s/README.md Updates Docker examples to mount scripts/boot/uaa.yml.
gradle/wrapper/gradle-wrapper.properties Upgrades Gradle wrapper to 9.0.0.
dependencies.gradle Removes Cargo/Tomcat specific version pins and relies on BOM-managed versions; renames plugin var.
README.md Updates run/debug instructions to Spring Boot (bootRun) and new config paths.

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

…pts/boot/uaa.yml" correctly navigates from the uaa subdirectory up to the project root, then into scripts/boot/, so no need to use the classpath (which was not being loaded correctly and was making some tests to fail as this is some config needed for tests)
@fhanik
Copy link
Contributor

fhanik commented Oct 16, 2025

Questions

  1. Should ./gradlew integrationTest continue to work without having to manually start a container
  2. Should ./gradlew run be aliased to bootRun

@ireneGonzalezRuiz
Copy link
Contributor Author

Questions

  1. Should ./gradlew integrationTest continue to work without having to manually start a container
  2. Should ./gradlew run be aliased to bootRun

Thanks Filip, please find commit 7638cf1 to handle the bootRun alias. I'm still working on the 1. point (integrationTest gradle task), will update once it's ready.

@ireneGonzalezRuiz
Copy link
Contributor Author

ireneGonzalezRuiz commented Oct 20, 2025

Questions

  1. Should ./gradlew integrationTest continue to work without having to manually start a container
  2. Should ./gradlew run be aliased to bootRun

Please find changes to handle 1. question in 309ba12 - ./gradlew integrationTest now has no manual intervention: the integrationTest task now automatically starts UAA in the background before running tests, waits for it to be ready, and captures its PID. After tests complete (or fail), UAA is automatically stopped using the centralized killUaa script. Also, I added a skipUaaAutoStart flag so the existing Docker-based test script (integration-tests.sh) continues to work without conflicts, as it manages UAA startup independently.

@github-project-automation github-project-automation bot moved this from Inbox to Pending Merge | Prioritized in Foundational Infrastructure Working Group Oct 23, 2025
@fhanik fhanik merged commit 988253a into cloudfoundry:develop Oct 23, 2025
33 checks passed
@github-project-automation github-project-automation bot moved this from Pending Merge | Prioritized to Done in Foundational Infrastructure Working Group Oct 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Development

Successfully merging this pull request may close these issues.

3 participants