Skip to content

Fix Maven sample builds and test resources - #409

Merged
artembilan merged 1 commit into
mainfrom
GH-7.2-PREP
Oct 20, 2026
Merged

artembilan merged 1 commit into
mainfrom
GH-7.2-PREP

Conversation

@cppwfs

@cppwfs cppwfs commented Oct 20, 2026

Copy link
Copy Markdown
Contributor

Main goal of this commit is to:

  • Update all Spring dependencies to current snapshots
  • Update all dependency versions
  • Make sure project compiles
  • Build all maven pom files then run each maven pom file
    • Verify all tests work if tests are present.
  • Modification made to make many tests run without having to start another service. Unless the test's intent was to test the app.
  • Remove outdated samples

  • Shared build configuration:
    • Advance the project version to 7.2.0-SNAPSHOT.
    • Update Spring Boot to 4.2.0-SNAPSHOT.
    • Update Spring Integration and Security to 7.2.0-SNAPSHOT.
    • Update Spring Framework to 7.1.0-SNAPSHOT.
    • Update Spring Cloud to 2026.0.0-SNAPSHOT.
    • Update Spring Web Flow to 4.0.2-SNAPSHOT.
    • Upgrade third-party dependencies and Kotlin and Protobuf plugins.
    • Align Boot dependency management with Framework and gRPC versions.
    • Align the Protobuf runtime version with the code generator.
    • Regenerate sample POMs to reflect the updated dependencies.
    • Set Maven's compiler release to Java 17.
    • Avoid duplicate dependencies that override compile scopes.
    • Preserve Boot main classes in generated POMs.
    • Generate Maven protobuf and gRPC plugin configuration.
  • basic/sftp, basic/tcp-client-server, and basic/zip:
    • Regenerate POMs with the Java 17 compiler setting.
  • intermediate/monitoring:
    • Regenerate the POM with the Java 17 compiler setting.
  • intermediate/retry-and-more:
    • Keep Mockito and Hamcrest available when compiling sample code.
    • Remove duplicate test-scoped entries from the generated POM.
    • Prevent those entries from overriding existing compile scopes.
    • Fix compilation failures caused by missing Mockito classes.
  • basic/testing-examples:
    • Move XML context files into Maven's test resources.
  • applications/cafe:
    • Add a reactor to resolve sibling dependencies together.
    • Document reactor build commands.
  • applications/cafe-scripted:
    • Declare the GraalPy dependency as type pom in the generated POM.
    • Resolve the Python runtime without requesting a nonexistent JAR.
  • dsl/cafe-dsl:
    • Configure the application main class in the POM.
    • Document building with the cafe reactor.
  • basic/barrier:
    • Use the RabbitMQ starter required by the sample.
    • Start RabbitMQ with Testcontainers for tests.
    • Skip tests when Docker is unavailable.
    • Configure the application main class in the POM.
    • Document the test container requirements.
  • basic/ftp:
    • Remove the obsolete suite filter to enable test discovery.
    • Prepare test files independently to remove ordering dependencies.
  • basic/grpc-client and basic/grpc-server:
    • Expose required dependencies on the compile classpath.
    • Generate protobuf messages and gRPC stubs during Maven builds.
    • Configure application main classes in the POMs.
  • basic/grpc-client:
    • Correct the application main class for packaging and execution.
  • basic/jpa:
    • Expose the persistence API on the compile classpath.
    • Configure the application main class in the POM.
  • basic/web-sockets:
    • Configure the application main class in the POM.
  • advanced/advanced-testing-examples:
    • Move the JMS mock context into the test resources.
    • Preserve its package path for Maven test context loading.
  • basic/amqp:
    • Replace the unavailable slf4j-jcl dependency.
    • Route SLF4J 2 logging through the existing Log4j 2 backend.
    • Align the logging provider version with Log4j Core.
    • Update the generated POM to fix Maven dependency resolution.
  • Remove si4demo because it uses twitter social that is no longer supported

Main goal of this commit is to:
- Update all Spring dependencies to current snapshots
- Update all dependency versions
- Make sure project compiles
- Build all maven pom files then run each maven pom file
  - Verify all tests work if tests are present.
- Modification made to make many tests run without having
  to start another service.  Unless the test's intent
  was to test the app.
- Remove outdated samples

************

- Shared build configuration:
  - Advance the project version to 7.2.0-SNAPSHOT.
  - Update Spring Boot to 4.2.0-SNAPSHOT.
  - Update Spring Integration and Security to 7.2.0-SNAPSHOT.
  - Update Spring Framework to 7.1.0-SNAPSHOT.
  - Update Spring Cloud to 2026.0.0-SNAPSHOT.
  - Update Spring Web Flow to 4.0.2-SNAPSHOT.
  - Upgrade third-party dependencies and Kotlin and Protobuf plugins.
  - Align Boot dependency management with Framework and gRPC versions.
  - Align the Protobuf runtime version with the code generator.
  - Regenerate sample POMs to reflect the updated dependencies.
  - Set Maven's compiler release to Java 17.
  - Avoid duplicate dependencies that override compile scopes.
  - Preserve Boot main classes in generated POMs.
  - Generate Maven protobuf and gRPC plugin configuration.
- basic/sftp, basic/tcp-client-server, and basic/zip:
  - Regenerate POMs with the Java 17 compiler setting.
- intermediate/monitoring:
  - Regenerate the POM with the Java 17 compiler setting.
- intermediate/retry-and-more:
  - Keep Mockito and Hamcrest available when compiling sample code.
  - Remove duplicate test-scoped entries from the generated POM.
  - Prevent those entries from overriding existing compile scopes.
  - Fix compilation failures caused by missing Mockito classes.
- basic/testing-examples:
  - Move XML context files into Maven's test resources.
- applications/cafe:
  - Add a reactor to resolve sibling dependencies together.
  - Document reactor build commands.
- applications/cafe-scripted:
  - Declare the GraalPy dependency as type pom in the generated POM.
  - Resolve the Python runtime without requesting a nonexistent JAR.
- dsl/cafe-dsl:
  - Configure the application main class in the POM.
  - Document building with the cafe reactor.
- basic/barrier:
  - Use the RabbitMQ starter required by the sample.
  - Start RabbitMQ with Testcontainers for tests.
  - Skip tests when Docker is unavailable.
  - Configure the application main class in the POM.
  - Document the test container requirements.
- basic/ftp:
  - Remove the obsolete suite filter to enable test discovery.
  - Prepare test files independently to remove ordering dependencies.
- basic/grpc-client and basic/grpc-server:
  - Expose required dependencies on the compile classpath.
  - Generate protobuf messages and gRPC stubs during Maven builds.
  - Configure application main classes in the POMs.
- basic/grpc-client:
  - Correct the application main class for packaging and execution.
- basic/jpa:
  - Expose the persistence API on the compile classpath.
  - Configure the application main class in the POM.
- basic/web-sockets:
  - Configure the application main class in the POM.
- advanced/advanced-testing-examples:
  - Move the JMS mock context into the test resources.
  - Preserve its package path for Maven test context loading.
- basic/amqp:
  - Replace the unavailable slf4j-jcl dependency.
  - Route SLF4J 2 logging through the existing Log4j 2 backend.
  - Align the logging provider version with Log4j Core.
  - Update the generated POM to fix Maven dependency resolution.
- Remove si4demo because it uses twitter social that is no longer supported
@cppwfs
cppwfs requested a review from artembilan October 20, 2026 14:38
@cppwfs cppwfs added the dependencies Pull requests that update a dependency file label Oct 20, 2026
@artembilan
artembilan merged commit 148c0ce into main Oct 20, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants