Skip to content

Commit 68976a8

Browse files
kasobanartembilan
kasoban
authored and
artembilan
committed
Add specific slf4j-api version dependency
When just importing the ftp example as a maven project, I ran into the issue of a slf4j version discrepancy described here: http://www.slf4j.org/faq.html#IllegalAccessError This is solved by adding the specific version dependency of `slf4j-api`. * Add the specific `slf4j-api` dependency to the Gradle script * Change the dependency scope for `slf4j-` impl to the `runtime`. * Regenerate POMs
1 parent b969790 commit 68976a8

File tree

59 files changed

+665
-681
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+665
-681
lines changed

‎advanced/advanced-testing-examples/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<url>https://github.com/spring-projects/spring-integration-samples</url>
5454
</scm>
5555
<dependencies>
56+
<dependency>
57+
<groupId>org.springframework.integration</groupId>
58+
<artifactId>spring-integration-jms</artifactId>
59+
<version>4.2.2.RELEASE</version>
60+
<scope>compile</scope>
61+
</dependency>
5662
<dependency>
5763
<groupId>junit</groupId>
5864
<artifactId>junit</artifactId>
@@ -67,8 +73,8 @@
6773
</dependency>
6874
<dependency>
6975
<groupId>org.springframework.integration</groupId>
70-
<artifactId>spring-integration-jms</artifactId>
71-
<version>4.2.0.RELEASE</version>
76+
<artifactId>spring-integration-groovy</artifactId>
77+
<version>4.2.2.RELEASE</version>
7278
<scope>compile</scope>
7379
</dependency>
7480
<dependency>
@@ -77,16 +83,10 @@
7783
<version>1.1-rev-1</version>
7884
<scope>compile</scope>
7985
</dependency>
80-
<dependency>
81-
<groupId>org.springframework.integration</groupId>
82-
<artifactId>spring-integration-groovy</artifactId>
83-
<version>4.2.0.RELEASE</version>
84-
<scope>compile</scope>
85-
</dependency>
8686
<dependency>
8787
<groupId>org.springframework</groupId>
8888
<artifactId>spring-test</artifactId>
89-
<version>4.2.0.RELEASE</version>
89+
<version>4.2.3.RELEASE</version>
9090
<scope>test</scope>
9191
</dependency>
9292
<dependency>

‎advanced/dynamic-ftp/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<url>https://github.com/spring-projects/spring-integration-samples</url>
5454
</scm>
5555
<dependencies>
56+
<dependency>
57+
<groupId>org.springframework.integration</groupId>
58+
<artifactId>spring-integration-ftp</artifactId>
59+
<version>4.2.2.RELEASE</version>
60+
<scope>compile</scope>
61+
</dependency>
5662
<dependency>
5763
<groupId>junit</groupId>
5864
<artifactId>junit</artifactId>
@@ -65,16 +71,10 @@
6571
<version>1.3</version>
6672
<scope>test</scope>
6773
</dependency>
68-
<dependency>
69-
<groupId>org.springframework.integration</groupId>
70-
<artifactId>spring-integration-ftp</artifactId>
71-
<version>4.2.0.RELEASE</version>
72-
<scope>compile</scope>
73-
</dependency>
7474
<dependency>
7575
<groupId>org.springframework</groupId>
7676
<artifactId>spring-test</artifactId>
77-
<version>4.2.0.RELEASE</version>
77+
<version>4.2.3.RELEASE</version>
7878
<scope>test</scope>
7979
</dependency>
8080
<dependency>

‎applications/cafe-scripted/pom.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<url>https://github.com/spring-projects/spring-integration-samples</url>
5454
</scm>
5555
<dependencies>
56+
<dependency>
57+
<groupId>org.springframework.integration</groupId>
58+
<artifactId>spring-integration-rmi</artifactId>
59+
<version>4.2.2.RELEASE</version>
60+
<scope>compile</scope>
61+
</dependency>
5662
<dependency>
5763
<groupId>junit</groupId>
5864
<artifactId>junit</artifactId>
@@ -65,28 +71,16 @@
6571
<version>1.3</version>
6672
<scope>test</scope>
6773
</dependency>
68-
<dependency>
69-
<groupId>org.springframework.integration</groupId>
70-
<artifactId>spring-integration-jmx</artifactId>
71-
<version>4.2.0.RELEASE</version>
72-
<scope>compile</scope>
73-
</dependency>
7474
<dependency>
7575
<groupId>org.codehaus.groovy</groupId>
7676
<artifactId>groovy-all</artifactId>
7777
<version>2.3.0</version>
7878
<scope>compile</scope>
7979
</dependency>
80-
<dependency>
81-
<groupId>org.springframework.integration</groupId>
82-
<artifactId>spring-integration-stream</artifactId>
83-
<version>4.2.0.RELEASE</version>
84-
<scope>compile</scope>
85-
</dependency>
8680
<dependency>
8781
<groupId>org.springframework.integration</groupId>
8882
<artifactId>spring-integration-groovy</artifactId>
89-
<version>4.2.0.RELEASE</version>
83+
<version>4.2.2.RELEASE</version>
9084
<scope>compile</scope>
9185
</dependency>
9286
<dependency>
@@ -98,9 +92,15 @@
9892
<dependency>
9993
<groupId>org.springframework</groupId>
10094
<artifactId>spring-test</artifactId>
101-
<version>4.2.0.RELEASE</version>
95+
<version>4.2.3.RELEASE</version>
10296
<scope>test</scope>
10397
</dependency>
98+
<dependency>
99+
<groupId>org.springframework.integration</groupId>
100+
<artifactId>spring-integration-jmx</artifactId>
101+
<version>4.2.2.RELEASE</version>
102+
<scope>compile</scope>
103+
</dependency>
104104
<dependency>
105105
<groupId>log4j</groupId>
106106
<artifactId>log4j</artifactId>
@@ -121,8 +121,8 @@
121121
</dependency>
122122
<dependency>
123123
<groupId>org.springframework.integration</groupId>
124-
<artifactId>spring-integration-rmi</artifactId>
125-
<version>4.2.0.RELEASE</version>
124+
<artifactId>spring-integration-stream</artifactId>
125+
<version>4.2.2.RELEASE</version>
126126
<scope>compile</scope>
127127
</dependency>
128128
</dependencies>

‎applications/cafe/cafe-amqp/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@
7474
<dependency>
7575
<groupId>org.springframework.integration</groupId>
7676
<artifactId>spring-integration-amqp</artifactId>
77-
<version>4.2.0.RELEASE</version>
77+
<version>4.2.2.RELEASE</version>
7878
<scope>compile</scope>
7979
</dependency>
8080
<dependency>
8181
<groupId>org.springframework</groupId>
8282
<artifactId>spring-test</artifactId>
83-
<version>4.2.0.RELEASE</version>
83+
<version>4.2.3.RELEASE</version>
8484
<scope>test</scope>
8585
</dependency>
8686
<dependency>

‎applications/cafe/cafe-jms/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<url>https://github.com/spring-projects/spring-integration-samples</url>
5454
</scm>
5555
<dependencies>
56+
<dependency>
57+
<groupId>org.springframework.integration</groupId>
58+
<artifactId>spring-integration-jms</artifactId>
59+
<version>4.2.2.RELEASE</version>
60+
<scope>compile</scope>
61+
</dependency>
5662
<dependency>
5763
<groupId>junit</groupId>
5864
<artifactId>junit</artifactId>
@@ -74,25 +80,19 @@
7480
<dependency>
7581
<groupId>org.apache.activemq</groupId>
7682
<artifactId>activemq-broker</artifactId>
77-
<version>5.11.1</version>
83+
<version>5.12.1</version>
7884
<scope>compile</scope>
7985
</dependency>
8086
<dependency>
8187
<groupId>org.apache.activemq</groupId>
8288
<artifactId>activemq-kahadb-store</artifactId>
83-
<version>5.11.1</version>
84-
<scope>compile</scope>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.springframework.integration</groupId>
88-
<artifactId>spring-integration-jms</artifactId>
89-
<version>4.2.0.RELEASE</version>
89+
<version>5.12.1</version>
9090
<scope>compile</scope>
9191
</dependency>
9292
<dependency>
9393
<groupId>org.springframework</groupId>
9494
<artifactId>spring-test</artifactId>
95-
<version>4.2.0.RELEASE</version>
95+
<version>4.2.3.RELEASE</version>
9696
<scope>test</scope>
9797
</dependency>
9898
<dependency>

‎applications/cafe/cafe-si/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,10 @@
6565
<version>1.3</version>
6666
<scope>test</scope>
6767
</dependency>
68-
<dependency>
69-
<groupId>org.springframework.integration</groupId>
70-
<artifactId>spring-integration-stream</artifactId>
71-
<version>4.2.0.RELEASE</version>
72-
<scope>compile</scope>
73-
</dependency>
7468
<dependency>
7569
<groupId>org.springframework</groupId>
7670
<artifactId>spring-test</artifactId>
77-
<version>4.2.0.RELEASE</version>
71+
<version>4.2.3.RELEASE</version>
7872
<scope>test</scope>
7973
</dependency>
8074
<dependency>
@@ -95,6 +89,12 @@
9589
<version>1.9.5</version>
9690
<scope>test</scope>
9791
</dependency>
92+
<dependency>
93+
<groupId>org.springframework.integration</groupId>
94+
<artifactId>spring-integration-stream</artifactId>
95+
<version>4.2.2.RELEASE</version>
96+
<scope>compile</scope>
97+
</dependency>
9898
</dependencies>
9999
<repositories>
100100
<repository>

‎applications/loan-broker/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<url>https://github.com/spring-projects/spring-integration-samples</url>
5454
</scm>
5555
<dependencies>
56+
<dependency>
57+
<groupId>org.springframework.integration</groupId>
58+
<artifactId>spring-integration-ip</artifactId>
59+
<version>4.2.2.RELEASE</version>
60+
<scope>compile</scope>
61+
</dependency>
5662
<dependency>
5763
<groupId>junit</groupId>
5864
<artifactId>junit</artifactId>
@@ -65,16 +71,10 @@
6571
<version>1.3</version>
6672
<scope>test</scope>
6773
</dependency>
68-
<dependency>
69-
<groupId>org.springframework.integration</groupId>
70-
<artifactId>spring-integration-ip</artifactId>
71-
<version>4.2.0.RELEASE</version>
72-
<scope>compile</scope>
73-
</dependency>
7474
<dependency>
7575
<groupId>org.springframework</groupId>
7676
<artifactId>spring-test</artifactId>
77-
<version>4.2.0.RELEASE</version>
77+
<version>4.2.3.RELEASE</version>
7878
<scope>test</scope>
7979
</dependency>
8080
<dependency>

0 commit comments

Comments
 (0)