Skip to content

Commit

Permalink
INT-3418: Prepare 4.1 VERSION
Browse files Browse the repository at this point in the history 
JIRA: https://jira.spring.io/browse/INT-3418

* Create 4.1 XSD
* Clean up Docs for 4.1
* Prepare WebSocket module
* Add Reactor dependency
* Remove Eclipse and SNV artifacts

Phase spring-projects#1: prepare

Conflicts:
	gradle.properties
  • Loading branch information
Artem Bilan committed May 30, 2014
1 parent 697afda commit cedbf6e
Show file tree
Hide file tree
Showing 67 changed files with 526 additions and 814 deletions.
12 changes: 12 additions & 0 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ subprojects { subproject ->
openJpaVersion = '2.3.0'
pahoMqttClientVersion = '0.4.0'
postgresVersion = '9.1-901-1.jdbc4'
reactorVersion = '1.1.0.RELEASE'
romeVersion = '1.0.0'
saajApiVersion = '1.3.5'
saajImplVersion = '1.3.23'
Expand Down Expand Up @@ -242,6 +243,7 @@ project('spring-integration-core') {
compile "org.springframework:spring-messaging:$springVersion"
compile "org.springframework:spring-tx:$springVersion"
compile "org.springframework.retry:spring-retry:$springRetryVersion"
compile "org.projectreactor:reactor-core:$reactorVersion"
compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion", optional)
compile("com.fasterxml.jackson.core:jackson-databind:$jackson2Version", optional)
compile("com.jayway.jsonpath:json-path:$jsonpathVersion", optional)
Expand Down Expand Up @@ -596,6 +598,14 @@ project('spring-integration-twitter') {
}
}

project('spring-integration-websocket') {
description = 'Spring Integration WebSockets Support'
dependencies {
compile project(":spring-integration-core")
compile "org.springframework:spring-websocket:$springVersion"
}
}

project('spring-integration-ws') {
description = 'Spring Integration Web Services Support'
dependencies {
Expand Down Expand Up @@ -747,6 +757,8 @@ task schemaZip(type: Zip) {
description = "Builds -${classifier} archive containing all " +
"XSDs for deployment at static.springframework.org/schema."

duplicatesStrategy = 'exclude'

subprojects.each { subproject ->
def Properties schemas = new Properties();
def shortName = subproject.name.replaceFirst("${rootProject.name}-", '')
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=4.0.3.BUILD-SNAPSHOT
version=4.1.0.BUILD-SNAPSHOT
1 change: 1 addition & 0 deletions settings.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ include 'spring-integration-stream'
include 'spring-integration-syslog'
include 'spring-integration-test'
include 'spring-integration-twitter'
include 'spring-integration-websocket'
include 'spring-integration-ws'
include 'spring-integration-xml'
include 'spring-integration-xmpp'
Expand Down
7 changes: 2 additions & 5 deletions spring-integration-amqp/src/main/resources/META-INF/spring.schemas
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-3.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.0.xsd
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.0.xsd
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd
13 changes: 0 additions & 13 deletions spring-integration-core/.springBeans
View file

This file was deleted.

2 changes: 1 addition & 1 deletion .../java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHa

protected final Log logger = LogFactory.getLog(this.getClass());

private static final String VERSION = "4.0";
private static final String VERSION = "4.1";

private final NamespaceHandlerDelegate delegate = new NamespaceHandlerDelegate();

Expand Down
9 changes: 2 additions & 7 deletions spring-integration-core/src/main/resources/META-INF/spring.schemas
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
http\://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/xml/spring-integration-1.0.xsd
http\://www.springframework.org/schema/integration/spring-integration-2.0.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd
http\://www.springframework.org/schema/integration/spring-integration-2.1.xsd=org/springframework/integration/config/xml/spring-integration-2.1.xsd
http\://www.springframework.org/schema/integration/spring-integration-2.2.xsd=org/springframework/integration/config/xml/spring-integration-2.2.xsd
http\://www.springframework.org/schema/integration/spring-integration-3.0.xsd=org/springframework/integration/config/xml/spring-integration-3.0.xsd
http\://www.springframework.org/schema/integration/spring-integration-4.0.xsd=org/springframework/integration/config/xml/spring-integration-4.0.xsd
http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-4.0.xsd
http\://www.springframework.org/schema/integration/spring-integration-4.1.xsd=org/springframework/integration/config/xml/spring-integration-4.1.xsd
http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-4.1.xsd
13 changes: 0 additions & 13 deletions spring-integration-event/.springBeans
View file

This file was deleted.

8 changes: 2 additions & 6 deletions spring-integration-event/src/main/resources/META-INF/spring.schemas
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
http\://www.springframework.org/schema/integration/event/spring-integration-event-2.0.xsd=org/springframework/integration/event/config/spring-integration-event-2.0.xsd
http\://www.springframework.org/schema/integration/event/spring-integration-event-2.1.xsd=org/springframework/integration/event/config/spring-integration-event-2.1.xsd
http\://www.springframework.org/schema/integration/event/spring-integration-event-2.2.xsd=org/springframework/integration/event/config/spring-integration-event-2.2.xsd
http\://www.springframework.org/schema/integration/event/spring-integration-event-3.0.xsd=org/springframework/integration/event/config/spring-integration-event-3.0.xsd
http\://www.springframework.org/schema/integration/event/spring-integration-event-4.0.xsd=org/springframework/integration/event/config/spring-integration-event-4.0.xsd
http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-4.0.xsd
http\://www.springframework.org/schema/integration/event/spring-integration-event-4.1.xsd=org/springframework/integration/event/config/spring-integration-event-4.1.xsd
http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-4.1.xsd
1 change: 0 additions & 1 deletion spring-integration-feed/.gitignore
View file

This file was deleted.

8 changes: 2 additions & 6 deletions spring-integration-feed/src/main/resources/META-INF/spring.schemas
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
http\://www.springframework.org/schema/integration/feed/spring-integration-feed-2.0.xsd=org/springframework/integration/feed/config/spring-integration-feed-2.0.xsd
http\://www.springframework.org/schema/integration/feed/spring-integration-feed-2.1.xsd=org/springframework/integration/feed/config/spring-integration-feed-2.1.xsd
http\://www.springframework.org/schema/integration/feed/spring-integration-feed-2.2.xsd=org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd
http\://www.springframework.org/schema/integration/feed/spring-integration-feed-3.0.xsd=org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd
http\://www.springframework.org/schema/integration/feed/spring-integration-feed-4.0.xsd=org/springframework/integration/feed/config/spring-integration-feed-4.0.xsd
http\://www.springframework.org/schema/integration/feed/spring-integration-feed.xsd=org/springframework/integration/feed/config/spring-integration-feed-4.0.xsd
http\://www.springframework.org/schema/integration/feed/spring-integration-feed-4.1.xsd=org/springframework/integration/feed/config/spring-integration-feed-4.1.xsd
http\://www.springframework.org/schema/integration/feed/spring-integration-feed.xsd=org/springframework/integration/feed/config/spring-integration-feed-4.1.xsd
14 changes: 0 additions & 14 deletions spring-integration-file/.springBeans
View file

This file was deleted.

9 changes: 2 additions & 7 deletions spring-integration-file/src/main/resources/META-INF/spring.schemas
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
http\://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd=org/springframework/integration/file/config/spring-integration-file-1.0.xsd
http\://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd=org/springframework/integration/file/config/spring-integration-file-2.0.xsd
http\://www.springframework.org/schema/integration/file/spring-integration-file-2.1.xsd=org/springframework/integration/file/config/spring-integration-file-2.1.xsd
http\://www.springframework.org/schema/integration/file/spring-integration-file-2.2.xsd=org/springframework/integration/file/config/spring-integration-file-2.2.xsd
http\://www.springframework.org/schema/integration/file/spring-integration-file-3.0.xsd=org/springframework/integration/file/config/spring-integration-file-3.0.xsd
http\://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd=org/springframework/integration/file/config/spring-integration-file-4.0.xsd
http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-4.0.xsd
http\://www.springframework.org/schema/integration/file/spring-integration-file-4.1.xsd=org/springframework/integration/file/config/spring-integration-file-4.1.xsd
http\://www.springframework.org/schema/integration/file/spring-integration-file.xsd=org/springframework/integration/file/config/spring-integration-file-4.1.xsd
14 changes: 0 additions & 14 deletions spring-integration-ftp/.springBeans
View file

This file was deleted.

8 changes: 0 additions & 8 deletions spring-integration-ftp/log4j.properties
View file

This file was deleted.

8 changes: 2 additions & 6 deletions spring-integration-ftp/src/main/resources/META-INF/spring.schemas
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd
http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.1.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd
http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.2.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd
http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-3.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd
http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-4.0.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-4.0.xsd
http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-4.0.xsd
http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp-4.1.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd
http\://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd=org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd
1 change: 0 additions & 1 deletion spring-integration-gemfire/.gitignore
View file

This file was deleted.

16 changes: 0 additions & 16 deletions spring-integration-gemfire/.springBeans
View file

This file was deleted.

7 changes: 2 additions & 5 deletions spring-integration-gemfire/src/main/resources/META-INF/spring.schemas
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-2.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd
http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-2.2.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.2.xsd
http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-3.0.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd
http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.0.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.0.xsd
http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.0.xsd
http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire-4.1.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.1.xsd
http\://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd=org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.1.xsd
13 changes: 0 additions & 13 deletions spring-integration-groovy/.springBeans
View file

This file was deleted.

8 changes: 2 additions & 6 deletions spring-integration-groovy/src/main/resources/META-INF/spring.schemas
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-2.0.xsd
http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.1.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-2.1.xsd
http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.2.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd
http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-3.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-3.0.xsd
http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-4.0.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-4.0.xsd
http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-4.0.xsd
http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy-4.1.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd
http\://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd=org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd
13 changes: 0 additions & 13 deletions spring-integration-http/.springBeans
View file

This file was deleted.

9 changes: 2 additions & 7 deletions spring-integration-http/src/main/resources/META-INF/spring.schemas
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
http\://www.springframework.org/schema/integration/http/spring-integration-http-1.0.xsd=org/springframework/integration/http/config/spring-integration-http-1.0.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd=org/springframework/integration/http/config/spring-integration-http-2.0.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-2.1.xsd=org/springframework/integration/http/config/spring-integration-http-2.1.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-2.2.xsd=org/springframework/integration/http/config/spring-integration-http-2.2.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-3.0.xsd=org/springframework/integration/http/config/spring-integration-http-3.0.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-4.0.xsd=org/springframework/integration/http/config/spring-integration-http-4.0.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-4.0.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-4.1.xsd=org/springframework/integration/http/config/spring-integration-http-4.1.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-4.1.xsd
16 changes: 0 additions & 16 deletions spring-integration-ip/.springBeans
View file

This file was deleted.

8 changes: 2 additions & 6 deletions spring-integration-ip/src/main/resources/META-INF/spring.schemas
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
http\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.0.xsd=org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
http\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.1.xsd=org/springframework/integration/ip/config/spring-integration-ip-2.1.xsd
http\://www.springframework.org/schema/integration/ip/spring-integration-ip-2.2.xsd=org/springframework/integration/ip/config/spring-integration-ip-2.2.xsd
http\://www.springframework.org/schema/integration/ip/spring-integration-ip-3.0.xsd=org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd
http\://www.springframework.org/schema/integration/ip/spring-integration-ip-4.0.xsd=org/springframework/integration/ip/config/spring-integration-ip-4.0.xsd
http\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip-4.0.xsd
http\://www.springframework.org/schema/integration/ip/spring-integration-ip-4.1.xsd=org/springframework/integration/ip/config/spring-integration-ip-4.1.xsd
http\://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd=org/springframework/integration/ip/config/spring-integration-ip-4.1.xsd
Loading

0 comments on commit cedbf6e

Please sign in to comment.