Skip to content

Commit 2587ed6

Browse files
artembilangaryrussell
authored andcommitted
INT-3518: Upgrade versions and some cleanup
JIRA: https://jira.spring.io/browse/INT-3518
1 parent 30b5883 commit 2587ed6

File tree

8 files changed

+71
-103
lines changed

8 files changed

+71
-103
lines changed

build.gradle

Lines changed: 19 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -67,31 +67,30 @@ subprojects { subproject ->
6767
targetCompatibility=1.6
6868

6969
ext {
70-
activeMqVersion = '5.9.0'
71-
aspectjVersion = '1.8.0'
70+
activeMqVersion = '5.10.0'
71+
aspectjVersion = '1.8.2'
7272
apacheSshdVersion = '0.10.1'
73-
boonVersion = '0.22'
73+
boonVersion = '0.25'
7474
commonsDbcpVersion = '1.4'
7575
commonsIoVersion = '2.4'
7676
commonsNetVersion = '3.3'
77-
httpClientVersion = '3.1'
78-
derbyVersion = '10.10.1.1'
77+
derbyVersion = '10.10.2.0'
7978
eclipseLinkVersion = '2.4.2'
8079
ftpServerVersion = '1.0.6'
81-
groovyVersion = '2.3.1'
80+
groovyVersion = '2.3.6'
8281
guavaVersion = '16.0.1'
8382
hamcrestVersion = '1.3'
84-
hibernateVersion = '4.2.11.Final'
83+
hibernateVersion = '4.3.6.Final'
8584
hsqldbVersion = '2.3.2'
86-
h2Version = '1.3.175'
87-
jackson2Version = '2.3.2'
85+
h2Version = '1.4.180'
86+
jackson2Version = '2.4.2'
8887
javaxActivationVersion = '1.1.1'
89-
javaxMailVersion = '1.4.7'
90-
jedisVersion = '2.4.2'
91-
jettyVersion = '9.2.1.v20140609'
88+
javaxMailVersion = '1.5.2'
89+
jedisVersion = '2.5.2'
90+
jettyVersion = '9.2.2.v20140723'
9291
jmsApiVersion = '1.1-rev-1'
9392
jpaApiVersion = '2.0.0'
94-
jrubyVersion = '1.7.12'
93+
jrubyVersion = '1.7.15'
9594
jschVersion = '0.1.51'
9695
jsonpathVersion = '0.9.1'
9796
junitVersion = '4.11'
@@ -105,18 +104,17 @@ subprojects { subproject ->
105104
reactorVersion = '1.1.4.RELEASE'
106105
reactorSpringVersion = '1.1.3.RELEASE'
107106
romeToolsVersion = '1.5.0'
108-
romeVersion = '1.0.0'
109107
saajApiVersion = '1.3.5'
110108
saajImplVersion = '1.3.23'
111109
servletApiVersion = '3.1.0'
112110
slf4jVersion = "1.7.6"
113111
smack3Version = '3.2.1'
114112
smackVersion = '4.0.0'
115113
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.4.0.M1'
116-
springDataMongoVersion = '1.5.0.RELEASE'
117-
springDataRedisVersion = '1.3.0.RELEASE'
118-
springGemfireVersion = '1.4.0.RELEASE'
119-
springSecurityVersion = '3.2.4.RELEASE'
114+
springDataMongoVersion = '1.6.0.RELEASE'
115+
springDataRedisVersion = '1.4.0.RELEASE'
116+
springGemfireVersion = '1.5.0.RELEASE'
117+
springSecurityVersion = '3.2.5.RELEASE'
120118
springSocialTwitterVersion = '1.1.0.RELEASE'
121119
springRetryVersion = '1.1.1.RELEASE'
122120
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.1.0.RELEASE'
@@ -224,7 +222,6 @@ project('spring-integration-amqp') {
224222
description = 'Spring Integration AMQP Support'
225223
dependencies {
226224
compile project(":spring-integration-core")
227-
compile "org.springframework:spring-tx:$springVersion"
228225
compile("org.springframework.amqp:spring-rabbit:$springAmqpVersion") {
229226
exclude group: 'org.springframework', module: 'spring-aop'
230227
exclude group: 'org.springframework', module: 'spring-context'
@@ -258,27 +255,21 @@ project('spring-integration-event') {
258255
description = 'Spring Integration ApplicationEvent Support'
259256
dependencies {
260257
compile project(":spring-integration-core")
261-
compile "org.springframework:spring-context:$springVersion"
262258
}
263259
}
264260

265261
project('spring-integration-feed') {
266262
description = 'Spring Integration RSS Feed Support'
267263
dependencies {
268264
compile project(":spring-integration-core")
269-
compile "org.springframework:spring-context:$springVersion"
270-
compile ("net.java.dev.rome:rome-fetcher:$romeVersion") {
271-
exclude group: 'junit', module: 'junit'
272-
}
273-
compile "net.java.dev.rome:rome:$romeVersion"
265+
compile "com.rometools:rome-fetcher:$romeToolsVersion"
274266
}
275267
}
276268

277269
project('spring-integration-file') {
278270
description = 'Spring Integration File Support'
279271
dependencies {
280272
compile project(":spring-integration-core")
281-
compile "org.springframework:spring-context:$springVersion"
282273
compile "commons-io:commons-io:$commonsIoVersion"
283274
testCompile project(":spring-integration-redis")
284275
testCompile project(":spring-integration-redis").sourceSets.test.output
@@ -314,7 +305,6 @@ project('spring-integration-gemfire') {
314305
exclude group: 'org.springframework', module: 'spring-core'
315306
exclude group: 'org.springframework', module: 'spring-tx'
316307
}
317-
compile "org.springframework:spring-tx:$springVersion"
318308
testCompile project(":spring-integration-stream")
319309

320310
}
@@ -336,24 +326,15 @@ project('spring-integration-http') {
336326
dependencies {
337327
compile project(":spring-integration-core")
338328
compile "org.springframework:spring-webmvc:$springVersion"
339-
compile("net.java.dev.rome:rome-fetcher:$romeVersion") {
340-
optional
341-
exclude group: 'junit', module: 'junit'
342-
}
343-
344-
compile("com.rometools:rome:$romeToolsVersion", optional) //For spring-web-4.1
345-
329+
compile("com.rometools:rome:$romeToolsVersion", optional)
346330
compile("javax.servlet:javax.servlet-api:$servletApiVersion", provided)
347-
348-
testCompile "commons-httpclient:commons-httpclient:$httpClientVersion"
349331
}
350332
}
351333

352334
project('spring-integration-ip') {
353335
description = 'Spring Integration IP Support'
354336
dependencies {
355337
compile project(":spring-integration-core")
356-
compile "org.springframework:spring-context:$springVersion"
357338
testCompile project(":spring-integration-stream")
358339
}
359340
}
@@ -362,15 +343,13 @@ project('spring-integration-jdbc') {
362343
description = 'Spring Integration JDBC Support'
363344
dependencies {
364345
compile project(":spring-integration-core")
365-
compile "org.springframework:spring-aop:$springVersion"
366346
compile "org.springframework:spring-jdbc:$springVersion"
367-
compile "org.springframework:spring-tx:$springVersion"
368347
compile "com.google.guava:guava:$guavaVersion"
348+
369349
testCompile "com.h2database:h2:$h2Version"
370350
testCompile "org.hsqldb:hsqldb:$hsqldbVersion"
371351
testCompile "org.apache.derby:derby:$derbyVersion"
372352
testCompile "org.apache.derby:derbyclient:$derbyVersion"
373-
374353
testCompile "postgresql:postgresql:$postgresVersion"
375354
testCompile "mysql:mysql-connector-java:$mysqlVersion"
376355
testCompile "commons-dbcp:commons-dbcp:$commonsDbcpVersion"
@@ -386,7 +365,6 @@ project('spring-integration-jms') {
386365
dependencies {
387366
compile project(":spring-integration-core")
388367
compile "org.springframework:spring-jms:$springVersion"
389-
compile "org.springframework:spring-tx:$springVersion"
390368
compile ("javax.jms:jms-api:$jmsApiVersion", provided)
391369
testCompile("org.apache.activemq:activemq-broker:$activeMqVersion")
392370
testCompile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") {
@@ -400,7 +378,6 @@ project('spring-integration-jmx') {
400378
description = 'Spring Integration JMX Support'
401379
dependencies {
402380
compile project(":spring-integration-core")
403-
compile "org.springframework:spring-context:$springVersion"
404381
testCompile "org.aspectj:aspectjweaver:$aspectjVersion"
405382
}
406383
}
@@ -409,9 +386,7 @@ project('spring-integration-jpa') {
409386
description = 'Spring Integration JPA Support'
410387
dependencies {
411388
compile project(":spring-integration-core")
412-
compile "org.springframework:spring-aop:$springVersion"
413389
compile "org.springframework:spring-orm:$springVersion"
414-
compile "org.springframework:spring-tx:$springVersion"
415390
compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion"
416391

417392
testCompile "com.h2database:h2:$h2Version"
@@ -456,7 +431,6 @@ project('spring-integration-mongodb') {
456431
description = 'Spring Integration MongoDB Support'
457432
dependencies {
458433
compile project(":spring-integration-core")
459-
compile "org.springframework:spring-tx:$springVersion"
460434
compile("org.springframework.data:spring-data-mongodb:$springDataMongoVersion") {
461435
exclude group: 'org.springframework', module: 'spring-beans'
462436
exclude group: 'org.springframework', module: 'spring-context'
@@ -479,7 +453,6 @@ project('spring-integration-redis') {
479453
description = 'Spring Integration Redis Support'
480454
dependencies {
481455
compile project(":spring-integration-core")
482-
compile "org.springframework:spring-tx:$springVersion"
483456
compile ("org.springframework.data:spring-data-redis:$springDataRedisVersion") {
484457
exclude group: 'org.springframework', module: 'spring-beans'
485458
exclude group: 'org.springframework', module: 'spring-context'
@@ -496,8 +469,6 @@ project('spring-integration-rmi') {
496469
description = 'Spring Integration RMI Support'
497470
dependencies {
498471
compile project(":spring-integration-core")
499-
compile "org.springframework:spring-aop:$springVersion"
500-
compile "org.springframework:spring-context:$springVersion"
501472
}
502473
}
503474

@@ -515,8 +486,6 @@ project('spring-integration-security') {
515486
description = 'Spring Integration Security Support'
516487
dependencies {
517488
compile project(":spring-integration-core")
518-
compile "org.springframework:spring-aop:$springVersion"
519-
compile "org.springframework:spring-tx:$springVersion"
520489
compile("org.springframework.security:spring-security-core:$springSecurityVersion") {
521490
exclude group: 'org.springframework', module: 'spring-support'
522491
}
@@ -529,7 +498,6 @@ project('spring-integration-security') {
529498
project('spring-integration-sftp') {
530499
description = 'Spring Integration SFTP Support'
531500
dependencies {
532-
compile project(":spring-integration-core")
533501
compile project(":spring-integration-file")
534502
compile project(":spring-integration-stream")
535503
compile "com.jcraft:jsch:$jschVersion"
@@ -543,7 +511,6 @@ project('spring-integration-stream') {
543511
description = 'Spring Integration Stream Support'
544512
dependencies {
545513
compile project(":spring-integration-core")
546-
compile "org.springframework:spring-context:$springVersion"
547514
}
548515
}
549516

@@ -565,7 +532,6 @@ project('spring-integration-test') {
565532
compile ("org.mockito:mockito-core:$mockitoVersion") {
566533
exclude group: 'org.hamcrest', module: 'hamcrest-core'
567534
}
568-
compile "org.springframework:spring-context:$springVersion"
569535
compile "org.springframework:spring-test:$springVersion"
570536
}
571537
}
@@ -615,7 +581,6 @@ project('spring-integration-ws') {
615581
description = 'Spring Integration Web Services Support'
616582
dependencies {
617583
compile project(":spring-integration-core")
618-
compile "org.springframework:spring-expression:$springVersion"
619584
compile "org.springframework:spring-oxm:$springVersion"
620585
compile "org.springframework:spring-webmvc:$springVersion"
621586
compile ("org.springframework.ws:spring-ws-core:$springWsVersion") {
@@ -655,7 +620,6 @@ project('spring-integration-xml') {
655620
description = 'Spring Integration XML Support'
656621
dependencies {
657622
compile project(":spring-integration-core")
658-
compile "org.springframework:spring-context:$springVersion"
659623
compile "org.springframework:spring-oxm:$springVersion"
660624
compile ("org.springframework.ws:spring-xml:$springWsVersion") {
661625
exclude group: 'org.springframework', module: 'spring-beans'

spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
import org.springframework.util.CollectionUtils;
3737
import org.springframework.util.StringUtils;
3838

39-
import com.sun.syndication.feed.synd.SyndEntry;
40-
import com.sun.syndication.feed.synd.SyndFeed;
41-
import com.sun.syndication.fetcher.FeedFetcher;
42-
import com.sun.syndication.fetcher.FetcherEvent;
43-
import com.sun.syndication.fetcher.FetcherListener;
44-
import com.sun.syndication.fetcher.impl.HashMapFeedInfoCache;
45-
import com.sun.syndication.fetcher.impl.HttpURLFeedFetcher;
39+
import com.rometools.fetcher.FeedFetcher;
40+
import com.rometools.fetcher.FetcherEvent;
41+
import com.rometools.fetcher.FetcherListener;
42+
import com.rometools.fetcher.impl.HashMapFeedInfoCache;
43+
import com.rometools.fetcher.impl.HttpURLFeedFetcher;
44+
import com.rometools.rome.feed.synd.SyndEntry;
45+
import com.rometools.rome.feed.synd.SyndFeed;
4646

4747
/**
4848
* This implementation of {@link MessageSource} will produce individual
@@ -81,7 +81,6 @@ public class FeedEntryMessageSource extends IntegrationObjectSupport implements
8181
* Creates a FeedEntryMessageSource that will use a HttpURLFeedFetcher to read feeds from the given URL.
8282
* If the feed URL has a protocol other than http*, consider providing a custom implementation of the
8383
* {@link FeedFetcher} via the alternate constructor.
84-
*
8584
* @param feedUrl The URL.
8685
* @param metadataKey The metadata key.
8786
*/
@@ -91,7 +90,6 @@ public FeedEntryMessageSource(URL feedUrl, String metadataKey) {
9190

9291
/**
9392
* Creates a FeedEntryMessageSource that will use the provided FeedFetcher to read from the given feed URL.
94-
*
9593
* @param feedUrl The URL.
9694
* @param metadataKey The metadata key.
9795
* @param feedFetcher The feed fetcher.
@@ -118,7 +116,8 @@ public String getComponentType() {
118116

119117
@Override
120118
public Message<SyndEntry> receive() {
121-
Assert.isTrue(this.initialized, "'FeedEntryReaderMessageSource' must be initialized before it can produce Messages.");
119+
Assert.isTrue(this.initialized,
120+
"'FeedEntryReaderMessageSource' must be initialized before it can produce Messages.");
122121
SyndEntry entry = doReceive();
123122
if (entry == null) {
124123
return null;
@@ -176,7 +175,6 @@ private SyndEntry getNextEntry() {
176175
return next;
177176
}
178177

179-
@SuppressWarnings("unchecked")
180178
private void populateEntryList() {
181179
SyndFeed syndFeed = this.getFeed();
182180
if (syndFeed != null) {
@@ -244,7 +242,7 @@ public int compare(SyndEntry entry1, SyndEntry entry2) {
244242
private class FeedQueueUpdatingFetcherListener implements FetcherListener {
245243

246244
/**
247-
* @see com.sun.syndication.fetcher.FetcherListener#fetcherEvent(com.sun.syndication.fetcher.FetcherEvent)
245+
* @see FetcherListener#fetcherEvent(FetcherEvent)
248246
*/
249247
@Override
250248
public void fetcherEvent(final FetcherEvent event) {

spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2014 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -36,20 +36,20 @@
3636

3737
import org.springframework.context.ApplicationContext;
3838
import org.springframework.context.support.ClassPathXmlApplicationContext;
39-
import org.springframework.messaging.Message;
40-
import org.springframework.messaging.MessageChannel;
41-
import org.springframework.messaging.MessagingException;
4239
import org.springframework.integration.channel.DirectChannel;
43-
import org.springframework.messaging.MessageHandler;
4440
import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
4541
import org.springframework.integration.feed.inbound.FeedEntryMessageSource;
4642
import org.springframework.integration.history.MessageHistory;
4743
import org.springframework.integration.metadata.MetadataStore;
4844
import org.springframework.integration.test.util.TestUtils;
45+
import org.springframework.messaging.Message;
46+
import org.springframework.messaging.MessageChannel;
47+
import org.springframework.messaging.MessageHandler;
48+
import org.springframework.messaging.MessagingException;
4949

50-
import com.sun.syndication.feed.synd.SyndEntry;
51-
import com.sun.syndication.fetcher.impl.AbstractFeedFetcher;
52-
import com.sun.syndication.fetcher.impl.HttpURLFeedFetcher;
50+
import com.rometools.fetcher.impl.AbstractFeedFetcher;
51+
import com.rometools.fetcher.impl.HttpURLFeedFetcher;
52+
import com.rometools.rome.feed.synd.SyndEntry;
5353

5454
/**
5555
* @author Oleg Zhurakousky
@@ -175,6 +175,7 @@ public static class SampleServiceNoHistory {
175175
public void receiveFeedEntry(SyndEntry entry) {
176176
latch.countDown();
177177
}
178+
178179
}
179180

180181

@@ -191,6 +192,7 @@ public String get(String key) {
191192
public String remove(String key) {
192193
return null;
193194
}
195+
194196
}
195197

196198
}

spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.springframework.integration.metadata.PropertiesPersistingMetadataStore;
3232
import org.springframework.messaging.Message;
3333

34-
import com.sun.syndication.feed.synd.SyndEntry;
35-
import com.sun.syndication.fetcher.FeedFetcher;
34+
import com.rometools.fetcher.FeedFetcher;
35+
import com.rometools.rome.feed.synd.SyndEntry;
3636

3737
/**
3838
* @author Oleg Zhurakousky
@@ -47,7 +47,8 @@ public class FeedEntryMessageSourceTests {
4747

4848
@Before
4949
public void prepare() {
50-
File metadataStoreFile = new File(System.getProperty("java.io.tmpdir") + "/spring-integration/", "metadata-store.properties");
50+
File metadataStoreFile = new File(System.getProperty("java.io.tmpdir") + "/spring-integration/",
51+
"metadata-store.properties");
5152
if (metadataStoreFile.exists()) {
5253
metadataStoreFile.delete();
5354
}

0 commit comments

Comments
 (0)