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