diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 2d83eb9c..a2244732 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.11 diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 6a998c5c..21870bff 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -7,8 +7,8 @@ jar UTF-8 - 3.1.3.RELEASE - 3.0.0.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -16,7 +16,7 @@ org.springframework spring-context - ${spring.framework.version} + ${spring.version} org.springframework.integration diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 705b86de..2acafe9e 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -8,8 +8,8 @@ Samples (Applications) - Cafe Sample (Scripted Implementation) UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 15240deb..1f5c0d4f 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -21,8 +21,8 @@ UTF-8 - 3.0.0.RELEASE - 3.1.3.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -30,12 +30,12 @@ org.springframework spring-tx - ${spring.core.version} + ${spring.version} org.springframework spring-context - ${spring.core.version} + ${spring.version} org.springframework.integration diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 3cb2f626..9e3a7b93 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -8,7 +8,7 @@ Samples (Applications) - Loan Broker UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.1.1 1.2.17 4.10 diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index b25713a0..651aaf5c 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -8,8 +8,8 @@ war UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.6.10 1.6.1 diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index eb64c838..4e313741 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 0def9869..4179aff0 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index b0a2c2b8..dae8c325 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index fc3c4519..3b2c95be 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/file/pom.xml b/basic/file/pom.xml index e44865a4..5e7ee54e 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 0d8053fd..f45588f6 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 51c0946c..6ceab69b 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 org.springframework.integration.samples.helloworld.HelloWorldApp diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 12f5cb7b..d47a0198 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -13,8 +13,8 @@ UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.2 1.3.2 1.2.17 diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index cff0ea64..46d4055e 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index fe4e9a48..51dd56cf 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -14,7 +14,8 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 5.7.0 1.2.17 4.10 @@ -44,7 +45,7 @@ org.springframework spring-jms - 3.1.3.RELEASE + ${spring.version} compile diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 06b90020..a430b897 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml b/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml index f621c0d5..0fa4ac0f 100644 --- a/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml +++ b/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml @@ -6,7 +6,7 @@ xmlns:stream="http://www.springframework.org/schema/integration/stream" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.0.xsd + http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd"> @@ -28,8 +28,8 @@ - - \ No newline at end of file + diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 31c0adb9..bc97d9ef 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -16,13 +16,13 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 2.2.0 2.3.2 4.0.1.Final - 3.1.3.RELEASE @@ -33,14 +33,8 @@ repo.eclipse - Spring Framework Maven Milestone Repository - http://download.eclipse.org/rt/eclipselink/maven.repo/ - - - - central - Maven Central - http://repo1.maven.org/maven + EclipseLink Maven Repository + http://download.eclipse.org/rt/eclipselink/maven.repo @@ -65,7 +59,7 @@ java - -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring-instrument.version}/spring-instrument-${spring-instrument.version}.jar + -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version}/spring-instrument-${spring.version}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar -classpath @@ -104,7 +98,7 @@ org.springframework spring-instrument - ${spring-instrument.version} + ${spring.version} diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 946a6e86..adbfca91 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 3e842e0d..5b3402f2 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 @@ -25,7 +25,7 @@ repo.springsource.org.milestone Spring Framework Maven Milestone Repository - https://repo.springsource.org/milestone + https://repo.spring.io/libs-milestone diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/inbound/mongodb-in-config.xml b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/inbound/mongodb-in-config.xml index 348ba872..a6178d18 100644 --- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/inbound/mongodb-in-config.xml +++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/inbound/mongodb-in-config.xml @@ -4,21 +4,21 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-mongodb="http://www.springframework.org/schema/integration/mongodb" xmlns:mongo="http://www.springframework.org/schema/data/mongo" - xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo-1.1.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.2.xsd + xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/integration/mongodb http://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-2.2.xsd"> + http://www.springframework.org/schema/integration/mongodb http://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd"> - - - + - + - + diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml index d865a056..068c7906 100644 --- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml +++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml @@ -4,10 +4,10 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-mongodb="http://www.springframework.org/schema/integration/mongodb" xmlns:mongo="http://www.springframework.org/schema/data/mongo" - xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo-1.1.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.2.xsd + xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/integration/mongodb http://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-2.2.xsd"> + http://www.springframework.org/schema/integration/mongodb http://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd"> diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 22906c9d..6a0256c7 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/pom.xml b/basic/pom.xml index 9bd80f72..69ff3d6c 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -33,6 +33,8 @@ ws-outbound-gateway xml xmpp + mongodb + tcp-amqp diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 73927b21..e0ec68bf 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index bffe8381..b9111e3c 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -11,7 +11,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 7f7fe830..189f5c27 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -16,8 +16,7 @@ UTF-8 - 1.1.3.RELEASE - 3.0.0.RELEASE + 3.0.1.RELEASE 1.6.4 4.10 @@ -105,12 +104,6 @@ spring-integration-ip ${spring.integration.version} - - org.springframework.amqp - spring-rabbit - ${spring.amqp.version} - - diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 6f84f0e9..4d19880d 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.2.6.RELEASE - 3.0.0.RELEASE + 3.2.7.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 org.springframework.integration.samples.tcpclientserver.Main diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 30e7b83e..57a29eca 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 17ab91e7..ace3dc9a 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 9ab5723a..04c42655 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -32,6 +32,7 @@ org.springframework spring-test ${spring.version} + test log4j diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 2d8d9e9f..b86f9292 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 1.3.19 diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index bec9b776..33691558 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 2a4b7e81..cca0a225 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index b83011c6..bd10c0b6 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 229202e6..2219f6e0 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 org.springframework.integration.samples.poller.Main diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index bd971d51..aa5693a6 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 7f4483e4..0b972e07 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 4871f0dc..a4d9799a 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -8,7 +8,8 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -59,7 +60,7 @@ org.springframework spring-test - 3.1.3.RELEASE + ${spring.version} test diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index ce782d1a..fa948a41 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -16,8 +16,8 @@ UTF-8 - 3.0.0.RELEASE - 3.1.3.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -78,13 +78,13 @@ org.springframework spring-context - ${org.springframework-version} + ${spring.version} org.springframework spring-webmvc - ${org.springframework-version} + ${spring.version} diff --git a/intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java b/intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java index 9a02a5e7..8179cdc3 100644 --- a/intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java +++ b/intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 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,9 @@ package org.springframework.integration; +import org.junit.Test; + +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; /** @@ -27,9 +30,16 @@ public class SpringIntegrationTest { public static void main(String[] args) throws Exception { - new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", SpringIntegrationTest.class); + ConfigurableApplicationContext context = + new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", SpringIntegrationTest.class); System.out.println("Hit Enter to terminate"); System.in.read(); + context.close(); + } + + @Test + public void test() { + // no op for maven } } diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 949df9e2..95e7f418 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -8,8 +8,8 @@ war UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.2 1.3.2 1.2.17 diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index adbe0a0a..a2149343 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -13,8 +13,8 @@ - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 3.1.4.RELEASE 1.2 1.3.2 diff --git a/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml b/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml index ae55e3c8..9f9a8ec2 100644 --- a/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml +++ b/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml @@ -1,10 +1,10 @@ diff --git a/intermediate/rest-http/src/main/webapp/WEB-INF/config/security-config.xml b/intermediate/rest-http/src/main/webapp/WEB-INF/config/security-config.xml index 1109cc0b..1bf85f93 100644 --- a/intermediate/rest-http/src/main/webapp/WEB-INF/config/security-config.xml +++ b/intermediate/rest-http/src/main/webapp/WEB-INF/config/security-config.xml @@ -3,20 +3,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd"> + http://www.springframework.org/schema/security/spring-security.xsd"> - - + + - - @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/intermediate/rest-http/src/main/webapp/WEB-INF/config/web-application-config.xml b/intermediate/rest-http/src/main/webapp/WEB-INF/config/web-application-config.xml index f9f13360..b5627086 100644 --- a/intermediate/rest-http/src/main/webapp/WEB-INF/config/web-application-config.xml +++ b/intermediate/rest-http/src/main/webapp/WEB-INF/config/web-application-config.xml @@ -4,13 +4,13 @@ xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + http://www.springframework.org/schema/context/spring-context.xsd"> + - + - - \ No newline at end of file + + diff --git a/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml b/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml index 7eb39a9c..6538278f 100644 --- a/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml +++ b/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-http="http://www.springframework.org/schema/integration/http" xmlns:oxm="http://www.springframework.org/schema/oxm" - xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd - http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - - + http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + @@ -25,11 +25,11 @@ - + - + - + - + diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 26588ae4..25b2321a 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.1.3.RELEASE - 3.0.0.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -55,7 +55,7 @@ org.springframework spring-test - ${spring.framework.version} + ${spring.version} junit diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/circuit-breaker-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/circuit-breaker-advice-context.xml index ddf9691f..fedfcf52 100644 --- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/circuit-breaker-advice-context.xml +++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/circuit-breaker-advice-context.xml @@ -4,7 +4,7 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-stream="http://www.springframework.org/schema/integration/stream" xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd + http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> @@ -12,15 +12,15 @@ - - - + diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml index fce3c05f..9af49c2e 100644 --- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml +++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml @@ -6,12 +6,12 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:int-file="http://www.springframework.org/schema/integration/file" xmlns:int-ftp="http://www.springframework.org/schema/integration/ftp" - xsi:schemaLocation="http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.2.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-2.2.xsd - http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd + http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd + http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> @@ -43,16 +43,16 @@ - + - + - + - + diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml index 29252e82..36e42577 100644 --- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml +++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml @@ -5,10 +5,10 @@ xmlns:int-stream="http://www.springframework.org/schema/integration/stream" xmlns:int-amqp="http://www.springframework.org/schema/integration/amqp" xmlns:rabbit="http://www.springframework.org/schema/rabbit" - xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.2.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd - http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit-1.1.xsd + http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd + http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> @@ -18,13 +18,13 @@ - + @@ -32,24 +32,24 @@ - + - - + @@ -89,9 +89,9 @@ - + - + diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml index 6e897dac..60db3709 100644 --- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml +++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml @@ -4,7 +4,7 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-stream="http://www.springframework.org/schema/integration/stream" xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd + http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> @@ -12,19 +12,19 @@ - + - - + @@ -39,7 +39,7 @@ - + @@ -67,9 +67,9 @@ - + - + diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 362b067c..a1d39009 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -20,11 +20,11 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.16 4.10 1 - 3.2.6.RELEASE + 3.2.7.RELEASE @@ -96,6 +96,7 @@ org.springframework spring-test ${spring.version} + test diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 1c9495c3..6d652741 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 4eb5ba17..6f4515c2 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -17,7 +17,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 5911177c..be76ae4a 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 8dc992fd..96c2f207 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index 7456ab4a..f8e0c2da 100644 --- a/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -7,7 +7,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/jdbc file:///Users/hillert/dev/git/spring-integration/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.2.xsd + http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/spring-integration-jdbc.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"> diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 45eef0ad..b73c4e8b 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.2.6.RELEASE - 3.0.0.RELEASE + 3.2.7.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 38d3e4c5..93e34a6c 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -12,10 +12,10 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 - 3.2.6.RELEASE + 3.2.7.RELEASE org.springframework.integration.samples.travel.Main diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 919daf3d..a19313f7 100755 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.1.3.RELEASE - 3.0.0.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -44,7 +44,7 @@ org.springframework spring-jdbc - ${spring.framework.version} + ${spring.version} com.h2database @@ -65,7 +65,7 @@ org.springframework spring-test - ${spring.framework.version} + ${spring.version} junit @@ -92,7 +92,7 @@ exec-maven-plugin 1.2 - ${java.main.class} + org.springframework.integration.samples.advice.TransactionSynchronizationDemo @@ -101,7 +101,7 @@ repo.springsource.org.milestone Spring Framework Maven Milestone Repository - https://repo.springsource.org/libs-snapshot + https://repo.spring.io/libs-milestone diff --git a/intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml b/intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml index 9244deac..1caf95b6 100755 --- a/intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml +++ b/intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml @@ -10,7 +10,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd - http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.2.xsd + http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> @@ -30,20 +30,20 @@ - - + - - - +