Skip to content

Commit cedbf6e

Browse files
author
Artem Bilan
committed
INT-3418: Prepare 4.1 VERSION
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
1 parent 697afda commit cedbf6e

File tree

67 files changed

+526
-814
lines changed

Some content is hidden

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

67 files changed

+526
-814
lines changed

‎build.gradle‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ subprojects { subproject ->
101101
openJpaVersion = '2.3.0'
102102
pahoMqttClientVersion = '0.4.0'
103103
postgresVersion = '9.1-901-1.jdbc4'
104+
reactorVersion = '1.1.0.RELEASE'
104105
romeVersion = '1.0.0'
105106
saajApiVersion = '1.3.5'
106107
saajImplVersion = '1.3.23'
@@ -242,6 +243,7 @@ project('spring-integration-core') {
242243
compile "org.springframework:spring-messaging:$springVersion"
243244
compile "org.springframework:spring-tx:$springVersion"
244245
compile "org.springframework.retry:spring-retry:$springRetryVersion"
246+
compile "org.projectreactor:reactor-core:$reactorVersion"
245247
compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion", optional)
246248
compile("com.fasterxml.jackson.core:jackson-databind:$jackson2Version", optional)
247249
compile("com.jayway.jsonpath:json-path:$jsonpathVersion", optional)
@@ -596,6 +598,14 @@ project('spring-integration-twitter') {
596598
}
597599
}
598600

601+
project('spring-integration-websocket') {
602+
description = 'Spring Integration WebSockets Support'
603+
dependencies {
604+
compile project(":spring-integration-core")
605+
compile "org.springframework:spring-websocket:$springVersion"
606+
}
607+
}
608+
599609
project('spring-integration-ws') {
600610
description = 'Spring Integration Web Services Support'
601611
dependencies {
@@ -747,6 +757,8 @@ task schemaZip(type: Zip) {
747757
description = "Builds -${classifier} archive containing all " +
748758
"XSDs for deployment at static.springframework.org/schema."
749759

760+
duplicatesStrategy = 'exclude'
761+
750762
subprojects.each { subproject ->
751763
def Properties schemas = new Properties();
752764
def shortName = subproject.name.replaceFirst("${rootProject.name}-", '')

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=4.0.3.BUILD-SNAPSHOT
1+
version=4.1.0.BUILD-SNAPSHOT

‎settings.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ include 'spring-integration-stream'
2626
include 'spring-integration-syslog'
2727
include 'spring-integration-test'
2828
include 'spring-integration-twitter'
29+
include 'spring-integration-websocket'
2930
include 'spring-integration-ws'
3031
include 'spring-integration-xml'
3132
include 'spring-integration-xmpp'

‎spring-integration-amqp/src/main/resources/META-INF/spring.schemas‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd
2-
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd
3-
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-3.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd
4-
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.0.xsd
5-
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.0.xsd
1+
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd
2+
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd

‎spring-integration-core/.springBeans‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHa
4444

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

47-
private static final String VERSION = "4.0";
47+
private static final String VERSION = "4.1";
4848

4949
private final NamespaceHandlerDelegate delegate = new NamespaceHandlerDelegate();
5050

‎spring-integration-core/src/main/resources/META-INF/spring.schemas‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
1-
http\://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/xml/spring-integration-1.0.xsd
2-
http\://www.springframework.org/schema/integration/spring-integration-2.0.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd
3-
http\://www.springframework.org/schema/integration/spring-integration-2.1.xsd=org/springframework/integration/config/xml/spring-integration-2.1.xsd
4-
http\://www.springframework.org/schema/integration/spring-integration-2.2.xsd=org/springframework/integration/config/xml/spring-integration-2.2.xsd
5-
http\://www.springframework.org/schema/integration/spring-integration-3.0.xsd=org/springframework/integration/config/xml/spring-integration-3.0.xsd
6-
http\://www.springframework.org/schema/integration/spring-integration-4.0.xsd=org/springframework/integration/config/xml/spring-integration-4.0.xsd
7-
http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-4.0.xsd
1+
http\://www.springframework.org/schema/integration/spring-integration-4.1.xsd=org/springframework/integration/config/xml/spring-integration-4.1.xsd
2+
http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-4.1.xsd

‎spring-integration-event/.springBeans‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎spring-integration-event/src/main/resources/META-INF/spring.schemas‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1-
http\://www.springframework.org/schema/integration/event/spring-integration-event-2.0.xsd=org/springframework/integration/event/config/spring-integration-event-2.0.xsd
2-
http\://www.springframework.org/schema/integration/event/spring-integration-event-2.1.xsd=org/springframework/integration/event/config/spring-integration-event-2.1.xsd
3-
http\://www.springframework.org/schema/integration/event/spring-integration-event-2.2.xsd=org/springframework/integration/event/config/spring-integration-event-2.2.xsd
4-
http\://www.springframework.org/schema/integration/event/spring-integration-event-3.0.xsd=org/springframework/integration/event/config/spring-integration-event-3.0.xsd
5-
http\://www.springframework.org/schema/integration/event/spring-integration-event-4.0.xsd=org/springframework/integration/event/config/spring-integration-event-4.0.xsd
6-
http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-4.0.xsd
1+
http\://www.springframework.org/schema/integration/event/spring-integration-event-4.1.xsd=org/springframework/integration/event/config/spring-integration-event-4.1.xsd
2+
http\://www.springframework.org/schema/integration/event/spring-integration-event.xsd=org/springframework/integration/event/config/spring-integration-event-4.1.xsd

‎spring-integration-feed/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)