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

INTSAMPLES-125/126:SF 3.2.7, SI 3.0.1; Schemas

Browse Source 
JIRA: https://jira.springsource.org/browse/INTSAMPLES-125

Polishing some poms and enable all modules

INTSAMPLES-126: Fix XSD versions vulnerability

JIRA: https://jira.springsource.org/browse/INTSAMPLES-126

Polishing

Add dummy JUnit to monitoring "test".
This commit is contained in:
Artem Bilan
2014-01-31 12:11:46 +02:00
committed by Gary Russell
parent 56aee6fd91
commit e20219560f
63 changed files with 177 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basic/amqp/pom.xml
View File

@@ -16,7 +16,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

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

@@ -14,7 +14,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
basic/enricher/pom.xml
View File

@@ -16,7 +16,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
basic/feed/pom.xml
View File

@@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
basic/file/pom.xml
View File

@@ -12,7 +12,7 @@
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
basic/ftp/pom.xml
View File

@@ -13,7 +13,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
basic/helloworld/pom.xml
View File

@@ -14,7 +14,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
<java.main.class>org.springframework.integration.samples.helloworld.HelloWorldApp</java.main.class>

4
basic/http/pom.xml
View File

@@ -13,8 +13,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.version>3.2.6.RELEASE</spring.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<spring.version>3.2.7.RELEASE</spring.version>
<commons-fileupload>1.2.2</commons-fileupload>
<commons-io>1.3.2</commons-io>
<log4j.version>1.2.17</log4j.version>

2
basic/jdbc/pom.xml
View File

@@ -16,7 +16,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

5
basic/jms/pom.xml
View File

@@ -14,7 +14,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<spring.version>3.2.7.RELEASE</spring.version>
<activemq.version>5.7.0</activemq.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
@@ -44,7 +45,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>3.1.3.RELEASE</version>
<version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<dependency>

2
basic/jmx/pom.xml
View File

@@ -14,7 +14,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

6
basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml
View File

@@ -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 @@
<si:filter input-channel="seconds" expression="payload >= 10" output-channel="reset"/>
<jmx:operation-invoking-channel-adapter id="reset"
<jmx:operation-invoking-channel-adapter id="reset"
object-name="org.springframework.integration.samples.jmx:type=StopWatch,name=stopWatch"
operation-name="reset"/>
</beans>
</beans>

18
basic/jpa/pom.xml
View File

@@ -16,13 +16,13 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<spring.version>3.2.7.RELEASE</spring.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
<openjpa.version>2.2.0</openjpa.version>
<eclipselink.version>2.3.2</eclipselink.version>
<hibernate.version>4.0.1.Final</hibernate.version>
<spring-instrument.version>3.1.3.RELEASE</spring-instrument.version>
</properties>
<repositories>
@@ -33,14 +33,8 @@
</repository>
<repository>
<id>repo.eclipse</id>
<name>Spring Framework Maven Milestone Repository</name>
<url> http://download.eclipse.org/rt/eclipselink/maven.repo/</url>
<snapshots><enabled></enabled></snapshots>
</repository>
<repository>
<id>central</id>
<name>Maven Central</name>
<url>http://repo1.maven.org/maven</url>
<name>EclipseLink Maven Repository</name>
<url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
</repository>
</repositories>
@@ -65,7 +59,7 @@
<configuration>
<executable>java</executable>
<arguments>
<argument>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring-instrument.version}/spring-instrument-${spring-instrument.version}.jar</argument>
<argument>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version}/spring-instrument-${spring.version}.jar</argument>
<argument>-javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar</argument>
<argument>-classpath</argument>
<classpath></classpath>
@@ -104,7 +98,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-instrument</artifactId>
<version>${spring-instrument.version}</version>
<version>${spring.version}</version>
</dependency>
<!-- Logging -->

2
basic/mail/pom.xml
View File

@@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

4
basic/mongodb/pom.xml
View File

@@ -16,7 +16,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>
@@ -25,7 +25,7 @@
<repository>
<id>repo.springsource.org.milestone</id>
<name>Spring Framework Maven Milestone Repository</name>
<url>https://repo.springsource.org/milestone</url>
<url>https://repo.spring.io/libs-milestone</url>
</repository>
</repositories>

16
basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/inbound/mongodb-in-config.xml
View File

@@ -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">
<mongo:db-factory id="mongoDbFactory" dbname="test"/>
<int-mongodb:inbound-channel-adapter id="simpleInboundAdapter" channel="splittingChannel"
<int-mongodb:inbound-channel-adapter id="simpleInboundAdapter" channel="splittingChannel"
query="{address.state : 'CA'}">
<int:poller fixed-rate="60000" max-messages-per-poll="1"/>
</int-mongodb:inbound-channel-adapter>
<int:splitter input-channel="splittingChannel" output-channel="logger"/>
<int:logging-channel-adapter id="logger" level="WARN"/>
</beans>

6
basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml
View File

@@ -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">
<mongo:db-factory id="mongoDbFactory" dbname="test"/>

2
basic/oddeven/pom.xml
View File

@@ -14,7 +14,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
basic/pom.xml
View File

@@ -33,6 +33,8 @@
<module>ws-outbound-gateway</module>
<module>xml</module>
<module>xmpp</module>
<module>mongodb</module>
<module>tcp-amqp</module>
</modules>
</project>

2
basic/quote/pom.xml
View File

@@ -12,7 +12,7 @@
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
basic/sftp/pom.xml
View File

@@ -11,7 +11,7 @@
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

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

@@ -16,8 +16,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.amqp.version>1.1.3.RELEASE</spring.amqp.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<slf4j.version>1.6.4</slf4j.version>
<junit.version>4.10</junit.version>
</properties>
@@ -105,12 +104,6 @@
<artifactId>spring-integration-ip</artifactId>
<version>${spring.integration.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit</artifactId>
<version>${spring.amqp.version}</version>
</dependency>
<!-- Logging -->
<dependency>

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

@@ -12,8 +12,8 @@
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>3.2.6.RELEASE</spring.version>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.version>3.2.7.RELEASE</spring.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
<java.main.class>org.springframework.integration.samples.tcpclientserver.Main</java.main.class>

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

@@ -12,8 +12,8 @@
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.version>3.2.6.RELEASE</spring.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<spring.version>3.2.7.RELEASE</spring.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
basic/twitter/pom.xml
View File

@@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

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

@@ -12,8 +12,8 @@
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.version>3.2.6.RELEASE</spring.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<spring.version>3.2.7.RELEASE</spring.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>
@@ -32,6 +32,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>

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

@@ -12,7 +12,7 @@
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
<saaj.version>1.3.19</saaj.version>

2
basic/xml/pom.xml
View File

@@ -12,7 +12,7 @@
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>

2
basic/xmpp/pom.xml
View File

@@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
<spring.integration.version>3.0.1.RELEASE</spring.integration.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.10</junit.version>
</properties>