Spring/spring-integration-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to the latest deps; fix compatibility

Browse Source
This commit is contained in:
Artem Bilan
2022-07-12 17:25:34 -04:00
parent 0b83398a9c
commit ceeebd7be7
72 changed files with 143 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
advanced/advanced-testing-examples/pom.xml
View File

@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
advanced/dynamic-ftp/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
advanced/dynamic-tcp-client/pom.xml
View File

@@ -145,7 +145,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
applications/cafe-scripted/pom.xml
View File

@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -166,7 +166,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
applications/cafe/cafe-amqp/pom.xml
View File

@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
applications/cafe/cafe-jms/pom.xml
View File

@@ -90,7 +90,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -163,7 +163,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
applications/cafe/cafe-si/pom.xml
View File

@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
applications/file-split-ftp/pom.xml
View File

@@ -172,7 +172,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java
View File

@@ -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)

4
applications/loan-broker/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
applications/loanshark/pom.xml
View File

@@ -165,9 +165,9 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core-jakarta</artifactId>
<version>5.6.3.Final</version>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
<version>6.1.1.Final</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -217,7 +217,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -332,7 +332,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
applications/stomp-chat/pom.xml
View File

@@ -155,7 +155,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/amqp/pom.xml
View File

@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
basic/barrier/pom.xml
View File

@@ -160,7 +160,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/control-bus/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/enricher/pom.xml
View File

@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/feed/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/file/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/ftp/pom.xml
View File

@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -157,7 +157,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/helloworld/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/http/pom.xml
View File

@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/jdbc/pom.xml
View File

@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/jms/pom.xml
View File

@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -162,7 +162,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/jmx/pom.xml
View File

@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

12
basic/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java
View File

@@ -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

2
basic/jpa/pom.xml
View File

@@ -162,7 +162,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
basic/jpa/src/main/resources/schema.sql
View File

@@ -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;

7
basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java
View File

@@ -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 {

4
basic/kafka/pom.xml
View File

@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -162,7 +162,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/mail/pom.xml
View File

@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/mongodb/pom.xml
View File

@@ -60,13 +60,13 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>4.4.1</version>
<version>4.7.0-beta0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
basic/mqtt/pom.xml
View File

@@ -150,7 +150,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/oddeven/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/quote/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/sftp/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/tcp-amqp/pom.xml
View File

@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
basic/tcp-broadcast/pom.xml
View File

@@ -150,7 +150,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/tcp-client-server/pom.xml
View File

@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
basic/tcp-with-headers/pom.xml
View File

@@ -150,7 +150,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/testing-examples/pom.xml
View File

@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -148,7 +148,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/twitter/pom.xml
View File

@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
basic/web-sockets/pom.xml
View File

@@ -145,7 +145,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/ws-inbound-gateway/pom.xml
View File

@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -175,7 +175,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/ws-outbound-gateway/pom.xml
View File

@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/xml/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/xmpp/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

11
build.gradle
View File

@@ -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
}
}

2
dsl/cafe-dsl/pom.xml
View File

@@ -156,7 +156,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
dsl/kafka-dsl/pom.xml
View File

@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
dsl/si4demo/pom.xml
View File

@@ -178,7 +178,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/async-gateway/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/dynamic-poller/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

159
intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/DynamicPeriodicTrigger.java
View File

@@ -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);
}
}

9
intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java
View File

@@ -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) {

4
intermediate/dynamic-poller/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
View File

@@ -14,8 +14,8 @@
</int:inbound-channel-adapter>
<bean id="dynamicTrigger"
class="org.springframework.integration.samples.poller.DynamicPeriodicTrigger">
<constructor-arg name="period" value="5000" />
class="org.springframework.integration.util.DynamicPeriodicTrigger">
<constructor-arg name="duration" value="#{T(java.time.Duration).ofMillis(5000)}" />
</bean>
<int:logging-channel-adapter id="logger"

4
intermediate/errorhandling/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/file-processing/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/mail-attachments/pom.xml
View File

@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/monitoring/pom.xml
View File

@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -187,7 +187,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/multipart-http/pom.xml
View File

@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -187,7 +187,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/rest-http/pom.xml
View File

@@ -107,7 +107,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -218,7 +218,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/retry-and-more/pom.xml
View File

@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -166,7 +166,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/splitter-aggregator-reaper/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/stored-procedures-derby/pom.xml
View File

@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/stored-procedures-ms/pom.xml
View File

@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -145,7 +145,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/stored-procedures-oracle/pom.xml
View File

@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/stored-procedures-postgresql/pom.xml
View File

@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -151,7 +151,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
intermediate/tcp-async-bi-directional/pom.xml
View File

@@ -145,7 +145,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/tcp-client-server-multiplex/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
intermediate/testcontainers-rabbitmq/pom.xml
View File

@@ -179,7 +179,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/travel/pom.xml
View File

@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -143,7 +143,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/tx-synch/pom.xml
View File

@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>