diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml
index fb0ade56..5ae68360 100644
--- a/advanced/advanced-testing-examples/pom.xml
+++ b/advanced/advanced-testing-examples/pom.xml
@@ -71,7 +71,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -144,7 +144,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml
index 704f0a26..61cfa6fe 100644
--- a/advanced/dynamic-ftp/pom.xml
+++ b/advanced/dynamic-ftp/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml
index d46e6019..dbf3fd90 100644
--- a/advanced/dynamic-tcp-client/pom.xml
+++ b/advanced/dynamic-tcp-client/pom.xml
@@ -145,7 +145,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml
index 5ff3a53b..98fc9b32 100644
--- a/applications/cafe-scripted/pom.xml
+++ b/applications/cafe-scripted/pom.xml
@@ -93,7 +93,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -166,7 +166,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml
index b592d65f..5291c084 100644
--- a/applications/cafe/cafe-amqp/pom.xml
+++ b/applications/cafe/cafe-amqp/pom.xml
@@ -66,7 +66,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -139,7 +139,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml
index a07b29b5..2e78641f 100644
--- a/applications/cafe/cafe-jms/pom.xml
+++ b/applications/cafe/cafe-jms/pom.xml
@@ -90,7 +90,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -163,7 +163,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml
index 3c05423a..1cb6e579 100644
--- a/applications/cafe/cafe-si/pom.xml
+++ b/applications/cafe/cafe-si/pom.xml
@@ -65,7 +65,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -138,7 +138,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml
index b74b012c..89fa7300 100644
--- a/applications/file-split-ftp/pom.xml
+++ b/applications/file-split-ftp/pom.xml
@@ -172,7 +172,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
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 7555f4cb..ec3bf54f 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
@@ -66,7 +66,7 @@ public class Application {
*/
@Bean
public IntegrationFlow fromFile() {
- return IntegrationFlows.from(
+ return IntegrationFlow.from(
Files.inboundAdapter(new File("/tmp/in"))
.preventDuplicates(false)
.patternFilter("*.txt"), e -> e.poller(Pollers.fixedDelay(5000)
diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml
index 2a6fddd6..a76f05a2 100644
--- a/applications/loan-broker/pom.xml
+++ b/applications/loan-broker/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml
index 2d874c88..1342e378 100644
--- a/applications/loanshark/pom.xml
+++ b/applications/loanshark/pom.xml
@@ -165,9 +165,9 @@
compile
- org.hibernate
- hibernate-core-jakarta
- 5.6.3.Final
+ org.hibernate.orm
+ hibernate-core
+ 6.1.1.Final
compile
@@ -217,7 +217,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
runtime
@@ -332,7 +332,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml
index 27fff7b3..1fc2d898 100644
--- a/applications/stomp-chat/pom.xml
+++ b/applications/stomp-chat/pom.xml
@@ -155,7 +155,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml
index 984dd4fb..585529c6 100644
--- a/basic/amqp/pom.xml
+++ b/basic/amqp/pom.xml
@@ -65,7 +65,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -144,7 +144,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml
index 7439c52c..a72ea9b7 100644
--- a/basic/barrier/pom.xml
+++ b/basic/barrier/pom.xml
@@ -160,7 +160,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml
index 08aadb03..4a7b76ca 100644
--- a/basic/control-bus/pom.xml
+++ b/basic/control-bus/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml
index edd28131..1484b7be 100644
--- a/basic/enricher/pom.xml
+++ b/basic/enricher/pom.xml
@@ -66,7 +66,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -139,7 +139,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml
index ccafa1ba..2e8e28b3 100644
--- a/basic/feed/pom.xml
+++ b/basic/feed/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/file/pom.xml b/basic/file/pom.xml
index 9225df8c..57fc3aca 100644
--- a/basic/file/pom.xml
+++ b/basic/file/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml
index 4a593683..ebb5ae42 100644
--- a/basic/ftp/pom.xml
+++ b/basic/ftp/pom.xml
@@ -112,7 +112,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
test
@@ -157,7 +157,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml
index 44438e3f..1e60ad46 100644
--- a/basic/helloworld/pom.xml
+++ b/basic/helloworld/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/http/pom.xml b/basic/http/pom.xml
index 43ff12fd..2d3bf78d 100644
--- a/basic/http/pom.xml
+++ b/basic/http/pom.xml
@@ -88,7 +88,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -193,7 +193,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml
index 472eefbc..5fc58196 100644
--- a/basic/jdbc/pom.xml
+++ b/basic/jdbc/pom.xml
@@ -66,7 +66,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -139,7 +139,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml
index edcf5ef9..1fc6a721 100644
--- a/basic/jms/pom.xml
+++ b/basic/jms/pom.xml
@@ -89,7 +89,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -162,7 +162,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml
index 8d5f6e59..0430b577 100644
--- a/basic/jmx/pom.xml
+++ b/basic/jmx/pom.xml
@@ -65,7 +65,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -138,7 +138,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java b/basic/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java
index f95258e3..e1bed775 100644
--- a/basic/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java
+++ b/basic/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -16,6 +16,7 @@
package org.springframework.integration.samples.jmx;
+import java.time.Duration;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger;
@@ -28,6 +29,8 @@ import org.springframework.stereotype.Component;
/**
* @author Mark Fisher
+ * @author Artme Bilan
+ *
* @since 2.0
*/
@Component
@@ -52,11 +55,8 @@ public class StopWatch implements InitializingBean {
@ManagedOperation
public void start() {
this.scheduler.initialize();
- this.future = this.scheduler.scheduleAtFixedRate(new Runnable() {
- public void run() {
- seconds.incrementAndGet();
- }
- }, 1000);
+ this.future =
+ this.scheduler.scheduleAtFixedRate(seconds::incrementAndGet, Duration.ofSeconds(1));
}
@ManagedOperation
diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml
index 562ca4c8..daf3192b 100644
--- a/basic/jpa/pom.xml
+++ b/basic/jpa/pom.xml
@@ -162,7 +162,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/jpa/src/main/resources/schema.sql b/basic/jpa/src/main/resources/schema.sql
index 87a0eb53..6daf8cd4 100644
--- a/basic/jpa/src/main/resources/schema.sql
+++ b/basic/jpa/src/main/resources/schema.sql
@@ -2,4 +2,4 @@ drop table if EXISTS PEOPLE;
CREATE TABLE PEOPLE (id BIGINT generated by default as identity, name VARCHAR(255), CREATED_DATE_TIME TIMESTAMP, PRIMARY KEY (id));
-CREATE SEQUENCE HIBERNATE_SEQUENCE START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE PEOPLE_SEQ START WITH 1 INCREMENT BY 50;
diff --git a/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java b/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java
index 80e93e5c..5eb8e756 100644
--- a/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java
+++ b/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.integration.samples.jpa;
import static org.junit.Assert.assertEquals;
@@ -21,15 +22,12 @@ import static org.junit.Assert.assertNotNull;
import java.util.Calendar;
import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.integration.samples.jpa.domain.Person;
import org.springframework.integration.samples.jpa.service.PersonService;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
*
@@ -37,7 +35,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
* @author Artem Bilan
*
*/
-@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
public class JpaTests {
diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml
index 55d250d3..edd0d7ee 100644
--- a/basic/kafka/pom.xml
+++ b/basic/kafka/pom.xml
@@ -77,7 +77,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -162,7 +162,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml
index 635eb9ab..5d60a39d 100644
--- a/basic/mail/pom.xml
+++ b/basic/mail/pom.xml
@@ -71,7 +71,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -144,7 +144,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml
index 06e9386f..d372658f 100644
--- a/basic/mongodb/pom.xml
+++ b/basic/mongodb/pom.xml
@@ -60,13 +60,13 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
org.mongodb
mongodb-driver-sync
- 4.4.1
+ 4.7.0-beta0
compile
@@ -139,7 +139,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml
index 5b3afe3e..8e48f297 100644
--- a/basic/mqtt/pom.xml
+++ b/basic/mqtt/pom.xml
@@ -150,7 +150,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml
index b3162ed0..315a7e46 100644
--- a/basic/oddeven/pom.xml
+++ b/basic/oddeven/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml
index cb64697b..531059fe 100644
--- a/basic/quote/pom.xml
+++ b/basic/quote/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml
index 206eef1f..9f66f62d 100644
--- a/basic/sftp/pom.xml
+++ b/basic/sftp/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -139,7 +139,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml
index e4e488f8..93931f4c 100644
--- a/basic/tcp-amqp/pom.xml
+++ b/basic/tcp-amqp/pom.xml
@@ -71,7 +71,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
runtime
@@ -150,7 +150,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml
index e7b18c1d..bcaa24e0 100644
--- a/basic/tcp-broadcast/pom.xml
+++ b/basic/tcp-broadcast/pom.xml
@@ -150,7 +150,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml
index 0385363a..470f89cc 100644
--- a/basic/tcp-client-server/pom.xml
+++ b/basic/tcp-client-server/pom.xml
@@ -71,7 +71,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -144,7 +144,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml
index a473ecf6..7da422bf 100644
--- a/basic/tcp-with-headers/pom.xml
+++ b/basic/tcp-with-headers/pom.xml
@@ -150,7 +150,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml
index 6148f52f..85de7860 100644
--- a/basic/testing-examples/pom.xml
+++ b/basic/testing-examples/pom.xml
@@ -75,7 +75,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -148,7 +148,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml
index dd74a6ff..60d47bae 100644
--- a/basic/twitter/pom.xml
+++ b/basic/twitter/pom.xml
@@ -61,7 +61,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -134,7 +134,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml
index 6919651a..7e62a2c7 100644
--- a/basic/web-sockets/pom.xml
+++ b/basic/web-sockets/pom.xml
@@ -145,7 +145,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml
index 37fc813c..2b7e5c35 100644
--- a/basic/ws-inbound-gateway/pom.xml
+++ b/basic/ws-inbound-gateway/pom.xml
@@ -70,7 +70,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -175,7 +175,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml
index 70036161..ef56d03f 100644
--- a/basic/ws-outbound-gateway/pom.xml
+++ b/basic/ws-outbound-gateway/pom.xml
@@ -65,7 +65,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -138,7 +138,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml
index e1f16c8c..002d906c 100644
--- a/basic/xml/pom.xml
+++ b/basic/xml/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml
index 55accb13..4a421b0d 100644
--- a/basic/xmpp/pom.xml
+++ b/basic/xmpp/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/build.gradle b/build.gradle
index 8caa04b3..215d9516 100644
--- a/build.gradle
+++ b/build.gradle
@@ -232,7 +232,7 @@ subprojects { subproject ->
c3p0Version = '0.9.5.5'
derbyVersion = '10.14.2.0'
hamcrestVersion = '2.2'
- hibernateVersion = '5.6.3.Final'
+ hibernateVersion = '6.1.1.Final'
hibernateValidatorVersion = '7.0.2.Final'
ftpServerVersion = '1.1.2'
flexjsonVersion = '2.0'
@@ -252,15 +252,15 @@ subprojects { subproject ->
junitVersion = '4.13.2'
junitJupiterVersion = '5.8.2'
jythonVersion = '2.7.2'
- log4jVersion = '2.17.1'
+ log4jVersion = '2.17.2'
mockitoVersion = '4.2.0'
- mongoDriverVersion = '4.4.1'
+ mongoDriverVersion = '4.7.0-beta0'
openJpaVersion = '2.4.0'
oracleDriverVersion = '19.3.0.0'
postgresVersion = '42.3.3'
slf4jVersion = '1.7.30'
springCloudVersion = '2022.0.0-SNAPSHOT'
- springIntegrationVersion = '6.0.0-M3'
+ springIntegrationVersion = '6.0.0-SNAPSHOT'
springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT'
springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT'
springVersion = '6.0.0-SNAPSHOT'
@@ -464,7 +464,7 @@ project('loanshark') {
api "net.sf.flexjson:flexjson:$flexjsonVersion"
api "org.hibernate:hibernate-validator:$hibernateValidatorVersion"
api "org.eclipse.persistence:org.eclipse.persistence.jpa:$jpaApiVersion"
- api "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
+ api "org.hibernate.orm:hibernate-core:$hibernateVersion"
api "org.springframework.webflow:spring-js:$springWebFlowVersion"
api "org.slf4j:slf4j-api:$slf4jVersion"
@@ -1565,4 +1565,3 @@ sonarqube {
property 'sonar.links.scm_dev', linkScmDevConnection
}
}
-
diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml
index 04fbea3b..ad7cbef9 100644
--- a/dsl/cafe-dsl/pom.xml
+++ b/dsl/cafe-dsl/pom.xml
@@ -156,7 +156,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml
index 14867fa8..e6f003f4 100644
--- a/dsl/kafka-dsl/pom.xml
+++ b/dsl/kafka-dsl/pom.xml
@@ -71,7 +71,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -156,7 +156,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml
index cac47b37..063adda0 100644
--- a/dsl/si4demo/pom.xml
+++ b/dsl/si4demo/pom.xml
@@ -178,7 +178,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml
index 2a92dc57..6cb6d955 100644
--- a/intermediate/async-gateway/pom.xml
+++ b/intermediate/async-gateway/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml
index d0b27005..c3a0bfc5 100644
--- a/intermediate/dynamic-poller/pom.xml
+++ b/intermediate/dynamic-poller/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/DynamicPeriodicTrigger.java b/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/DynamicPeriodicTrigger.java
deleted file mode 100644
index f1053ce2..00000000
--- a/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/DynamicPeriodicTrigger.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.integration.samples.poller;
-
-import java.util.Date;
-import java.util.concurrent.TimeUnit;
-
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.support.PeriodicTrigger;
-import org.springframework.util.Assert;
-
-
-/**
- * This is a dynamically changeable {@link Trigger}. It is based on the
- * {@link PeriodicTrigger} implementations. However, the fields of this dynamic
- * trigger are not final and the properties can be inspected and set via
- * explicit getters and setters.
- *
- * @author Gunnar Hillert
- *
- */
-public class DynamicPeriodicTrigger implements Trigger {
-
- private volatile long period;
-
- private volatile TimeUnit timeUnit;
-
- private volatile long initialDelay = 0;
-
- private volatile boolean fixedRate = false;
-
- /**
- * Create a trigger with the given period in milliseconds. The underlying
- * {@link TimeUnit} will be initialized to TimeUnit.MILLISECONDS.
- *
- * @param period Must not be negative
- */
- public DynamicPeriodicTrigger(long period) {
- this(period, TimeUnit.MILLISECONDS);
- }
-
- /**
- * Create a trigger with the given period and time unit. The time unit will
- * apply not only to the period but also to any 'initialDelay' value, if
- * configured on this Trigger later via {@link #setInitialDelay(long)}.
- *
- * @param period Must not be negative
- * @param timeUnit Must not be null
- *
- */
- public DynamicPeriodicTrigger(long period, TimeUnit timeUnit) {
- Assert.isTrue(period >= 0, "period must not be negative");
- Assert.notNull(timeUnit, "timeUnit must not be null");
-
- this.timeUnit = timeUnit;
- this.period = this.timeUnit.toMillis(period);
- }
-
- /**
- * Specify the delay for the initial execution. It will be evaluated in
- * terms of this trigger's {@link TimeUnit}. If no time unit was explicitly
- * provided upon instantiation, the default is milliseconds.
- */
- public void setInitialDelay(long initialDelay) {
- Assert.isTrue(initialDelay >= 0, "initialDelay must not be negative");
- this.initialDelay = this.timeUnit.toMillis(initialDelay);
- }
-
- /**
- * Specify whether the periodic interval should be measured between the
- * scheduled start times rather than between actual completion times.
- * The latter, "fixed delay" behavior, is the default.
- */
- public void setFixedRate(boolean fixedRate) {
- this.fixedRate = fixedRate;
- }
-
- /**
- * Returns the time after which a task should run again.
- */
- public Date nextExecutionTime(TriggerContext triggerContext) {
- if (triggerContext.lastScheduledExecutionTime() == null) {
- return new Date(System.currentTimeMillis() + this.initialDelay);
- }
- else if (this.fixedRate) {
- return new Date(triggerContext.lastScheduledExecutionTime().getTime() + this.period);
- }
- return new Date(triggerContext.lastCompletionTime().getTime() + this.period);
- }
-
- public long getPeriod() {
- return period;
- }
-
- /**
- * Specify the period of the trigger. It will be evaluated in
- * terms of this trigger's {@link TimeUnit}. If no time unit was explicitly
- * provided upon instantiation, the default is milliseconds.
- *
- * @param period Must not be negative
- */
- public void setPeriod(long period) {
- Assert.isTrue(period >= 0, "period must not be negative");
- this.period = this.timeUnit.toMillis(period);
- }
-
- public TimeUnit getTimeUnit() {
- return timeUnit;
- }
-
- public void setTimeUnit(TimeUnit timeUnit) {
- Assert.notNull(timeUnit, "timeUnit must not be null");
- this.timeUnit = timeUnit;
- }
-
- public long getInitialDelay() {
- return initialDelay;
- }
-
- public boolean isFixedRate() {
- return fixedRate;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!(obj instanceof DynamicPeriodicTrigger)) {
- return false;
- }
- DynamicPeriodicTrigger other = (DynamicPeriodicTrigger) obj;
- return this.fixedRate == other.fixedRate
- && this.initialDelay == other.initialDelay
- && this.period == other.period;
- }
-
- @Override
- public int hashCode() {
- return (this.fixedRate ? 14 : 41) +
- (int) (38 * this.period) +
- (int) (43 * this.initialDelay);
- }
-
-}
diff --git a/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java b/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java
index a97be1a8..5a27ed2b 100644
--- a/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java
+++ b/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -13,8 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.integration.samples.poller;
+import java.time.Duration;
import java.util.Scanner;
import org.apache.commons.logging.Log;
@@ -22,12 +24,15 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.integration.util.DynamicPeriodicTrigger;
/**
* Starts the Spring Context and will initialize the Spring Integration routes.
*
* @author Gunnar Hillert
* @author Gary Russell
+ * @author Artem Bilan
+ *
* @version 1.0
*
*/
@@ -85,7 +90,7 @@ public final class Main {
System.out.println(String.format("Setting trigger period to '%s' ms", triggerPeriod));
- trigger.setPeriod(triggerPeriod);
+ trigger.setDuration(Duration.ofMillis(triggerPeriod));
}
catch (Exception e) {
diff --git a/intermediate/dynamic-poller/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/dynamic-poller/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
index ac2de791..0205d849 100644
--- a/intermediate/dynamic-poller/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
+++ b/intermediate/dynamic-poller/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
@@ -14,8 +14,8 @@
-
+ class="org.springframework.integration.util.DynamicPeriodicTrigger">
+
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml
index 32f0ca87..374817bf 100644
--- a/intermediate/file-processing/pom.xml
+++ b/intermediate/file-processing/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml
index b14c452b..85ad4eee 100644
--- a/intermediate/mail-attachments/pom.xml
+++ b/intermediate/mail-attachments/pom.xml
@@ -77,7 +77,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -150,7 +150,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml
index d41c04d7..1d078817 100644
--- a/intermediate/monitoring/pom.xml
+++ b/intermediate/monitoring/pom.xml
@@ -82,7 +82,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -187,7 +187,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml
index 4bc3275f..fab93cd0 100644
--- a/intermediate/multipart-http/pom.xml
+++ b/intermediate/multipart-http/pom.xml
@@ -82,7 +82,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -187,7 +187,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml
index d2e7a0b4..0a53a801 100644
--- a/intermediate/rest-http/pom.xml
+++ b/intermediate/rest-http/pom.xml
@@ -107,7 +107,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -218,7 +218,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml
index 35575235..fa006d14 100644
--- a/intermediate/retry-and-more/pom.xml
+++ b/intermediate/retry-and-more/pom.xml
@@ -93,7 +93,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -166,7 +166,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml
index 6058a5e7..3b2750fd 100644
--- a/intermediate/splitter-aggregator-reaper/pom.xml
+++ b/intermediate/splitter-aggregator-reaper/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml
index 92a78442..8ae1d120 100644
--- a/intermediate/stored-procedures-derby/pom.xml
+++ b/intermediate/stored-procedures-derby/pom.xml
@@ -66,7 +66,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -139,7 +139,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml
index 85319385..48365ef6 100644
--- a/intermediate/stored-procedures-ms/pom.xml
+++ b/intermediate/stored-procedures-ms/pom.xml
@@ -72,7 +72,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -145,7 +145,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml
index 3af1e68c..02f635d4 100644
--- a/intermediate/stored-procedures-oracle/pom.xml
+++ b/intermediate/stored-procedures-oracle/pom.xml
@@ -66,7 +66,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -139,7 +139,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml
index c09b029e..34cbd4b3 100644
--- a/intermediate/stored-procedures-postgresql/pom.xml
+++ b/intermediate/stored-procedures-postgresql/pom.xml
@@ -78,7 +78,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -151,7 +151,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml
index 7ac736cc..0a36696d 100644
--- a/intermediate/tcp-async-bi-directional/pom.xml
+++ b/intermediate/tcp-async-bi-directional/pom.xml
@@ -145,7 +145,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml
index 028c3825..322bde3a 100644
--- a/intermediate/tcp-client-server-multiplex/pom.xml
+++ b/intermediate/tcp-client-server-multiplex/pom.xml
@@ -60,7 +60,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -133,7 +133,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml
index 74f48375..3555be72 100644
--- a/intermediate/testcontainers-rabbitmq/pom.xml
+++ b/intermediate/testcontainers-rabbitmq/pom.xml
@@ -179,7 +179,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml
index 3cce9388..b8a3c435 100644
--- a/intermediate/travel/pom.xml
+++ b/intermediate/travel/pom.xml
@@ -70,7 +70,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -143,7 +143,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom
diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml
index 709b0be7..78f78880 100644
--- a/intermediate/tx-synch/pom.xml
+++ b/intermediate/tx-synch/pom.xml
@@ -71,7 +71,7 @@
org.apache.logging.log4j
log4j-core
- 2.17.1
+ 2.17.2
compile
@@ -144,7 +144,7 @@
org.springframework.integration
spring-integration-bom
- 6.0.0-M3
+ 6.0.0-SNAPSHOT
import
pom