From 62e2ae1c723fc4274da56a4fb0e638d62d84e3d1 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 21 Nov 2023 16:22:28 -0500 Subject: [PATCH] Upgrade to Spring Integration 6.2.0 * Upgrade all other dependencies * Fix deprecation warnings * Fix Ruby script to a newer syntax --- advanced/advanced-testing-examples/pom.xml | 168 +++++++ advanced/dynamic-ftp/pom.xml | 157 +++++++ advanced/dynamic-tcp-client/pom.xml | 392 ++++++++++++++++ applications/cafe-scripted/pom.xml | 190 ++++++++ .../cafe-scripted/scripts/ruby/barista.rb | 12 +- .../integration/samples/cafe/ScriptTests.java | 17 +- applications/cafe/cafe-amqp/pom.xml | 163 +++++++ applications/cafe/cafe-jms/pom.xml | 187 ++++++++ applications/cafe/cafe-si/pom.xml | 162 +++++++ applications/file-split-ftp/pom.xml | 419 ++++++++++++++++++ .../samples/filesplit/Application.java | 11 +- applications/loan-broker/pom.xml | 14 +- applications/loanshark/pom.xml | 28 +- applications/stomp-chat/pom.xml | 103 +++-- basic/amqp/pom.xml | 168 +++++++ basic/barrier/pom.xml | 412 +++++++++++++++++ basic/control-bus/pom.xml | 157 +++++++ basic/enricher/pom.xml | 163 +++++++ basic/feed/pom.xml | 157 +++++++ basic/file/pom.xml | 157 +++++++ basic/ftp/pom.xml | 181 ++++++++ basic/helloworld/pom.xml | 14 +- basic/http/pom.xml | 18 +- basic/jdbc/pom.xml | 16 +- basic/jms/pom.xml | 18 +- basic/jmx/pom.xml | 14 +- basic/jpa/pom.xml | 111 ++--- basic/kafka/pom.xml | 105 ++--- .../samples/kafka/Application.java | 15 +- basic/mail/pom.xml | 16 +- basic/mongodb/pom.xml | 16 +- basic/mqtt/pom.xml | 103 +++-- basic/oddeven/pom.xml | 14 +- basic/quote/pom.xml | 14 +- basic/sftp/pom.xml | 16 +- basic/tcp-amqp/pom.xml | 14 +- basic/tcp-broadcast/pom.xml | 103 +++-- basic/tcp-client-server/pom.xml | 14 +- basic/tcp-with-headers/pom.xml | 103 +++-- basic/testing-examples/pom.xml | 14 +- basic/twitter/pom.xml | 14 +- basic/web-sockets/pom.xml | 103 +++-- basic/ws-inbound-gateway/pom.xml | 14 +- basic/ws-outbound-gateway/pom.xml | 14 +- basic/xml/pom.xml | 14 +- basic/xmpp/pom.xml | 14 +- build.gradle | 60 +-- dsl/cafe-dsl/pom.xml | 403 +++++++++++++++++ dsl/kafka-dsl/pom.xml | 105 ++--- .../samples/dsl/kafka/Application.java | 9 +- dsl/si4demo/pom.xml | 107 ++--- gradle.properties | 4 +- intermediate/async-gateway/pom.xml | 157 +++++++ intermediate/dynamic-poller/pom.xml | 157 +++++++ intermediate/errorhandling/pom.xml | 157 +++++++ intermediate/file-processing/pom.xml | 157 +++++++ intermediate/mail-attachments/pom.xml | 18 +- intermediate/monitoring/pom.xml | 14 +- .../PayloadAwareTimingInterceptor.java | 36 +- intermediate/multipart-http/pom.xml | 16 +- intermediate/rest-http/pom.xml | 20 +- intermediate/retry-and-more/pom.xml | 16 +- .../splitter-aggregator-reaper/pom.xml | 14 +- intermediate/stored-procedures-derby/pom.xml | 14 +- intermediate/stored-procedures-ms/pom.xml | 14 +- intermediate/stored-procedures-oracle/pom.xml | 20 +- .../stored-procedures-postgresql/pom.xml | 16 +- intermediate/tcp-async-bi-directional/pom.xml | 103 +++-- .../tcp-client-server-multiplex/pom.xml | 14 +- intermediate/testcontainers-rabbitmq/pom.xml | 107 ++--- intermediate/travel/pom.xml | 14 +- intermediate/tx-synch/pom.xml | 16 +- 72 files changed, 5202 insertions(+), 895 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index e69de29bb..8feeabe7b 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -0,0 +1,168 @@ + + + 4.0.0 + org.springframework.integration.samples + advanced-testing-examples + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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 + + + + jakarta.jms + jakarta.jms-api + 3.1.0 + compile + + + org.springframework.integration + spring-integration-jms + compile + + + org.springframework.integration + spring-integration-groovy + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index e69de29bb..23775292a 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + dynamic-ftp + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-ftp + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index e69de29bb..3b9af9ae4 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -0,0 +1,392 @@ + + + 4.0.0 + org.springframework.integration.samples + dynamic-tcp-client + 6.2.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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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-integration + compile + + + org.springframework.integration + spring-integration-ip + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.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.junit.vintage + junit-vintage-engine + runtime + + + + + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + + + org.springframework.boot + spring-boot-dependencies + 3.2.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.2.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/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index e69de29bb..0cfd5f56f 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -0,0 +1,190 @@ + + + 4.0.0 + org.springframework.integration.samples + cafe-scripted + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-stream + compile + + + org.springframework.integration + spring-integration-groovy + compile + + + org.springframework.integration + spring-integration-jmx + compile + + + org.springframework.integration + spring-integration-rsocket + compile + + + org.jruby + jruby-complete + 9.4.3.0 + compile + + + org.python + jython-standalone + 2.7.3 + compile + + + org.apache.groovy + groovy-jsr223 + 4.0.15 + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/applications/cafe-scripted/scripts/ruby/barista.rb b/applications/cafe-scripted/scripts/ruby/barista.rb index 6e235b9fa..529e30975 100644 --- a/applications/cafe-scripted/scripts/ruby/barista.rb +++ b/applications/cafe-scripted/scripts/ruby/barista.rb @@ -1,14 +1,14 @@ - require 'java' +require 'java' - import org.springframework.integration.samples.cafe.Drink +java_import org.springframework.integration.samples.cafe.Drink - orderItem = payload +orderItem = payload - puts "ruby: preparing #{orderItem} for order #{orderItem.order.number}" +puts "ruby: preparing #{orderItem} for order #{orderItem.order.number}" - sleep(timeToPrepare.to_f) +sleep(timeToPrepare.to_f) - Drink.new(orderItem.getOrder().getNumber(), orderItem.getDrinkType(), orderItem.isIced(), +Drink.new(orderItem.getOrder().getNumber(), orderItem.getDrinkType(), orderItem.isIced(), orderItem.getShots()) diff --git a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java index 0bad12503..7f8cad994 100644 --- a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java +++ b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2023 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 @@ -10,23 +10,25 @@ * 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.cafe; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +package org.springframework.integration.samples.cafe; import java.util.HashMap; import java.util.Map; -import org.junit.Ignore; import org.junit.Test; import org.springframework.core.io.FileSystemResource; import org.springframework.integration.scripting.ScriptExecutor; import org.springframework.integration.scripting.jsr223.ScriptExecutorFactory; import org.springframework.scripting.support.ResourceScriptSource; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * @author David Turanski + * @author Artem Bilan * */ public class ScriptTests { @@ -37,7 +39,7 @@ public void testRuby() { Order order = new Order(0); order.addItem(DrinkType.LATTE, 2, false); - Map variables = new HashMap(); + Map variables = new HashMap<>(); variables.put("payload", order.getItems().get(0)); variables.put("timeToPrepare", 1L); @@ -49,12 +51,11 @@ public void testRuby() { } @Test - @Ignore public void testPython() { ScriptExecutor executor = ScriptExecutorFactory.getScriptExecutor("python"); Order order = new Order(0); order.addItem(DrinkType.LATTE, 2, false); - Map variables = new HashMap(); + Map variables = new HashMap<>(); variables.put("payload", order.getItems().get(0)); variables.put("timeToPrepare", "1"); diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index e69de29bb..eab6a2318 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -0,0 +1,163 @@ + + + 4.0.0 + org.springframework.integration.samples + cafe-amqp + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration.samples + cafe-si + 6.2.0 + compile + + + org.springframework.integration + spring-integration-amqp + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index e69de29bb..867ff1c13 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -0,0 +1,187 @@ + + + 4.0.0 + org.springframework.integration.samples + cafe-jms + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration.samples + cafe-si + 6.2.0 + compile + + + org.apache.activemq + artemis-server + 2.31.2 + compile + + + * + org.jboss.logmanager + + + + + org.apache.activemq + artemis-jakarta-client + 2.31.2 + compile + + + org.springframework.integration + spring-integration-jms + compile + + + jakarta.jms + jakarta.jms-api + 3.1.0 + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index e69de29bb..61d666fc5 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -0,0 +1,162 @@ + + + 4.0.0 + org.springframework.integration.samples + cafe-si + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-stream + compile + + + com.fasterxml.jackson.core + jackson-databind + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index e69de29bb..ff773133b 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -0,0 +1,419 @@ + + + 4.0.0 + org.springframework.integration.samples + file-split-ftp + 6.2.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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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-ftp + compile + + + org.springframework.integration + spring-integration-http + compile + + + org.springframework.integration + spring-integration-mail + compile + + + org.eclipse.angus + jakarta.mail + 2.0.2 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.springframework.boot + spring-boot-starter-test + test + + + com.icegreen + greenmail + 2.1.0-alpha-3 + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + + + org.springframework.boot + spring-boot-dependencies + 3.2.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.2.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/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java index 4cbe36f53..af4d3e7ba 100644 --- a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java +++ b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 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. @@ -108,7 +108,10 @@ public IntegrationFlow markers() { .publishSubscribeChannel(s -> s // first trigger file flushes - .subscribe(sf -> sf.transform("'/tmp/out/.*\\.txt'", e -> e.id("toTriggerPattern")) + .subscribe(sf -> sf + .transformWith(transformer -> transformer + .id("toTriggerPattern") + .expression("'/tmp/out/.*\\.txt'")) .trigger("fileOut", e -> e.id("flusher"))) // send the first file @@ -131,7 +134,7 @@ public IntegrationFlow markers() { .enrichHeaders(Mail.headers() .subject("File successfully split and transferred") .from("foo@bar") - .toFunction(m -> new String[]{ "bar@baz" })) + .toFunction(m -> new String[] {"bar@baz"})) .enrichHeaders(h -> h.header(EMAIL_SUCCESS_SUFFIX, ".success")) .channel("toMail.input"))); } @@ -174,7 +177,7 @@ public IntegrationFlow tfrErrors() { .enrichHeaders(Mail.headers() .subject("File split and transfer failed") .from("foo@bar") - .toFunction(m -> new String[]{ "bar@baz" })) + .toFunction(m -> new String[] {"bar@baz"})) .enrichHeaders(h -> h.header(EMAIL_SUCCESS_SUFFIX, ".failed") .headerExpression(FileHeaders.ORIGINAL_FILE, "payload.failedMessage.headers['" + FileHeaders.ORIGINAL_FILE + "']")) diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 6a17cc9f3..92480aee6 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 4a564e1ba..a8e5c2f93 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -80,7 +80,7 @@ org.aspectj aspectjtools - 1.9.19 + 1.9.20.1 compile @@ -107,7 +107,7 @@ org.apache.commons commons-dbcp2 - 2.9.0 + 2.11.0 compile @@ -143,7 +143,7 @@ org.hsqldb hsqldb - 2.7.1 + 2.7.2 compile @@ -159,15 +159,15 @@ compile - org.eclipse.persistence - org.eclipse.persistence.jpa - 3.0.2 + jakarta.persistence + jakarta.persistence-api + 3.1.0 compile org.hibernate.orm hibernate-core - 6.2.2.Final + 6.3.1.Final compile @@ -217,7 +217,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 runtime @@ -277,7 +277,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -311,28 +311,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index c647c8d1e..ffc93c0fc 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 - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -88,7 +88,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -127,240 +127,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -380,7 +385,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index e69de29bb..bcd0996a7 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -0,0 +1,168 @@ + + + 4.0.0 + org.springframework.integration.samples + amqp + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-stream + compile + + + org.springframework.integration + spring-integration-amqp + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + org.slf4j + slf4j-jcl + 1.7.30 + runtime + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/basic/barrier/pom.xml b/basic/barrier/pom.xml index e69de29bb..bbdd8cba7 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -0,0 +1,412 @@ + + + 4.0.0 + org.springframework.integration.samples + barrier + 6.2.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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.boot + spring-boot-starter-amqp + compile + + + org.springframework.integration + spring-integration-amqp + compile + + + org.springframework.integration + spring-integration-http + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.springframework.amqp + spring-rabbit-junit + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + + + org.springframework.boot + spring-boot-dependencies + 3.2.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.2.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/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index e69de29bb..bfd9cb760 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + control-bus + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-core + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/basic/enricher/pom.xml b/basic/enricher/pom.xml index e69de29bb..739dd976b 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -0,0 +1,163 @@ + + + 4.0.0 + org.springframework.integration.samples + enricher + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-core + compile + + + com.h2database + h2 + 2.2.224 + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/basic/feed/pom.xml b/basic/feed/pom.xml index e69de29bb..58e434b38 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + feed + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-feed + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/basic/file/pom.xml b/basic/file/pom.xml index e69de29bb..0254a308d 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + file + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-file + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/basic/ftp/pom.xml b/basic/ftp/pom.xml index e69de29bb..d1f274ab0 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -0,0 +1,181 @@ + + + 4.0.0 + org.springframework.integration.samples + ftp + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-ftp + compile + + + commons-io + commons-io + 2.15.0 + compile + + + org.apache.ftpserver + ftpserver-core + 1.2.0 + compile + + + org.slf4j + slf4j-api + 1.7.30 + compile + + + org.slf4j + slf4j-log4j12 + 1.7.30 + runtime + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.apache.logging.log4j + log4j-core + 2.21.1 + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 1e77b229a..d5c88a2cc 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 436352f9e..2d312bde7 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -76,19 +76,19 @@ commons-io commons-io - 2.11.0 + 2.15.0 compile org.eclipse.angus jakarta.mail - 1.0.0 + 2.0.2 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -138,7 +138,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -172,28 +172,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index eb7cfeb6f..57c979993 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,13 +60,13 @@ com.h2database h2 - 2.2.220 + 2.2.224 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index bce74e85a..13b1372fc 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.activemq artemis-server - 2.28.0 + 2.31.2 compile @@ -83,13 +83,13 @@ org.apache.activemq artemis-jakarta-client - 2.28.0 + 2.31.2 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -107,7 +107,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -141,28 +141,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index f8451c1f3..588a5ee1e 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 98fa686ec..497e889e2 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jpa - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -66,7 +66,7 @@ com.h2database h2 - 2.2.220 + 2.2.224 compile @@ -75,9 +75,9 @@ runtime - org.eclipse.persistence - org.eclipse.persistence.jpa - 3.0.2 + jakarta.persistence + jakarta.persistence-api + 3.1.0 runtime @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -134,240 +134,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -387,7 +392,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index d86591d11..5687300fe 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -77,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -134,240 +134,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -387,7 +392,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java index 37533990b..0ab82aee9 100644 --- a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java +++ b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 the original author or authors. + * Copyright 2015-2023 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. @@ -57,6 +57,8 @@ /** * @author Gary Russell + * @author Artem Bilan + * * @since 4.2 */ @SpringBootApplication @@ -66,7 +68,7 @@ public class Application { @Autowired private KafkaAppProperties properties; - public static void main(String[] args) throws Exception { + public static void main(String[] args) { ConfigurableApplicationContext context = new SpringApplicationBuilder(Application.class) .web(WebApplicationType.NONE) @@ -107,7 +109,7 @@ private void runDemo(ConfigurableApplicationContext context) { @Bean public ProducerFactory kafkaProducerFactory(KafkaProperties properties) { - Map producerProperties = properties.buildProducerProperties(); + Map producerProperties = properties.buildProducerProperties(null); producerProperties.put(ProducerConfig.LINGER_MS_CONFIG, 1); return new DefaultKafkaProducerFactory<>(producerProperties); } @@ -123,8 +125,7 @@ public MessageHandler handler(KafkaTemplate kafkaTemplate) { @Bean public ConsumerFactory kafkaConsumerFactory(KafkaProperties properties) { - Map consumerProperties = properties - .buildConsumerProperties(); + Map consumerProperties = properties.buildConsumerProperties(null); consumerProperties.put(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, 15000); return new DefaultKafkaConsumerFactory<>(consumerProperties); } @@ -171,8 +172,8 @@ public NewTopic newTopic(KafkaAppProperties properties) { private KafkaProperties kafkaProperties; public void addAnotherListenerForTopics(String... topics) { - Map consumerProperties = kafkaProperties.buildConsumerProperties(); - // change the group id so we don't revoke the other partitions. + Map consumerProperties = kafkaProperties.buildConsumerProperties(null); + // change the group id, so we don't revoke the other partitions. consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, consumerProperties.get(ConsumerConfig.GROUP_ID_CONFIG) + "x"); IntegrationFlow flow = diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 63d3ea411..146613e66 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,13 +65,13 @@ org.eclipse.angus jakarta.mail - 1.0.0 + 2.0.2 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index cc7242c86..2343d7b6f 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,13 +60,13 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile org.mongodb mongodb-driver-sync - 4.9.1 + 4.11.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 79d8d69f2..97e1f0b94 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mqtt - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -122,240 +122,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -375,7 +380,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index f2dd21198..8f97a688f 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 3247124ed..e2dbd894d 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 4abea527b..6189b659b 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -94,7 +94,7 @@ org.apache.sshd sshd-sftp - 2.9.2 + 2.11.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 67bf2c948..ac5922560 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 runtime @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -129,28 +129,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index b035017e1..0e68066ef 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 - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -122,240 +122,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -375,7 +380,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 0c344439b..4d3188057 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index bbfa905f8..a605ce6b6 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 - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -122,240 +122,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -375,7 +380,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 6d7f798c6..0e18fc37c 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -93,7 +93,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -127,28 +127,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 21af08b6f..26ecaa91d 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -61,7 +61,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -113,28 +113,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index e48d55b57..e67be885b 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 - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -117,240 +117,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -370,7 +375,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 04c7d987b..5fc3af1c3 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -120,7 +120,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -154,28 +154,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index abf9b4f69..be4d49a9c 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index c078707a1..5b737a030 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 3802d8e5d..914f01bac 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/build.gradle b/build.gradle index 90bbe898a..e1653b822 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { maven { url 'https://repo.spring.io/snapshot' } } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.1.0' + classpath 'io.spring.gradle:dependency-management-plugin:1.1.4' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" classpath 'org.gretty:gretty:4.0.3' } @@ -216,54 +216,54 @@ subprojects { subproject -> } ext { - apacheSshdVersion = '2.9.2' - artemisVersion = '2.28.0' - aspectjVersion = '1.9.19' + apacheSshdVersion = '2.11.0' + artemisVersion = '2.31.2' + aspectjVersion = '1.9.20.1' commonsDigesterVersion = '2.1' - commonsDbcpVersion = '2.9.0' + commonsDbcpVersion = '2.11.0' commonsFileUploadVersion = '1.5' - commonsIoVersion = '2.11.0' + commonsIoVersion = '2.15.0' commonsLangVersion = '3.12.0' commonsPoolVersion = '2.11.1' c3p0Version = '0.9.5.5' derbyVersion = '10.16.1.1' hamcrestVersion = '2.2' - hibernateVersion = '6.2.2.Final' + hibernateVersion = '6.3.1.Final' hibernateValidatorVersion = '8.0.0.Final' ftpServerVersion = '1.2.0' flexjsonVersion = '2.0' - groovyVersion = '4.0.12' - hsqldbVersion = '2.7.1' - h2Version = '2.2.220' - jacksonVersion = '2.15.0' - jaxbVersion = '4.0.2' + groovyVersion = '4.0.15' + hsqldbVersion = '2.7.2' + h2Version = '2.2.224' + jacksonVersion = '2.15.3' + jaxbVersion = '4.0.4' jodaTimeVersion = '1.6' jtaVersion = '2.0.0' jtdsVersion = '1.2.6' jmsApiVersion = '3.1.0' - jrubyVersion = '9.2.14.0' - jpaApiVersion = '3.0.2' + jrubyVersion = '9.4.3.0' + jpaApiVersion = '3.1.0' jstlVersion = '1.2' junitVersion = '4.13.2' - junitJupiterVersion = '5.9.3' + junitJupiterVersion = '5.10.1' jythonVersion = '2.7.3' - log4jVersion = '2.20.0' - mailVersion = '1.0.0' - mockitoVersion = '5.3.1' - mongoDriverVersion = '4.9.1' + log4jVersion = '2.21.1' + mailVersion = '2.0.2' + mockitoVersion = '5.7.0' + mongoDriverVersion = '4.11.1' openJpaVersion = '2.4.0' - oracleDriverVersion = '19.3.0.0' + oracleDriverVersion = '23.3.0.23.09' postgresVersion = '42.6.0' slf4jVersion = '1.7.30' - springCloudVersion = '2022.0.2' - springIntegrationVersion = '6.1.5' + springCloudVersion = '2022.0.4' + springIntegrationVersion = '6.2.0' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.11' - springSecurityVersion = '6.1.2' + springVersion = '6.1.0' + springSecurityVersion = '6.2.0' springWebFlowVersion = '3.0.0' - testcontainersVersion = '1.18.3' + testcontainersVersion = '1.19.2' tilesJspVersion = '2.2.1' } @@ -446,7 +446,7 @@ project('loanshark') { api "org.hsqldb:hsqldb:$hsqldbVersion" api "net.sf.flexjson:flexjson:$flexjsonVersion" api "org.hibernate:hibernate-validator:$hibernateValidatorVersion" - api "org.eclipse.persistence:org.eclipse.persistence.jpa:$jpaApiVersion" + api "jakarta.persistence:jakarta.persistence-api:$jpaApiVersion" api "org.hibernate.orm:hibernate-core:$hibernateVersion" api "org.springframework.webflow:spring-js-resources:$springWebFlowVersion" api "org.slf4j:slf4j-api:$slf4jVersion" @@ -707,7 +707,7 @@ project('si4demo') { 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:1.18.0' + api 'com.rometools:rome:2.1.0' testImplementation 'org.springframework.boot:spring-boot-starter-test' } @@ -804,7 +804,7 @@ project('jpa') { api "com.h2database:h2:$h2Version" runtimeOnly 'org.springframework:spring-instrument' - runtimeOnly "org.eclipse.persistence:org.eclipse.persistence.jpa:$jpaApiVersion" + runtimeOnly "jakarta.persistence:jakarta.persistence-api:$jpaApiVersion" testImplementation 'org.springframework.boot:spring-boot-starter-test' } @@ -1275,7 +1275,7 @@ project('stored-procedures-oracle') { dependencies { api 'org.springframework.integration:spring-integration-jdbc' - api "com.oracle.ojdbc:ojdbc8:$oracleDriverVersion" + api "com.oracle.database.jdbc:ojdbc11:$oracleDriverVersion" api "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1469,7 +1469,7 @@ project('file-split-ftp') { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.integration:spring-integration-test' - testImplementation ('com.icegreen:greenmail:2.0.0-alpha-2') { + testImplementation ('com.icegreen:greenmail:2.1.0-alpha-3') { exclude group: 'com.sun.mail' exclude group: 'jakarta.activation' } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index e69de29bb..4e39d4d49 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -0,0 +1,403 @@ + + + 4.0.0 + org.springframework.integration.samples + cafe-dsl + 6.2.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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration.samples + cafe-si + 6.2.0 + compile + + + org.springframework.boot + spring-boot-starter-integration + compile + + + org.springframework.integration + spring-integration-core + compile + + + org.springframework.integration + spring-integration-stream + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.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.junit.vintage + junit-vintage-engine + runtime + + + + + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + + + org.springframework.boot + spring-boot-dependencies + 3.2.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.2.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/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 260bf3b53..77bbe51bf 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 - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -128,240 +128,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -381,7 +386,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java index 65fab86a4..b6888d247 100644 --- a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java +++ b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 the original author or authors. + * Copyright 2016-2023 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. @@ -44,13 +44,14 @@ /** * @author Gary Russell * @author Artem Bilan + * * @since 4.3 */ @SpringBootApplication @EnableConfigurationProperties(KafkaAppProperties.class) public class Application { - public static void main(String[] args) throws Exception { + public static void main(String[] args) { ConfigurableApplicationContext context = new SpringApplicationBuilder(Application.class) .web(WebApplicationType.NONE) @@ -136,8 +137,8 @@ public NewTopic newTopic(KafkaAppProperties properties) { private KafkaProperties kafkaProperties; public void addAnotherListenerForTopics(String... topics) { - Map consumerProperties = kafkaProperties.buildConsumerProperties(); - // change the group id so we don't revoke the other partitions. + Map consumerProperties = kafkaProperties.buildConsumerProperties(null); + // change the group id, so we don't revoke the other partitions. consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, consumerProperties.get(ConsumerConfig.GROUP_ID_CONFIG) + "x"); IntegrationFlow flow = diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index e1091248d..cccec1667 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples si4demo - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -87,13 +87,13 @@ org.eclipse.angus jakarta.mail - 1.0.0 + 2.0.2 compile com.rometools rome - 1.18.0 + 2.1.0 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -150,240 +150,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -403,7 +408,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/gradle.properties b/gradle.properties index 45f8815bc..199434e51 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=6.1.0 -springBootVersion=3.1.1-SNAPSHOT +version=6.2.0 +springBootVersion=3.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 e69de29bb..dbe1faae2 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + async-gateway + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-core + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index e69de29bb..e47fcf66b 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + dynamic-poller + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-core + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index e69de29bb..1da075777 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + errorhandling + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-stream + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index e69de29bb..d5ba2bb79 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + file-processing + 6.2.0 + 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 + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + 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.integration + spring-integration-file + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + 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/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 1529e9094..cf28807a7 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,19 +65,19 @@ org.eclipse.angus jakarta.mail - 1.0.0 + 2.0.2 compile commons-io commons-io - 2.11.0 + 2.15.0 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -129,28 +129,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index d012ee855..c4e002f58 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -82,7 +82,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -132,7 +132,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -166,28 +166,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java b/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java index 24327a0d2..d6e020919 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2023 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. @@ -31,15 +31,17 @@ * based on message payload types. * * @author Gary Russell + * @author Artem Bilan + * * @since 2.2 * */ @ManagedResource public class PayloadAwareTimingInterceptor implements ChannelInterceptor { - private static final ThreadLocal stopWatchHolder = new ThreadLocal(); + private static final ThreadLocal stopWatchHolder = new ThreadLocal<>(); - private final Map, Stats> statsMap = new ConcurrentHashMap, PayloadAwareTimingInterceptor.Stats>(); + private final Map, Stats> statsMap = new ConcurrentHashMap<>(); /** * @@ -67,12 +69,12 @@ public Message preSend(Message message, MessageChannel channel) { public void postSend(Message message, MessageChannel channel, boolean sent) { StopWatchHolder holder = stopWatchHolder.get(); if (holder != null) { - holder.getStopWatch().stop(); - Stats stats = this.statsMap.get(holder.getType()); + holder.stopWatch().stop(); + Stats stats = this.statsMap.get(holder.type()); if (stats == null) { stats = this.statsMap.get(Object.class); } - stats.add(holder.getStopWatch().getLastTaskTimeMillis()); + stats.add(holder.stopWatch().lastTaskInfo().getTimeMillis()); } } @@ -101,28 +103,8 @@ public float getAverage(String className) throws Exception { return this.statsMap.get(Class.forName(className)).getAverage(); } - private static class StopWatchHolder { - - private final StopWatch stopWatch; - - private final Class type; - - /** - * @param stopWatch - * @param type - */ - public StopWatchHolder(StopWatch stopWatch, Class type) { - this.stopWatch = stopWatch; - this.type = type; - } - - public StopWatch getStopWatch() { - return stopWatch; - } + private record StopWatchHolder(StopWatch stopWatch, Class type) { - public Class getType() { - return type; - } } private static final class Stats { diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 978d76e7b..46c1f41a4 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -76,13 +76,13 @@ commons-io commons-io - 2.11.0 + 2.15.0 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -132,7 +132,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -166,28 +166,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index f6eca7ba9..e9122381a 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -95,25 +95,25 @@ org.springframework.security spring-security-web - 6.1.2 + 6.2.0 compile org.springframework.security spring-security-config - 6.1.2 + 6.2.0 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile com.sun.xml.bind jaxb-impl - 4.0.2 + 4.0.4 compile @@ -163,7 +163,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -197,28 +197,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index e64ff9384..c3e8f1eb0 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -75,7 +75,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 compile @@ -93,7 +93,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -145,28 +145,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index aa86f3878..e303021cb 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index f290177e1..11d4fcfd2 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -72,7 +72,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -90,7 +90,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -124,28 +124,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 9e0b61ebf..fd34f5b11 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -72,7 +72,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -90,7 +90,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -124,28 +124,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 19f106a7b..e4063e280 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -58,15 +58,15 @@ compile - com.oracle.ojdbc - ojdbc8 - 19.3.0.0 + com.oracle.database.jdbc + ojdbc11 + 23.3.0.23.09 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index b1360302d..9ac91b364 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -66,7 +66,7 @@ org.apache.commons commons-dbcp2 - 2.9.0 + 2.11.0 compile @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -96,7 +96,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -130,28 +130,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 0004fc167..e42f69e5b 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 - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -117,240 +117,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -370,7 +375,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 945b73e64..a38f40200 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 1eef63bef..7eaad75f7 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 - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -114,7 +114,7 @@ org.testcontainers junit-jupiter - 1.18.3 + 1.19.2 test @@ -144,247 +144,252 @@ org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.cloud spring-cloud-dependencies - 2022.0.2 + 2022.0.4 import pom org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -404,7 +409,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 70ad64113..8e986bee4 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -88,7 +88,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -122,28 +122,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 0b11620a4..b55ba3edd 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 - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,13 +65,13 @@ com.h2database h2 - 2.2.220 + 2.2.224 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom