diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index ef208c018..fdad435f9 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -79,7 +79,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -91,7 +91,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -120,35 +120,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -156,6 +156,7 @@ 17 + 17 diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml b/advanced/advanced-testing-examples/src/test/resources/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml similarity index 100% rename from advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml rename to advanced/advanced-testing-examples/src/test/resources/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 33ad40eb0..a80d1ed66 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index d46c865dd..602327e16 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-tcp-client - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -112,259 +112,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -372,19 +323,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/applications/cafe-scripted/build.gradle b/applications/cafe-scripted/build.gradle index ce0ed1a4a..0df79df64 100644 --- a/applications/cafe-scripted/build.gradle +++ b/applications/cafe-scripted/build.gradle @@ -12,6 +12,15 @@ dependencies { api "org.apache.logging.log4j:log4j-core:$log4jVersion" } +publishing.publications.named('mavenJava') { + pom.withXml { + // GraalPy is a POM dependency that supplies the Python runtime transitively. + asNode().dependencies.dependency.find { + it.groupId.text() == 'org.graalvm.polyglot' && it.artifactId.text() == 'python' + }.appendNode('type', 'pom') + } +} + tasks.register('runCafeDemoApp', JavaExec) { mainClass = 'org.springframework.integration.samples.cafe.demo.CafeDemoApp' args project.hasProperty('lang') ? project.lang : '' diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 31cf1a03e..dde21cb3a 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -83,31 +83,32 @@ org.jruby jruby-complete - 9.4.14.0 + 9.4.15.0 compile org.graalvm.sdk graal-sdk - 25.0.2 + 25.0.4 compile org.graalvm.polyglot python - 25.0.2 + 25.0.4 compile + pom org.apache.groovy groovy-jsr223 - 5.0.3 + 5.1.3 compile org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -119,7 +120,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -148,35 +149,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -184,6 +185,7 @@ 17 + 17 diff --git a/applications/cafe/README.md b/applications/cafe/README.md index 3787b97e8..d5f87f1fa 100644 --- a/applications/cafe/README.md +++ b/applications/cafe/README.md @@ -25,6 +25,27 @@ The *Order* object may contain multiple *OrderItems*. Once the order is placed, The prepared drinks are then sent to the *Waiter* where they are aggregated into a *Delivery* object. +## Building with Maven + +The AMQP, JMS, and Java DSL samples depend on the shared `cafe-si` project. +Build them together from the repository root using the café reactor: + +```bash +mvn -f applications/cafe/pom.xml clean verify +``` + +To build one sample and its shared dependency, select it with `-pl` and `-am`: + +```bash +mvn -f applications/cafe/pom.xml -pl :cafe-amqp -am clean verify +mvn -f applications/cafe/pom.xml -pl :cafe-jms -am clean verify +mvn -f applications/cafe/pom.xml -pl :cafe-dsl -am clean verify +``` + +Maven builds `cafe-si` first and resolves it within the reactor; no prior `mvn install` is required. +Running Maven directly against a dependent sample's POM still requires `cafe-si` in the local repository. +The reactor POM is regenerated by `./gradlew :cafe:generatePom` or `./gradlew generatePom`. + ## Café Sample Implementations There are currently three implementations of the *Café Sample* that use: diff --git a/applications/cafe/build.gradle b/applications/cafe/build.gradle new file mode 100644 index 000000000..f0f6e5b85 --- /dev/null +++ b/applications/cafe/build.gradle @@ -0,0 +1,30 @@ +description = 'Cafe Samples' + +apply plugin: 'maven-publish' + +publishing { + publications { + mavenJava(MavenPublication) { + pom { + name = project.description + packaging = 'pom' + withXml { + asNode().appendNode('modules').with { + appendNode('module', 'cafe-si') + appendNode('module', 'cafe-amqp') + appendNode('module', 'cafe-jms') + appendNode('module', '../../dsl/cafe-dsl') + } + } + } + } + } +} + +tasks.named('generatePomFileForMavenJavaPublication') { + destination = file('pom.xml') +} + +tasks.register('generatePom') { + dependsOn('generatePomFileForMavenJavaPublication') +} diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 1a1253291..fbabaf649 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -63,7 +63,7 @@ org.springframework.integration.samples cafe-si - 7.1.0 + 7.2.0-SNAPSHOT compile @@ -74,7 +74,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -86,7 +86,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -115,35 +115,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -151,6 +151,7 @@ 17 + 17 diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index bea9450de..241538e7f 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -63,13 +63,13 @@ org.springframework.integration.samples cafe-si - 7.1.0 + 7.2.0-SNAPSHOT compile org.apache.activemq artemis-server - 2.52.0 + 2.57.0 compile @@ -81,7 +81,7 @@ org.apache.activemq artemis-jakarta-client - 2.52.0 + 2.57.0 compile @@ -98,7 +98,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -110,7 +110,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -139,35 +139,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -175,6 +175,7 @@ 17 + 17 diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 4f1972c86..a6525e5b8 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -73,7 +73,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -85,7 +85,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -114,35 +114,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -150,6 +150,7 @@ 17 + 17 diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml new file mode 100644 index 000000000..b144bdaeb --- /dev/null +++ b/applications/cafe/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + org.springframework.integration.samples + cafe + 7.2.0-SNAPSHOT + pom + Cafe Samples + + cafe-si + cafe-amqp + cafe-jms + ../../dsl/cafe-dsl + + diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 59b6251f0..63d70273f 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-split-ftp - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -106,7 +106,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -144,259 +144,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -404,19 +355,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.filesplit.Application + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 2f8c6df6c..80b42bff5 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 5dee878c5..c203f5e52 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -127,19 +127,19 @@ org.apache.commons commons-pool2 - 2.12.1 + 2.13.1 compile org.apache.tiles tiles-jsp - 2.2.1 + 2.2.2 compile joda-time joda-time - 2.14.0 + 2.15.0 compile @@ -163,7 +163,7 @@ org.hibernate.validator hibernate-validator - 9.0.1.Final + 9.1.5.Final compile @@ -175,19 +175,19 @@ org.hibernate.orm hibernate-core - 7.2.1.Final + 7.4.13.Final compile org.springframework.webflow spring-js-resources - 3.0.0 + 4.0.2-SNAPSHOT compile org.slf4j slf4j-api - 2.0.17 + 2.0.20 compile @@ -241,7 +241,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 runtime @@ -257,7 +257,7 @@ org.slf4j slf4j-log4j12 - 2.0.17 + 2.0.20 runtime @@ -273,7 +273,7 @@ org.slf4j jcl-over-slf4j - 2.0.17 + 2.0.20 runtime @@ -295,7 +295,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -324,35 +324,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -360,6 +360,7 @@ 17 + 17 diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index aca9f35ef..caaaff707 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stomp-chat - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -90,7 +90,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -122,259 +122,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -382,19 +333,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.chat.stomp.server.Application + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/basic/amqp/build.gradle b/basic/amqp/build.gradle index ff77b2123..257b6e322 100644 --- a/basic/amqp/build.gradle +++ b/basic/amqp/build.gradle @@ -4,7 +4,7 @@ dependencies { api 'org.springframework.integration:spring-integration-stream' api 'org.springframework.integration:spring-integration-amqp' api "org.apache.logging.log4j:log4j-core:$log4jVersion" - runtimeOnly "org.slf4j:slf4j-jcl:$slf4jVersion" + runtimeOnly "org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVersion" } tasks.register('runSimple', JavaExec) { diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 60f86a06c..805482ceb 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples amqp - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -73,13 +73,13 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile - org.slf4j - slf4j-jcl - 2.0.17 + org.apache.logging.log4j + log4j-slf4j2-impl + 2.26.1 runtime @@ -91,7 +91,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -120,35 +120,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -156,6 +156,7 @@ 17 + 17 diff --git a/basic/barrier/README.md b/basic/barrier/README.md index 64795f23d..d487ee6cb 100644 --- a/basic/barrier/README.md +++ b/basic/barrier/README.md @@ -24,6 +24,13 @@ qmqp(inbound) -> nullChannel The last flow drains the messages and allows the auto-delete queue to be removed when the application is closed. +## Running the test + +Run `./gradlew :barrier:test` from the repository root, or `mvn test` from this sample's directory. +The test uses Testcontainers to start and stop a temporary RabbitMQ container. +A running Docker daemon is required; if Docker is unavailable, the test is skipped. +The first run downloads the RabbitMQ image. + ## Running the sample diff --git a/basic/barrier/build.gradle b/basic/barrier/build.gradle index 76b59ab05..ce037ef59 100644 --- a/basic/barrier/build.gradle +++ b/basic/barrier/build.gradle @@ -7,12 +7,13 @@ description = 'Barrier Sample' dependencies { api 'org.springframework.boot:spring-boot-starter-web' api 'org.springframework.boot:spring-boot-starter-integration' - api 'org.springframework.boot:spring-boot-starter-amqp' + api 'org.springframework.boot:spring-boot-starter-rabbitmq' api 'org.springframework.integration:spring-integration-amqp' api 'org.springframework.integration:spring-integration-http' - testImplementation 'org.springframework.amqp:spring-rabbit-junit' testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation "org.testcontainers:testcontainers-junit-jupiter:$testcontainersVersion" + testImplementation "org.testcontainers:testcontainers-rabbitmq:$testcontainersVersion" } springBoot { diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 086b0b88c..ce7617ed2 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples barrier - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -73,7 +73,7 @@ org.springframework.boot - spring-boot-starter-amqp + spring-boot-starter-rabbitmq compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,13 +109,20 @@ test - org.springframework.amqp - spring-rabbit-junit + org.springframework.boot + spring-boot-starter-test test - org.springframework.boot - spring-boot-starter-test + org.testcontainers + testcontainers-junit-jupiter + 2.0.5 + test + + + org.testcontainers + testcontainers-rabbitmq + 2.0.5 test @@ -132,259 +139,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -392,19 +350,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.barrier.Application + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java b/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java index a307593bb..0f5f7c0d9 100644 --- a/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java +++ b/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java @@ -19,8 +19,10 @@ import java.util.Collections; import org.junit.jupiter.api.Test; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.rabbitmq.RabbitMQContainer; -import org.springframework.amqp.rabbit.junit.RabbitAvailable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.integration.channel.AbstractMessageChannel; @@ -28,6 +30,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; import static org.assertj.core.api.Assertions.assertThat; @@ -38,9 +42,20 @@ * @since 4.2 */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = Application.class) -@RabbitAvailable +@Testcontainers(disabledWithoutDocker = true) public class ApplicationTests { + @Container + static final RabbitMQContainer rabbit = new RabbitMQContainer("rabbitmq:4.1.0-alpine"); + + @DynamicPropertySource + static void rabbitProperties(DynamicPropertyRegistry registry) { + registry.add("spring.rabbitmq.host", rabbit::getHost); + registry.add("spring.rabbitmq.port", rabbit::getAmqpPort); + registry.add("spring.rabbitmq.username", rabbit::getAdminUsername); + registry.add("spring.rabbitmq.password", rabbit::getAdminPassword); + } + @Autowired MessageChannel receiveChannel; diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 8ea9f1619..e7cf3b64f 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 4b59dc583..1630c571c 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples enricher - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,13 +68,13 @@ com.h2database h2 - 2.4.240 + 2.5.252 compile org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -86,7 +86,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -115,35 +115,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -151,6 +151,7 @@ 17 + 17 diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index d03113f42..e9d42717c 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples feed - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/basic/file/pom.xml b/basic/file/pom.xml index cd18f6e99..0de14f63f 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/basic/ftp/build.gradle b/basic/ftp/build.gradle index 3c7f9fc34..e0b5aa33f 100644 --- a/basic/ftp/build.gradle +++ b/basic/ftp/build.gradle @@ -11,7 +11,3 @@ dependencies { testImplementation "org.apache.logging.log4j:log4j-core:$log4jVersion" testImplementation 'org.springframework.integration:spring-integration-test' } - -test { - include '**/TestSuite*' -} diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 638bf14ba..c2b092542 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ftp - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ commons-io commons-io - 2.21.0 + 2.22.0 compile @@ -80,13 +80,13 @@ org.slf4j slf4j-api - 2.0.17 + 2.0.20 compile org.slf4j slf4j-log4j12 - 2.0.17 + 2.0.20 runtime @@ -98,7 +98,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -114,7 +114,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 test @@ -133,35 +133,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -169,6 +169,7 @@ 17 + 17 diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/BaseFtpTest.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/BaseFtpTest.java index fbad419d3..1ef6cc10f 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/BaseFtpTest.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/BaseFtpTest.java @@ -17,6 +17,7 @@ package org.springframework.integration.samples.ftp; import java.io.File; +import java.io.IOException; import org.apache.commons.io.FileUtils; import org.apache.ftpserver.FtpServer; @@ -97,4 +98,11 @@ public static void shutDown() { FileUtils.deleteQuietly(new File(LOCAL_FTP_TEMP_DIR)); } + protected void prepareFtpFiles() throws IOException { + for (String filename : new String[] { "a.txt", "b.txt" }) { + FileUtils.copyInputStreamToFile(BaseFtpTest.class.getResourceAsStream("/test-files/" + filename), + new File(FTP_ROOT_DIR, filename)); + } + } + } diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSampleTests.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSampleTests.java index f3166c95e..7d96acfa4 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSampleTests.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSampleTests.java @@ -16,6 +16,8 @@ package org.springframework.integration.samples.ftp; +import java.io.IOException; + import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +41,8 @@ public class FtpInboundChannelAdapterSampleTests extends BaseFtpTest { private static final Logger LOGGER = LoggerFactory.getLogger(FtpInboundChannelAdapterSampleTests.class); @Test - public void runDemo() { + public void runDemo() throws IOException { + prepareFtpFiles(); ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext("META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml"); diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySampleTests.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySampleTests.java index 71622f2a7..f7f7cd06e 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySampleTests.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySampleTests.java @@ -29,8 +29,7 @@ /** * Demonstrates use of the outbound gateway to use ls, get and rm. *

- * The previous Test {@link FtpOutboundChannelAdapterSampleTest} was uploading 2 test - * files: + * This test prepares two files on the embedded FTP server: * *

    *
  • a.txt
    • @@ -49,6 +48,7 @@ public class FtpOutboundGatewaySampleTests extends BaseFtpTest { @Test public void testLsGetRm() throws Exception { + prepareFtpFiles(); ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext( "classpath:/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml"); diff --git a/basic/grpc-client/build.gradle b/basic/grpc-client/build.gradle index 75acd02ab..701d4f442 100644 --- a/basic/grpc-client/build.gradle +++ b/basic/grpc-client/build.gradle @@ -6,9 +6,9 @@ plugins { description = 'gRPC client Basic Sample' dependencies { - implementation 'org.springframework.boot:spring-boot-starter-integration' - implementation "org.springframework.boot:spring-boot-starter-grpc-client" - implementation 'org.springframework.integration:spring-integration-grpc' + api 'org.springframework.boot:spring-boot-starter-integration' + api "org.springframework.boot:spring-boot-starter-grpc-client" + api 'org.springframework.integration:spring-integration-grpc' //Test testImplementation "org.springframework.boot:spring-boot-starter-grpc-server-test" @@ -42,10 +42,10 @@ checkstyleTest { } springBoot { - mainClass = 'org.springframework.integration.samples.Application' + mainClass = 'org.springframework.integration.samples.grpc.client.Application' } tasks.register('run', JavaExec) { - mainClass = 'org.springframework.integration.samples.Application' + mainClass = 'org.springframework.integration.samples.grpc.client.Application' classpath = sourceSets.main.runtimeClasspath } diff --git a/basic/grpc-client/pom.xml b/basic/grpc-client/pom.xml index 130c68928..acf8ea73b 100644 --- a/basic/grpc-client/pom.xml +++ b/basic/grpc-client/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples grpc-client - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -64,17 +64,17 @@ org.springframework.boot spring-boot-starter-integration - runtime + compile org.springframework.boot spring-boot-starter-grpc-client - runtime + compile org.springframework.integration spring-integration-grpc - runtime + compile org.hamcrest @@ -85,7 +85,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -117,259 +117,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -377,19 +328,41 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.grpc.client.Application + + + + io.github.ascopes + protobuf-maven-plugin + + 4.36.2 + + src/main/proto + + + + io.grpc + protoc-gen-grpc-java + 1.85.0 + @generated=omit + + + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/basic/grpc-server/build.gradle b/basic/grpc-server/build.gradle index 8d8f946d1..80ad4899a 100644 --- a/basic/grpc-server/build.gradle +++ b/basic/grpc-server/build.gradle @@ -6,9 +6,9 @@ plugins { description = 'gRPC server Basic Sample' dependencies { - implementation 'org.springframework.boot:spring-boot-starter-integration' - implementation 'org.springframework.boot:spring-boot-starter-grpc-server' - implementation 'org.springframework.integration:spring-integration-grpc' + api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.boot:spring-boot-starter-grpc-server' + api 'org.springframework.integration:spring-integration-grpc' //Test testImplementation ('org.springframework.boot:spring-boot-starter-grpc-server-test') diff --git a/basic/grpc-server/pom.xml b/basic/grpc-server/pom.xml index 5516c57ac..d36de9a59 100644 --- a/basic/grpc-server/pom.xml +++ b/basic/grpc-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples grpc-server - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -64,17 +64,17 @@ org.springframework.boot spring-boot-starter-integration - runtime + compile org.springframework.boot spring-boot-starter-grpc-server - runtime + compile org.springframework.integration spring-integration-grpc - runtime + compile org.hamcrest @@ -85,7 +85,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -117,259 +117,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -377,19 +328,41 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.grpc.server.Application + + + + io.github.ascopes + protobuf-maven-plugin + + 4.36.2 + + src/main/proto + + + + io.grpc + protoc-gen-grpc-java + 1.85.0 + @generated=omit + + + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/basic/helloworld-groovy/pom.xml b/basic/helloworld-groovy/pom.xml index 7703a3966..f5f59c743 100644 --- a/basic/helloworld-groovy/pom.xml +++ b/basic/helloworld-groovy/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld-groovy - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -63,7 +63,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -96,7 +96,7 @@ org.apache.logging.log4j log4j-core-test - 2.25.4 + 2.26.1 test @@ -121,35 +121,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -157,6 +157,7 @@ 17 + 17 diff --git a/basic/helloworld-kotlin/pom.xml b/basic/helloworld-kotlin/pom.xml index d749aac3b..14bd5c57a 100644 --- a/basic/helloworld-kotlin/pom.xml +++ b/basic/helloworld-kotlin/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld-kotlin - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -64,45 +64,45 @@ org.jetbrains.kotlin kotlin-stdlib - 2.3.0 + 2.4.21 org.jetbrains.kotlin kotlin-reflect - 2.3.0 + 2.4.21 org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -112,7 +112,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -139,7 +139,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -155,7 +155,7 @@ org.apache.logging.log4j log4j-core-test - 2.25.4 + 2.26.1 test @@ -183,6 +183,7 @@ 17 + 17 @@ -203,7 +204,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - 2.3.0 + 2.4.21 -Xjsr305=strict @@ -232,7 +233,7 @@ org.jetbrains.kotlin kotlin-maven-allopen - 2.3.0 + 2.4.21 diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index dc4bde961..42c140dd3 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 889d201ce..9613c4f7b 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -84,7 +84,7 @@ commons-io commons-io - 2.21.0 + 2.22.0 compile @@ -96,7 +96,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -140,7 +140,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -169,35 +169,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -205,6 +205,7 @@ 17 + 17 diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 8ea53eccb..b1d4d2011 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,13 +68,13 @@ com.h2database h2 - 2.4.240 + 2.5.252 compile org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -86,7 +86,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -115,35 +115,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -151,6 +151,7 @@ 17 + 17 diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 19613a920..e84ca80cc 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -79,7 +79,7 @@ org.apache.activemq artemis-server - 2.52.0 + 2.57.0 compile @@ -91,13 +91,13 @@ org.apache.activemq artemis-jakarta-client - 2.52.0 + 2.57.0 compile org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -109,7 +109,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -138,35 +138,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -174,6 +174,7 @@ 17 + 17 diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index da8dd5a37..88e9146a2 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -73,7 +73,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -85,7 +85,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -114,35 +114,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -150,6 +150,7 @@ 17 + 17 diff --git a/basic/jpa/build.gradle b/basic/jpa/build.gradle index 9aeade2c3..0f2a901e8 100644 --- a/basic/jpa/build.gradle +++ b/basic/jpa/build.gradle @@ -11,9 +11,9 @@ dependencies { api 'org.springframework.boot:spring-boot-starter-data-jpa' api 'org.springframework.integration:spring-integration-jpa' api "com.h2database:h2:$h2Version" + api "jakarta.persistence:jakarta.persistence-api:$jpaApiVersion" runtimeOnly 'org.springframework:spring-instrument' - runtimeOnly "jakarta.persistence:jakarta.persistence-api:$jpaApiVersion" testImplementation 'org.springframework.boot:spring-boot-starter-test' } diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 3877a5b4b..75e4d3fc8 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jpa - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -74,18 +74,18 @@ com.h2database h2 - 2.4.240 + 2.5.252 compile - - org.springframework - spring-instrument - runtime - jakarta.persistence jakarta.persistence-api 3.2.0 + compile + + + org.springframework + spring-instrument runtime @@ -97,7 +97,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -129,259 +129,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -389,6 +340,7 @@ 17 + 17 @@ -401,7 +353,7 @@ org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 5cdee64a5..652771b54 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -90,7 +90,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -102,7 +102,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -134,259 +134,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -394,19 +345,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.kafka.Application + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 8635d57d4..e7ee39313 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -79,7 +79,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -91,7 +91,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -120,35 +120,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -156,6 +156,7 @@ 17 + 17 diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index ed497a028..c5b9a3d64 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,13 +68,13 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile org.mongodb mongodb-driver-sync - 5.6.2 + 5.13.0 compile @@ -86,7 +86,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -115,35 +115,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -151,6 +151,7 @@ 17 + 17 diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 97604dec3..b20d56845 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mqtt - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -91,7 +91,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -112,7 +112,7 @@ org.testcontainers testcontainers-junit-jupiter - 2.0.3 + 2.0.5 test @@ -129,259 +129,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -389,19 +340,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.mqtt.Application + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 6f4e79f0e..b8bcba970 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index fc1faa0a5..36dca05ae 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 4c81aca16..7b404d87e 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index b63bcf11f..c4950ebb6 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -73,19 +73,19 @@ org.slf4j slf4j-api - 2.0.17 + 2.0.20 compile org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 runtime org.slf4j slf4j-log4j12 - 2.0.17 + 2.0.20 runtime @@ -97,7 +97,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -126,35 +126,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -162,6 +162,7 @@ 17 + 17 diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 1156305d0..bda4d5ab3 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-broadcast - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -85,7 +85,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -117,259 +117,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -377,19 +328,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.tcpbroadcast.TcpBroadcastApplication + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 84d5983bb..078d8d383 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.commons commons-lang3 - 3.18.0 + 3.21.0 compile @@ -79,7 +79,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -91,7 +91,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -99,11 +99,6 @@ junit-jupiter-api test - - org.springframework.integration - spring-integration-test - test - org.junit.jupiter junit-jupiter-engine @@ -120,35 +115,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -156,6 +151,7 @@ 17 + 17 diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 0b2fc7416..bac6f5ced 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-with-headers - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -85,7 +85,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -117,259 +117,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -377,19 +328,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 4c119bfce..95c95e524 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -83,7 +83,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -124,35 +124,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -160,6 +160,7 @@ 17 + 17 diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests-context.xml b/basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests-context.xml similarity index 100% rename from basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests-context.xml rename to basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests-context.xml diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/chain/SpelChainTests-context.xml b/basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/chain/SpelChainTests-context.xml similarity index 100% rename from basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/chain/SpelChainTests-context.xml rename to basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/chain/SpelChainTests-context.xml diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests-context.xml b/basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/errorhandling/GatewayTests-context.xml similarity index 100% rename from basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests-context.xml rename to basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/errorhandling/GatewayTests-context.xml diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/externalgateway/ExternalGatewaySubstitutionTests-context.xml b/basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/externalgateway/ExternalGatewaySubstitutionTests-context.xml similarity index 100% rename from basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/externalgateway/ExternalGatewaySubstitutionTests-context.xml rename to basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/externalgateway/ExternalGatewaySubstitutionTests-context.xml diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests-context.xml b/basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/filter/PetFilterTests-context.xml similarity index 100% rename from basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests-context.xml rename to basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/filter/PetFilterTests-context.xml diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests-context.xml b/basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/gateway/GatewayTests-context.xml similarity index 100% rename from basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests-context.xml rename to basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/gateway/GatewayTests-context.xml diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests-context.xml b/basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/router/PetRouterTests-context.xml similarity index 100% rename from basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests-context.xml rename to basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/router/PetRouterTests-context.xml diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests-context.xml b/basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests-context.xml similarity index 100% rename from basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests-context.xml rename to basic/testing-examples/src/test/resources/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests-context.xml diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 3eb850cf6..8b29439b7 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -81,7 +81,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -110,35 +110,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -146,6 +146,7 @@ 17 + 17 diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index b8e3532ab..657fbfeac 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples web-sockets - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -85,7 +85,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -117,259 +117,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -377,19 +328,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.websocket.standard.server.Application + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index c51843abc..087ef888f 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -122,7 +122,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -151,35 +151,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -187,6 +187,7 @@ 17 + 17 diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 12d6e592c..2e91041b2 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -73,7 +73,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -85,7 +85,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -114,35 +114,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -150,6 +150,7 @@ 17 + 17 diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 724e48bec..e1d204572 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index dd59ca3ca..e8b5e4f19 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/basic/zip/pom.xml b/basic/zip/pom.xml index 00e3a5f6c..07edc9adc 100644 --- a/basic/zip/pom.xml +++ b/basic/zip/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples zip - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-slf4j2-impl - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/build.gradle b/build.gradle index a94455b78..d1fa0dd83 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - kotlinVersion = '2.3.0' + kotlinVersion = '2.4.21' } repositories { mavenCentral() @@ -14,7 +14,7 @@ buildscript { classpath 'org.gretty:gretty:4.1.10' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion" - classpath "com.google.protobuf:protobuf-gradle-plugin:0.9.6" + classpath "com.google.protobuf:protobuf-gradle-plugin:0.10.0" } } @@ -133,7 +133,10 @@ subprojects { subproject -> url = linkIssue } withXml { - asNode().appendNode('properties').appendNode('java.version', '17') + asNode().appendNode('properties').with { + appendNode('java.version', '17') + appendNode('maven.compiler.release', '17') + } if (subproject.plugins.hasPlugin('org.akhikhl.gretty')) { asNode().appendNode('packaging', 'war') def plugins = asNode().build?.find()?.plugins?.find() @@ -160,8 +163,29 @@ subprojects { subproject -> .with { appendNode('groupId', 'org.springframework.boot') appendNode('artifactId', 'spring-boot-maven-plugin') + def mainClass = subproject.springBoot.mainClass.orNull + if (mainClass) { + appendNode('configuration').appendNode('mainClass', mainClass) + } } + if (subproject.plugins.hasPlugin('com.google.protobuf')) { + plugins.appendNode('plugin').with { + appendNode('groupId', 'io.github.ascopes') + appendNode('artifactId', 'protobuf-maven-plugin') + appendNode('configuration').with { + appendNode('protoc', property('protobufVersion')) + appendNode('sourceDirectories').appendNode('sourceDirectory', 'src/main/proto') + appendNode('plugins').appendNode('plugin', [kind: 'binary-maven']).with { + appendNode('groupId', 'io.grpc') + appendNode('artifactId', 'protoc-gen-grpc-java') + appendNode('version', property('grpcVersion')) + appendNode('options', '@generated=omit') + } + } + } + } + asNode().appendNode('parent').with { appendNode('groupId', 'org.springframework.boot') appendNode('artifactId', 'spring-boot-starter-parent') @@ -238,7 +262,9 @@ subprojects { subproject -> if (!pomDeps) { pomDeps = asNode().appendNode('dependencies') } - subproject.configurations.testImplementation.dependencies.each { dep -> + subproject.configurations.testImplementation.dependencies.findAll { dep -> + !pomDeps.dependency.any { it.groupId.text() == dep.group && it.artifactId.text() == dep.name } + }.each { dep -> pomDeps.appendNode('dependency').with { appendNode('groupId', dep.group) appendNode('artifactId', dep.name) @@ -248,7 +274,9 @@ subprojects { subproject -> appendNode('scope', 'test') } } - subproject.configurations.testRuntimeOnly.dependencies.each { dep -> + subproject.configurations.testRuntimeOnly.dependencies.findAll { dep -> + !pomDeps.dependency.any { it.groupId.text() == dep.group && it.artifactId.text() == dep.name } + }.each { dep -> pomDeps.appendNode('dependency').with { appendNode('groupId', dep.group) appendNode('artifactId', dep.name) @@ -288,57 +316,62 @@ subprojects { subproject -> } ext { - artemisVersion = '2.52.0' + artemisVersion = '2.57.0' aspectjVersion = '1.9.25.1' assertjVersion = '3.27.7' awaitilityVersion = '4.3.0' commonsDigesterVersion = '2.1' commonsDbcpVersion = '2.14.0' commonsFileUploadVersion = '1.6.0' - commonsIoVersion = '2.21.0' - commonsLangVersion = '3.18.0' - commonsPoolVersion = '2.12.1' - c3p0Version = '0.14.0' + commonsIoVersion = '2.22.0' + commonsLangVersion = '3.21.0' + commonsPoolVersion = '2.13.1' + c3p0Version = '0.14.2' derbyVersion = '10.16.1.1' hamcrestVersion = '2.2' - hibernateVersion = '7.2.1.Final' - hibernateValidatorVersion = '9.0.1.Final' + hibernateVersion = '7.4.13.Final' + hibernateValidatorVersion = '9.1.5.Final' ftpServerVersion = '1.2.1' flexjsonVersion = '3.3' - graalvmVersion = '25.0.2' - groovyVersion = '5.0.3' - grpcVersion = '1.79.0' + graalvmVersion = '25.0.4' + groovyVersion = '5.1.3' + grpcVersion = '1.85.0' hsqldbVersion = '2.7.4' - h2Version = '2.4.240' - jacksonVersion = '2.21.0' - jackson3Version = '3.0.3' - jaxbVersion = '4.0.5' - jodaTimeVersion = '2.14.0' + h2Version = '2.5.252' + jacksonVersion = '2.22.4' + jackson3Version = '3.2.4' + jaxbVersion = '4.0.9' + jodaTimeVersion = '2.15.0' jtaVersion = '2.0.1' jtdsVersion = '1.3.1' jmsApiVersion = '3.1.0' - jrubyVersion = '9.4.14.0' + jrubyVersion = '9.4.15.0' jpaApiVersion = '3.2.0' jstlVersion = '1.2' - junitJupiterVersion = '6.0.2' - log4jVersion = '2.25.4' + junitJupiterVersion = '6.1.3' + log4jVersion = '2.26.1' mailVersion = '2.0.5' - mockitoVersion = '5.21.0' - mongoDriverVersion = '5.6.2' - oracleDriverVersion = '23.26.0.0.0' - postgresVersion = '42.7.12' - protobufVersion = '4.29.4' - slf4jVersion = '2.0.17' - springCloudVersion = '2025.1.0' - springIntegrationVersion = '7.1.0-SNAPSHOT' + mockitoVersion = '5.24.0' + mongoDriverVersion = '5.13.0' + oracleDriverVersion = '23.26.3.0.0' + postgresVersion = '42.7.14' + protobufVersion = '4.36.2' + slf4jVersion = '2.0.20' + springCloudVersion = '2026.0.0-SNAPSHOT' + springIntegrationVersion = '7.2.0-SNAPSHOT' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '7.0.5' - springSecurityVersion = '7.1.0-SNAPSHOT' - springWebFlowVersion = '3.0.0' - testcontainersVersion = '2.0.3' - tilesJspVersion = '2.2.1' + springVersion = '7.1.0-SNAPSHOT' + springSecurityVersion = '7.2.0-SNAPSHOT' + springWebFlowVersion = '4.0.2-SNAPSHOT' + testcontainersVersion = '2.0.5' + tilesJspVersion = '2.2.2' + + // Align Spring Boot dependency management with the framework and code generators. + set('spring-framework.version', "$springVersion") + set('protobuf-java.version', "$protobufVersion") + set('grpc-java.version', "$grpcVersion") } sourceSets.each { diff --git a/dsl/cafe-dsl/README.md b/dsl/cafe-dsl/README.md index f2e051d25..082f6e366 100644 --- a/dsl/cafe-dsl/README.md +++ b/dsl/cafe-dsl/README.md @@ -5,6 +5,14 @@ This sample demonstrates the classical Cafe Demo, but it is based on [Spring Int See the `cafe` project **README.md** for more details about the domain and the Cafe algorithm. +## Build with Maven + +From the repository root, build this sample and its shared `cafe-si` dependency together: + +```bash +mvn -f applications/cafe/pom.xml -pl :cafe-dsl -am clean verify +``` + ## Run the Sample * You need Java 8 to run this sample, because it is based on Lambdas. diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index b49aa08ba..eb3410b77 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-dsl - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -64,7 +64,7 @@ org.springframework.integration.samples cafe-si - 7.1.0 + 7.2.0-SNAPSHOT compile @@ -91,7 +91,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -123,259 +123,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -383,19 +334,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.dsl.cafe.lambda.Application + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index d4ed18519..d1c5bd0f1 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka-dsl - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -84,7 +84,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -96,7 +96,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -128,259 +128,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -388,19 +339,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.dsl.kafka.Application + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/dsl/si4demo/README.md b/dsl/si4demo/README.md deleted file mode 100644 index d3f042ff2..000000000 --- a/dsl/si4demo/README.md +++ /dev/null @@ -1,81 +0,0 @@ -# Spring Integration 4.0/4.1 Java Config/DSL Demo - -This sample is the demo used in the [Spring Integration 4.0 Webinar](https://spring.io/blog/2014/05/15/webinar-replay-spring-integration-4-0-the-new-frontier) and SpringOne/2GX 2014. - -There are two demo applications from the webinar: - -__org.springframework.integration.samples.javaconfig.annotations.Application__ is a Spring Boot application using -Spring Integration 4.0 Java configuration features. - -__org.springframework.integration.samples.javaconfig.dsl.Application__ is the equivalent application using Java DSL. - - -In both cases, you can use Telnet or curl to search twitter - - - $ telnet localhost 9876 - Trying 127.0.0.1... - Connected to localhost. - Escape character is '^]'. - #springintegration - [{"extraData":{},"id":461548132401438720,"text":"RT @gprussell: Spring Integration 4.0.0.RELEASE is out! ... - - $ curl http://localhost:8080/foo -H"content-type:text/plain" -d '#springintegration' - [{"extraData":{},"id":461548132401438720,"text":"RT @gprussell: Spring Integration 4.0.0.RELEASE is out! ... - -The DSL version also accepts typing in a hashtag for the search in the console. The DSL version also adds a filter to only allow hashtags starting with `#spring`, and only returns the first tweet. - -Twitter now requires authentication to perform searches; visit the [twitter developer site](https://dev.twitter.com) to set up the application and enter the keys/secrets in _application.yml_ on the classpath. An 'empty' yaml file is provided in _src/main/resources: - - twitter: - oauth: - consumerKey: - consumerSecret: - accessToken: - accessTokenSecret: - - - -# SpringOne/2GX 2014 - -Additional examples were added to this project at __SpringOne2GX 2014__ - see the __springone__ package. - -This demonstrates moving from completely XML configuration, through Java Configuration, and ultimately to the DSL. - -## AXML - -This example is pure XML - it's a simple flow... - - gateway -> transformer -> service-activator - -The transformer concatenates the payload to itself (String), the service upper cases the payload. The result is returned to the gateway. "foo" becomes "FOOFOO". - -## BXMLAndPojo - -This takes the same example and shows how to configure it using "classic" Spring Integration annotations, available since 2.0. - -## CNoXML - -This takes the same example and configures it using standard Java Configuration (available since 4.0). Many of the standard annotations are now available on __@Bean__ definitions; note that the output channel must be configured on the handler, not the annotation. __@IntegrationComponentScan__ detects __@MessagingGateway__ interfaces and creates gateways. - -## DBoot - -This takes the same example as __C...__ and configures it using Spring Boot. The configuration is slightly more concise. - -Note: Other applications in this project use the embedded web server (for http adapters). The boot apps in this section disable the embedded server by using the __SpringApplicationBuilder__ ... - - new SpringApplicationBuilder(DBoot.class) - .web(false) - .run(args); - -## EDSL - -This takes the same example and configures it using the Spring Integration Java DSL. It requires Spring Integration 4.1.0.M1 and DSL 1.0.0.M3. - -## FMail - -This adds a recipient list router and sends a copy of the payload to an SMTP Email server (add credentials to __application.yml__). - -## GIMAP - -This is a separate application that demonstrates the DSL configuring an IMAP idle channel adapter, to receive emails sent by __FEmail__. diff --git a/dsl/si4demo/build.gradle b/dsl/si4demo/build.gradle deleted file mode 100644 index 5a4804026..000000000 --- a/dsl/si4demo/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -description = 'Java Configuration/DSL Sample' - -apply plugin: 'org.springframework.boot' - -dependencies { - api 'org.springframework.boot:spring-boot-starter-web' - api 'org.springframework.boot:spring-boot-starter-integration' - api 'org.springframework.integration:spring-integration-mail' - api "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - api 'org.springframework.integration:spring-integration-http' - api 'org.springframework.integration:spring-integration-ip' - api "org.eclipse.angus:jakarta.mail:$mailVersion" - api 'com.rometools:rome:2.1.0' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' -} - -springBoot { - mainClass = 'org.springframework.integration.samples.si4demo.dsl.Application' -} - -tasks.withType(JavaExec) { - standardInput = System.in -} diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml deleted file mode 100644 index fd7ea1130..000000000 --- a/dsl/si4demo/pom.xml +++ /dev/null @@ -1,434 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - si4demo - 7.1.0 - jar - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - artem.bilan@broadcom.com - - project lead - - - - garyrussell - Gary Russell - github@gprussell.net - - project lead emeritus - - - - markfisher - Mark Fisher - mark.ryan.fisher@gmail.com - - project founder and lead emeritus - - - - cppwfs - Glenn Renfro - glenn.renfro@broadcom.com - - project committer - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.boot - spring-boot-starter-web - compile - - - org.springframework.boot - spring-boot-starter-integration - compile - - - org.springframework.integration - spring-integration-mail - compile - - - org.springframework.integration - spring-integration-social-twitter - 1.0.1.BUILD-SNAPSHOT - compile - - - org.springframework.integration - spring-integration-http - compile - - - org.springframework.integration - spring-integration-ip - compile - - - org.eclipse.angus - jakarta.mail - 2.0.5 - compile - - - com.rometools - rome - 2.1.0 - compile - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.21.0 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - - - - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT - - - org.springframework.boot - spring-boot-dependencies - 4.1.0-SNAPSHOT - import - pom - - - org.junit - junit-bom - 6.0.2 - import - pom - - - tools.jackson - jackson-bom - 3.0.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.21.0 - import - pom - - - org.springframework - spring-framework-bom - 7.0.5 - import - pom - - - org.springframework.integration - spring-integration-bom - 7.1.0-SNAPSHOT - import - pom - - - - - 17 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - org.springframework.boot - spring-boot-starter-parent - 4.1.0-SNAPSHOT - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java deleted file mode 100644 index a5ea770fb..000000000 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright 2014-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.si4demo.annotations; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; -import org.springframework.http.HttpMethod; -import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.annotation.Transformer; -import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.http.inbound.HttpRequestHandlingMessagingGateway; -import org.springframework.integration.http.inbound.RequestMapping; -import org.springframework.integration.ip.tcp.connection.TcpNetServerConnectionFactory; -import org.springframework.integration.ip.tcp.inbound.TcpInboundGateway; -import org.springframework.integration.json.ObjectToJsonTransformer; -import org.springframework.integration.transformer.ObjectToStringTransformer; -import org.springframework.integration.twitter.outbound.TwitterSearchOutboundGateway; -import org.springframework.messaging.MessageChannel; -import org.springframework.social.twitter.api.Twitter; -import org.springframework.social.twitter.api.impl.TwitterTemplate; - -/** - * - * Spring Boot app offering telnet and http access to twitter search. Uses - * Spring Integration 4.0 Java Configuration. - * - * 
    - * $ telnet localhost 9876
- * Trying 127.0.0.1...
- * Connected to localhost.
- * Escape character is '^]'.
- * #springintegration
- * [{"extraData":{},"id":461548132401438720,"text":"RT @gprussell: Spring Integration 4.0.0.RELEASE is out! ...
- *
    - * - * 
    - * $ curl http://localhost:8080/foo -H"content-type:text/plain" -d '#springintegration'
- * [{"extraData":{},"id":461548132401438720,"text":"RT @gprussell: Spring Integration 4.0.0.RELEASE is out! ...
- *
    - * - * @author Gary Russell - * @author Artem Bilan - * - * @since 4.0 - * - */ -@Configuration -@ComponentScan -@EnableAutoConfiguration -public class Application { - - public static void main(String[] args) throws Exception { - ConfigurableApplicationContext ctx = SpringApplication.run(Application.class, args); - System.in.read(); - ctx.close(); - } - - @Autowired - private Environment env; - - @Bean - TcpNetServerConnectionFactory cf() { - return new TcpNetServerConnectionFactory(9876); - } - - @Bean - TcpInboundGateway tcpGate() { - TcpInboundGateway gateway = new TcpInboundGateway(); - gateway.setConnectionFactory(cf()); - gateway.setRequestChannel(requestChannel()); - return gateway; - } - - @Bean - public HttpRequestHandlingMessagingGateway httpGate() { - HttpRequestHandlingMessagingGateway gateway = new HttpRequestHandlingMessagingGateway(true); - RequestMapping mapping = new RequestMapping(); - mapping.setMethods(HttpMethod.POST); - mapping.setPathPatterns("/foo"); - gateway.setRequestMapping(mapping); - gateway.setRequestChannel(requestChannel()); - gateway.setRequestPayloadTypeClass(byte[].class); - return gateway; - } - - @Bean - public MessageChannel requestChannel() { - return new DirectChannel(); - } - -/* - * This was the first demonstration - an echo service before - * we added twitter. - */ -// @MessageEndpoint -// public static class Echo { -// -// @ServiceActivator(inputChannel="requestChannel") -// public String echo(byte[] in) { -// return "echo:" + new String(in); -// } -// } - - @Bean - @Transformer(inputChannel = "requestChannel", outputChannel = "searchChannel") - public org.springframework.integration.transformer.Transformer convertToString() { - return new ObjectToStringTransformer(); - } - - @Bean - public MessageChannel searchChannel() { - return new DirectChannel(); - } - - @Bean - @ServiceActivator(inputChannel = "searchChannel") - public TwitterSearchOutboundGateway twitterGate() { - TwitterSearchOutboundGateway gateway = new TwitterSearchOutboundGateway(twitter()); - gateway.setOutputChannel(toJsonChannel()); - return gateway; - } - - @Bean - public MessageChannel toJsonChannel() { - return new DirectChannel(); - } - - @Bean - @Transformer(inputChannel = "toJsonChannel") - public org.springframework.integration.transformer.Transformer convertToJson() { - return new ObjectToJsonTransformer(); - } - - @Bean - public Twitter twitter() { - return new TwitterTemplate(this.env.getProperty("twitter.oauth.consumerKey"), - this.env.getProperty("twitter.oauth.consumerSecret"), - this.env.getProperty("twitter.oauth.accessToken"), - this.env.getProperty("twitter.oauth.accessTokenSecret")); - } - -} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java deleted file mode 100644 index 40987dcc7..000000000 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright 2014-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.si4demo.dsl; - -import java.util.Scanner; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.DependsOn; -import org.springframework.core.env.Environment; -import org.springframework.http.HttpMethod; -import org.springframework.integration.annotation.IntegrationComponentScan; -import org.springframework.integration.annotation.MessagingGateway; -import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.http.inbound.HttpRequestHandlingMessagingGateway; -import org.springframework.integration.http.inbound.RequestMapping; -import org.springframework.integration.ip.tcp.connection.TcpNetServerConnectionFactory; -import org.springframework.integration.ip.tcp.inbound.TcpInboundGateway; -import org.springframework.integration.json.ObjectToJsonTransformer; -import org.springframework.integration.transformer.ObjectToStringTransformer; -import org.springframework.integration.twitter.outbound.TwitterSearchOutboundGateway; -import org.springframework.messaging.MessageChannel; -import org.springframework.social.twitter.api.Twitter; -import org.springframework.social.twitter.api.impl.TwitterTemplate; - -/** - * - * Spring Boot app offering telnet and http access to twitter search. Uses the Spring Integration 4.0 Java DSL extension. - * Adds a filter and only returns the first tweet. - * - * 
    - * $ telnet localhost 9876
- * Trying 127.0.0.1...
- * Connected to localhost.
- * Escape character is '^]'.
- * #springintegration
- * [{"extraData":{},"id":461548132401438720,"text":"RT @gprussell: Spring Integration 4.0.0.RELEASE is out! ...
- *
    - * - * 
    - * $ curl http://localhost:8080/foo -H"content-type:text/plain" -d '#springintegration'
- * [{"extraData":{},"id":461548132401438720,"text":"RT @gprussell: Spring Integration 4.0.0.RELEASE is out! ...
- *
    - * - * It also supports typing a hashtag into the console. - * - * @author Gary Russell - * @author Artem Bilan - * - * @since 4.0 - * - */ -@Configuration -@ComponentScan -@IntegrationComponentScan -@EnableAutoConfiguration -public class Application { - - private static final Log LOGGER = LogFactory.getLog(Application.class); - - public static void main(String[] args) throws Exception { - ConfigurableApplicationContext ctx = SpringApplication.run(Application.class, args); - Scanner scanner = new Scanner(System.in); - String hashTag = scanner.nextLine(); - LOGGER.info(ctx.getBean(Gateway.class).sendReceive(hashTag)); - scanner.close(); - ctx.close(); - } - - @Autowired - private Environment env; - - @Bean - TcpNetServerConnectionFactory cf() { - return new TcpNetServerConnectionFactory(9876); - } - - @Bean - TcpInboundGateway tcpGate() { - TcpInboundGateway gateway = new TcpInboundGateway(); - gateway.setConnectionFactory(cf()); - gateway.setRequestChannel(requestChannel()); - return gateway; - } - - @Bean - public HttpRequestHandlingMessagingGateway httpGate() { - HttpRequestHandlingMessagingGateway gateway = new HttpRequestHandlingMessagingGateway(true); - RequestMapping mapping = new RequestMapping(); - mapping.setMethods(HttpMethod.POST); - mapping.setPathPatterns("/foo"); - gateway.setRequestMapping(mapping); - gateway.setRequestChannel(requestChannel()); - gateway.setRequestPayloadTypeClass(byte[].class); - return gateway; - } - - @Bean - public MessageChannel requestChannel() { - return new DirectChannel(); - } - - @Bean - @DependsOn("errorFlow") - public IntegrationFlow flow() { - return IntegrationFlow.from("requestChannel") - .transform(new ObjectToStringTransformer()) - .filter((String p) -> p.startsWith("#spring"), - f -> f.discardChannel("rejected")) - .handle(twitterGate()) - .transform("payload[0]") - .transform(new ObjectToJsonTransformer()) - .get(); - } - - @Bean - public IntegrationFlow errorFlow() { - return IntegrationFlow.from("rejected") - .transform("'Error: hashtag must start with #spring; got' + payload") - .get(); - } - - @Bean - public TwitterSearchOutboundGateway twitterGate() { - return new TwitterSearchOutboundGateway(twitter()); - } - - @Bean - public Twitter twitter() { - return new TwitterTemplate(this.env.getProperty("twitter.oauth.consumerKey"), - this.env.getProperty("twitter.oauth.consumerSecret"), - this.env.getProperty("twitter.oauth.accessToken"), - this.env.getProperty("twitter.oauth.accessTokenSecret")); - } - - @MessagingGateway(defaultRequestChannel = "requestChannel") - public interface Gateway { - - String sendReceive(String in); - - } - -} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/GMailProperties.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/GMailProperties.java deleted file mode 100644 index 913257922..000000000 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/GMailProperties.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2014-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.si4demo.springone; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * @author Gary Russell - * - */ -@Component -@ConfigurationProperties(prefix = "gmail") -public class GMailProperties { - - private String user; - - private String password; - - public String getUser() { - return this.user; - } - - public void setUser(String user) { - this.user = user; - } - - public String getPassword() { - return this.password; - } - - public void setPassword(String password) { - this.password = password; - } - -} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/a/AXML.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/a/AXML.java deleted file mode 100644 index c7bb7d09b..000000000 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/a/AXML.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2014-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.si4demo.springone.a; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * - * @author Gary Russell - * - */ -public final class AXML { - - private static final Log LOGGER = LogFactory.getLog(AXML.class); - - private AXML() { - } - - public static void main(String[] args) throws Exception { - ConfigurableApplicationContext ctx = - new ClassPathXmlApplicationContext("AXML-context.xml"); - LOGGER.info(ctx.getBean(FooService.class).foo("foo")); - ctx.close(); - } - - public interface FooService { - - String foo(String request); - - } - -} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/b/BXMLAndPojo.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/b/BXMLAndPojo.java deleted file mode 100644 index fb2bdd58e..000000000 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/b/BXMLAndPojo.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 2014-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.si4demo.springone.b; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.annotation.MessageEndpoint; -import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.annotation.Transformer; - -/** - * - * @author Gary Russell - * - */ -public final class BXMLAndPojo { - - private static final Log LOGGER = LogFactory.getLog(BXMLAndPojo.class); - - private BXMLAndPojo() { - } - - public static void main(String[] args) throws Exception { - ConfigurableApplicationContext ctx = - new ClassPathXmlApplicationContext("BXMLAndPojo-context.xml"); - LOGGER.info(ctx.getBean(FooService.class).foo("foo")); - ctx.close(); - } - - public interface FooService { - - String foo(String request); - - } - - @MessageEndpoint - public static class MyComponents { - - @Transformer(inputChannel = "foo", outputChannel = "bar") - public String transform(String foo) { - return foo + foo; - } - - @ServiceActivator(inputChannel = "bar") - public String service(String foo) { - return foo.toUpperCase(); - } - - } - -} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/c/CNoXML.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/c/CNoXML.java deleted file mode 100644 index 93714f1af..000000000 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/c/CNoXML.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright 2014-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.si4demo.springone.c; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.integration.annotation.IntegrationComponentScan; -import org.springframework.integration.annotation.MessagingGateway; -import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.annotation.Transformer; -import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.config.EnableIntegration; -import org.springframework.integration.handler.ServiceActivatingHandler; -import org.springframework.integration.transformer.MessageTransformingHandler; -import org.springframework.integration.transformer.MethodInvokingTransformer; -import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.MessageHandler; - -/** - * - * @author Gary Russell - * - */ -public final class CNoXML { - - private static final Log LOGGER = LogFactory.getLog(CNoXML.class); - - private CNoXML() { - } - - public static void main(String[] args) throws Exception { - ConfigurableApplicationContext ctx = - new AnnotationConfigApplicationContext(CConfig.class); - LOGGER.info(ctx.getBean(FooService.class).foo("foo")); - ctx.close(); - } - - @MessagingGateway(defaultRequestChannel = "foo") - public interface FooService { - - String foo(String request); - - } - - @Configuration - @EnableIntegration - @IntegrationComponentScan - public static class CConfig { - - @Bean - public MessageChannel foo() { - return new DirectChannel(); - } - - @Transformer(inputChannel = "foo") - @Bean - public MessageHandler transform() { - MessageTransformingHandler transformingHandler = new MessageTransformingHandler(new MethodInvokingTransformer(helpers(), "duplicate")); - transformingHandler.setOutputChannel(bar()); - return transformingHandler; - } - - @Bean - public MessageChannel bar() { - return new DirectChannel(); - } - - @ServiceActivator(inputChannel = "bar") - @Bean - public MessageHandler service() { - return new ServiceActivatingHandler(new MethodInvokingTransformer(helpers(), "upper")); - } - - @Bean - public MyHelpers helpers() { - return new MyHelpers(); - } - - } - - public static class MyHelpers { - - public String duplicate(String foo) { - return foo + foo; - } - - public String upper(String foo) { - return foo.toUpperCase(); - } - - } - -} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java deleted file mode 100644 index 88ce9f77c..000000000 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright 2014-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.si4demo.springone.d; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.integration.annotation.IntegrationComponentScan; -import org.springframework.integration.annotation.MessagingGateway; -import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.annotation.Transformer; -import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.handler.ServiceActivatingHandler; -import org.springframework.integration.transformer.MessageTransformingHandler; -import org.springframework.integration.transformer.MethodInvokingTransformer; -import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.MessageHandler; - -/** - * - * @author Gary Russell - * - */ -@Configuration -@EnableAutoConfiguration -@IntegrationComponentScan -public class DBoot { - - private static final Log LOGGER = LogFactory.getLog(DBoot.class); - - public static void main(String[] args) throws Exception { - ConfigurableApplicationContext ctx = - new SpringApplicationBuilder(DBoot.class) - .web(WebApplicationType.NONE) - .run(args); - LOGGER.info(ctx.getBean(FooService.class).foo("foo")); - ctx.close(); - } - - @Bean - public MessageChannel foo() { - return new DirectChannel(); - } - - @Transformer(inputChannel = "foo") - @Bean - public MessageHandler transform() { - MessageTransformingHandler transformingHandler = new MessageTransformingHandler(new MethodInvokingTransformer(helpers(), "duplicate")); - transformingHandler.setOutputChannel(bar()); - return transformingHandler; - } - - @Bean - public MessageChannel bar() { - return new DirectChannel(); - } - - @ServiceActivator(inputChannel = "bar") - @Bean - public MessageHandler service() { - return new ServiceActivatingHandler(new MethodInvokingTransformer(helpers(), "upper")); - } - - @Bean - public MyHelpers helpers() { - return new MyHelpers(); - } - - @MessagingGateway(defaultRequestChannel = "foo") - public interface FooService { - - String foo(String request); - - } - - public static class MyHelpers { - - public String duplicate(String foo) { - return foo + foo; - } - - public String upper(String foo) { - return foo.toUpperCase(); - } - - } - -} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java deleted file mode 100644 index 8a6bd0170..000000000 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2014-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.si4demo.springone.e; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.integration.annotation.IntegrationComponentScan; -import org.springframework.integration.annotation.MessagingGateway; -import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.messaging.MessageChannel; - -/** - * - * @author Gary Russell - * - */ -@Configuration -@EnableAutoConfiguration -@IntegrationComponentScan -public class EDSL { - - private static final Log LOGGER = LogFactory.getLog(EDSL.class); - - public static void main(String[] args) throws Exception { - ConfigurableApplicationContext ctx = - new SpringApplicationBuilder(EDSL.class) - .web(WebApplicationType.NONE) - .run(args); - LOGGER.info(ctx.getBean(FooService.class).foo("foo")); - ctx.close(); - } - - @Bean - public MessageChannel foo() { - return new DirectChannel(); - } - - @Bean - IntegrationFlow flow() { - return IntegrationFlow.from(foo()) - .transform("payload + payload") - .handle(String.class, (p, h) -> p.toUpperCase()) - .get(); - } - - @MessagingGateway(defaultRequestChannel = "foo") - public interface FooService { - - String foo(String request); - - } - -} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java deleted file mode 100644 index 581f1b26c..000000000 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright 2014-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.si4demo.springone.f; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.integration.annotation.BridgeTo; -import org.springframework.integration.annotation.IntegrationComponentScan; -import org.springframework.integration.annotation.MessagingGateway; -import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.mail.dsl.Mail; -import org.springframework.integration.samples.si4demo.springone.GMailProperties; -import org.springframework.messaging.MessageChannel; - -/** - * - * @author Gary Russell - * - */ -@Configuration -@EnableConfigurationProperties(GMailProperties.class) -@EnableAutoConfiguration -@IntegrationComponentScan -public class FMail { - - private static final Log LOGGER = LogFactory.getLog(FMail.class); - - @Autowired - GMailProperties gmail; - - public static void main(String[] args) throws Exception { - ConfigurableApplicationContext ctx = - new SpringApplicationBuilder(FMail.class) - .web(WebApplicationType.NONE) - .run(args); - LOGGER.info(ctx.getBean(FooService.class).foo("foo")); - ctx.close(); - } - - @Bean - IntegrationFlow foo() { - return f -> f - .transform("payload + payload") - .handle(String.class, (p, h) -> p.toUpperCase()) - .routeToRecipients(r -> - r.recipient("bridgeToNowhere", "true") - .recipient("smtpChannel", "true")); - } - - @BridgeTo - @Bean - public MessageChannel bridgeToNowhere() { - return new DirectChannel(); - } - - @Bean - public MessageChannel smtpChannel() { - return new DirectChannel(); - } - - @Bean - IntegrationFlow smtp() { - return IntegrationFlow.from(smtpChannel()) - .enrichHeaders(Mail.headers() - .subject("SpringOne 2014") - .to("sispringone@gmail.com") - .from("sispringone@gmail.com")) - .handle(Mail.outboundAdapter("smtp.gmail.com") - .port(465) - .protocol("smtps") - .credentials(this.gmail.getUser(), this.gmail.getPassword()) - .javaMailProperties(p -> - p.put("mail.debug", "false")), - e -> e.id("smtpOut")) - .get(); - } - - @MessagingGateway(defaultRequestChannel = "foo.input") - public interface FooService { - - String foo(String request); - - } - -} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java deleted file mode 100644 index 9f5c992ec..000000000 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2014-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.si4demo.springone.g; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.mail.MailHeaders; -import org.springframework.integration.mail.dsl.Mail; -import org.springframework.integration.samples.si4demo.springone.GMailProperties; - -/** - * - * @author Gary Russell - * - */ -@Configuration -@EnableConfigurationProperties(GMailProperties.class) - -@EnableAutoConfiguration -public class GIMAP { - - private static final Log LOGGER = LogFactory.getLog(GIMAP.class); - - @Autowired - GMailProperties gmail; - - public static void main(String[] args) throws Exception { - ConfigurableApplicationContext ctx = - new SpringApplicationBuilder(GIMAP.class) - .web(WebApplicationType.NONE) - .run(args); - LOGGER.info("Hit Enter to terminate"); - System.in.read(); - ctx.close(); - } - - @Bean - IntegrationFlow imapIdle() { - return IntegrationFlow.from(Mail.imapIdleAdapter( - "imaps://" - + this.gmail.getUser().replaceAll("@", "%40") - + ":" - + this.gmail.getPassword() - + "@imap.gmail.com:993/INBOX") - .id("imapIn") - .autoStartup(true) - .javaMailProperties(p -> - p.put("mail.debug", "false"))) - .enrichHeaders(s -> s.headerExpressions(h -> h - .put(MailHeaders.SUBJECT, "payload.subject") - .put(MailHeaders.FROM, "payload.from[0].toString()"))) - .transform("payload.content") - .handle(System.out::println) - .get(); - } - -} diff --git a/dsl/si4demo/src/main/resources/AXML-context.xml b/dsl/si4demo/src/main/resources/AXML-context.xml deleted file mode 100644 index d369b3c19..000000000 --- a/dsl/si4demo/src/main/resources/AXML-context.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - diff --git a/dsl/si4demo/src/main/resources/BXMLAndPojo-context.xml b/dsl/si4demo/src/main/resources/BXMLAndPojo-context.xml deleted file mode 100644 index bea951ecd..000000000 --- a/dsl/si4demo/src/main/resources/BXMLAndPojo-context.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - diff --git a/dsl/si4demo/src/main/resources/application.yml b/dsl/si4demo/src/main/resources/application.yml deleted file mode 100644 index 6b5cfc848..000000000 --- a/dsl/si4demo/src/main/resources/application.yml +++ /dev/null @@ -1,10 +0,0 @@ -twitter: - oauth: - consumerKey: - consumerSecret: - accessToken: - accessTokenSecret: - -gmail: - user: - password: diff --git a/dsl/si4demo/src/main/resources/logback.xml b/dsl/si4demo/src/main/resources/logback.xml deleted file mode 100644 index 070671efc..000000000 --- a/dsl/si4demo/src/main/resources/logback.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - diff --git a/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java b/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java deleted file mode 100644 index f012e9625..000000000 --- a/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2024-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.si4demo; - -import org.junit.jupiter.api.Test; - -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.integration.samples.si4demo.annotations.Application; - -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) -public class ApplicationTests { - - @Test - public void contextLoads() { - } - -} diff --git a/gradle.properties b/gradle.properties index c80ad6c39..33b2c655c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=7.1.0 -springBootVersion=4.1.0-SNAPSHOT +version=7.2.0-SNAPSHOT +springBootVersion=4.2.0-SNAPSHOT org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 2b491261d..f8fdd2343 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 94f0396e4..679d20fa4 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 40996f451..3b4110330 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index fb1a72016..14de328a9 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index f9d5320a3..89c8824f6 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -79,13 +79,13 @@ commons-io commons-io - 2.21.0 + 2.22.0 compile org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -97,7 +97,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -126,35 +126,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -162,6 +162,7 @@ 17 + 17 diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 31c89abac..2d4c28413 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -90,7 +90,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -134,7 +134,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -163,35 +163,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -199,6 +199,7 @@ 17 + 17 diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 9d6a9141e..2da3b7012 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -84,13 +84,13 @@ commons-io commons-io - 2.21.0 + 2.22.0 compile org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -134,7 +134,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -163,35 +163,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -199,6 +199,7 @@ 17 + 17 diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 153a9e8a6..d76df3fc4 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -103,25 +103,25 @@ org.springframework.security spring-security-web - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT compile org.springframework.security spring-security-config - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT compile org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile com.sun.xml.bind jaxb-impl - 4.0.5 + 4.0.9 compile @@ -165,7 +165,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -194,35 +194,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -230,6 +230,7 @@ 17 + 17 diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 0e33fc000..cec3d07b6 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 compile @@ -101,21 +101,9 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.21.0 - test - org.junit.jupiter junit-jupiter-api @@ -142,35 +130,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -178,6 +166,7 @@ 17 + 17 diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index fb11df298..525e60ffd 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index c38676160..4c8e18b40 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -80,7 +80,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -92,7 +92,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -121,35 +121,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -157,6 +157,7 @@ 17 + 17 diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index c858c6cdd..63f6ba870 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -74,13 +74,13 @@ com.mchange c3p0 - 0.14.0 + 0.14.2 compile org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -92,7 +92,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -121,35 +121,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -157,6 +157,7 @@ 17 + 17 diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 20537b431..857970759 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,13 +68,13 @@ com.oracle.database.jdbc ojdbc11 - 23.26.0.0.0 + 23.26.3.0.0 compile org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -86,7 +86,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -115,35 +115,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -151,6 +151,7 @@ 17 + 17 diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index c6569272c..3dbb484e7 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.postgresql postgresql - 42.7.12 + 42.7.14 compile @@ -80,13 +80,13 @@ org.apache.commons commons-pool2 - 2.12.1 + 2.13.1 compile org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -98,7 +98,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -127,35 +127,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -163,6 +163,7 @@ 17 + 17 diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 6486edba4..d44c1952f 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-async-bi-directional - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -112,259 +112,210 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -372,19 +323,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 7f397ffea..3b4234373 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -68,7 +68,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -80,7 +80,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -109,35 +109,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -145,6 +145,7 @@ 17 + 17 diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index aea1df85f..8eaf879ca 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testcontainers-rabbitmq - 7.1.0 + 7.2.0-SNAPSHOT jar https://github.com/spring-projects/spring-integration-samples @@ -85,7 +85,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -116,7 +116,7 @@ org.testcontainers testcontainers-junit-jupiter - 2.0.3 + 2.0.5 test @@ -139,266 +139,217 @@ - org.springframework.integration - spring-integration-jdbc - 7.1.0-SNAPSHOT + io.grpc + grpc-rls + 1.85.0 - org.springframework.integration - spring-integration-ws - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf + 1.85.0 - org.springframework.integration - spring-integration-redis - 7.1.0-SNAPSHOT + io.grpc + grpc-benchmarks + 1.85.0 - org.springframework.integration - spring-integration-r2dbc - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-csm-observability + 1.85.0 - org.springframework.integration - spring-integration-rsocket - 7.1.0-SNAPSHOT + io.grpc + protoc-gen-grpc-java + 1.85.0 + pom - org.springframework.integration - spring-integration-event - 7.1.0-SNAPSHOT + io.grpc + grpc-util + 1.85.0 - org.springframework.integration - spring-integration-cassandra - 7.1.0-SNAPSHOT + io.grpc + grpc-context-override-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-scripting - 7.1.0-SNAPSHOT + io.grpc + grpc-context + 1.85.0 - org.springframework.integration - spring-integration-websocket - 7.1.0-SNAPSHOT + io.grpc + grpc-grpclb + 1.85.0 - org.springframework.integration - spring-integration-graphql - 7.1.0-SNAPSHOT + io.grpc + grpc-gcp-observability + 1.85.0 - org.springframework.integration - spring-integration-jpa - 7.1.0-SNAPSHOT + io.grpc + grpc-testing-proto + 1.85.0 - org.springframework.integration - spring-integration-test - 7.1.0-SNAPSHOT + io.grpc + grpc-all + 1.85.0 - org.springframework.integration - spring-integration-cloudevents - 7.1.0-SNAPSHOT + io.grpc + grpc-api + 1.85.0 - org.springframework.integration - spring-integration-http - 7.1.0-SNAPSHOT + io.grpc + grpc-netty + 1.85.0 - org.springframework.integration - spring-integration-zookeeper - 7.1.0-SNAPSHOT + io.grpc + grpc-inprocess + 1.85.0 - org.springframework.integration - spring-integration-ip - 7.1.0-SNAPSHOT + io.grpc + grpc-auth + 1.85.0 - org.springframework.integration - spring-integration-mail - 7.1.0-SNAPSHOT + io.grpc + grpc-stub + 1.85.0 - org.springframework.integration - spring-integration-camel - 7.1.0-SNAPSHOT + io.grpc + grpc-autosharding + 1.85.0 - org.springframework.integration - spring-integration-mongodb - 7.1.0-SNAPSHOT + io.grpc + grpc-xds + 1.85.0 - org.springframework.integration - spring-integration-stream - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet + 1.85.0 - org.springframework.integration - spring-integration-stomp - 7.1.0-SNAPSHOT + io.grpc + grpc-interop-testing + 1.85.0 - org.springframework.integration - spring-integration-file - 7.1.0-SNAPSHOT + io.grpc + grpc-servlet-jakarta + 1.85.0 - org.springframework.integration - spring-integration-syslog - 7.1.0-SNAPSHOT + io.grpc + grpc-protobuf-lite + 1.85.0 - org.springframework.integration - spring-integration-smb - 7.1.0-SNAPSHOT + io.grpc + grpc-services + 1.85.0 - org.springframework.integration - spring-integration-jmx - 7.1.0-SNAPSHOT + io.grpc + grpc-testing + 1.85.0 - org.springframework.integration - spring-integration-webflux - 7.1.0-SNAPSHOT + io.grpc + grpc-googleapis + 1.85.0 - org.springframework.integration - spring-integration-sftp - 7.1.0-SNAPSHOT + io.grpc + grpc-netty-shaded + 1.85.0 - org.springframework.integration - spring-integration-mqtt - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 7.1.0-SNAPSHOT + io.grpc + grpc-census + 1.85.0 - org.springframework.integration - spring-integration-hazelcast - 7.1.0-SNAPSHOT + io.grpc + grpc-okhttp + 1.85.0 - org.springframework.integration - spring-integration-test-support - 7.1.0-SNAPSHOT + io.grpc + grpc-core + 1.85.0 - org.springframework.integration - spring-integration-amqp - 7.1.0-SNAPSHOT + io.grpc + grpc-s2a + 1.85.0 - org.springframework.integration - spring-integration-grpc - 7.1.0-SNAPSHOT + io.grpc + grpc-opentelemetry + 1.85.0 - org.springframework.integration - spring-integration-xml - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 7.1.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 7.1.0-SNAPSHOT + io.grpc + grpc-alts + 1.85.0 org.springframework.cloud spring-cloud-dependencies - 2025.1.0 + 2026.0.0-SNAPSHOT import pom org.springframework.boot spring-boot-dependencies - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT import pom org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -406,19 +357,23 @@ 17 + 17 org.springframework.boot spring-boot-maven-plugin + + org.springframework.integration.samples.testcontainersrabbitmq.TestcontainersRabbitmqApplication + org.springframework.boot spring-boot-starter-parent - 4.1.0-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 0dd89a251..a23f66017 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -90,7 +90,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -119,35 +119,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -155,6 +155,7 @@ 17 + 17 diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index acbf5b28f..c27fc3685 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 7.1.0 + 7.2.0-SNAPSHOT https://github.com/spring-projects/spring-integration-samples Spring IO @@ -73,13 +73,13 @@ com.h2database h2 - 2.4.240 + 2.5.252 compile org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 compile @@ -91,7 +91,7 @@ org.mockito mockito-core - 5.21.0 + 5.24.0 test @@ -120,35 +120,35 @@ org.junit junit-bom - 6.0.2 + 6.1.3 import pom tools.jackson jackson-bom - 3.0.3 + 3.2.4 import pom com.fasterxml.jackson jackson-bom - 2.21.0 + 2.22.4 import pom org.springframework spring-framework-bom - 7.0.5 + 7.1.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 7.1.0-SNAPSHOT + 7.2.0-SNAPSHOT import pom @@ -156,6 +156,7 @@ 17 + 17