From 7ed9f59844dc7d399c44fa7462b3747f58ec41e0 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 15 Feb 2019 11:42:55 -0500 Subject: [PATCH] GH-241: Add Gretty and War plugins back Fixes https://github.com/spring-projects/spring-integration-samples/issues/241 --- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/splunk/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- build.gradle | 20 +++++++++++++------- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- gradle.properties | 2 +- 15 files changed, 40 insertions(+), 34 deletions(-) diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index e8fdf57e..4a739ace 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples dynamic-tcp-client @@ -171,7 +171,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 5a1722ca..731be42a 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples file-split-ftp @@ -239,7 +239,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 0d44525d..d3eae7d7 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples stomp-chat @@ -193,7 +193,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 05306e43..f85f01fc 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples barrier @@ -204,7 +204,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index dd6182a9..aefa4ec2 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples jpa @@ -206,7 +206,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 3a431317..27ab1357 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples kafka @@ -211,7 +211,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 2b458765..eaef3caf 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples mqtt @@ -171,7 +171,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index f46808be..d78daa08 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples splunk @@ -183,7 +183,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 270ac183..a819ba57 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples tcp-broadcast @@ -182,7 +182,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 8e149935..7a389141 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples web-sockets @@ -171,7 +171,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/build.gradle b/build.gradle index 2e4de1aa..f2ce6610 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { dependencies { classpath 'io.spring.gradle:dependency-management-plugin:1.0.5.RELEASE' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" - classpath 'org.akhikhl.gretty:gretty:2.0.0' + classpath "gradle.plugin.org.gretty:gretty:2.3.1" } } plugins { @@ -410,7 +410,8 @@ project('loan-broker') { project('loanshark') { description = 'Loan Shark Sample' -// apply plugin: 'org.akhikhl.gretty' + apply plugin: 'war' + apply plugin: "org.gretty" apply plugin: 'eclipse-wtp' dependencies { @@ -585,8 +586,9 @@ project('helloworld') { project('http') { description = 'HTTP Sample' + apply plugin: 'war' apply plugin: 'application' -// apply plugin: 'org.akhikhl.gretty' + apply plugin: "org.gretty" apply plugin: 'eclipse-wtp' mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo' @@ -974,7 +976,8 @@ project('twitter') { project('ws-inbound-gateway') { description = 'WS Inbound Gateway Sample' -// apply plugin: 'org.akhikhl.gretty' + apply plugin: 'war' + apply plugin: "org.gretty" apply plugin: 'eclipse-wtp' dependencies { @@ -1094,7 +1097,8 @@ project('mail-attachments') { project('monitoring') { description = 'Monitoring Application' -// apply plugin: 'org.akhikhl.gretty' + apply plugin: 'war' + apply plugin: "org.gretty" apply plugin: 'application' apply plugin: 'eclipse-wtp' @@ -1113,7 +1117,8 @@ project('monitoring') { project('multipart-http') { description = 'HTTP Multipart Demo' -// apply plugin: 'org.akhikhl.gretty' + apply plugin: 'war' + apply plugin: "org.gretty" apply plugin: 'eclipse-wtp' dependencies { @@ -1129,7 +1134,8 @@ project('multipart-http') { project('rest-http') { description = 'Spring Integration Rest HTTP Path Usage Demo' -// apply plugin: 'org.akhikhl.gretty' + apply plugin: 'war' + apply plugin: "org.gretty" apply plugin: 'eclipse-wtp' dependencies { diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 34b6880d..e6b7318b 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples cafe-dsl @@ -195,7 +195,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 03cec019..8a2ac60b 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples kafka-dsl @@ -195,7 +195,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 4080d914..b7f04989 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.springframework.integration.samples si4demo @@ -252,7 +252,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.2.RELEASE + 2.1.3.RELEASE import pom diff --git a/gradle.properties b/gradle.properties index 47915918..2cb4ed47 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ version=5.1.1.BUILD-SNAPSHOT -springBootVersion=2.1.2.RELEASE +springBootVersion=2.1.3.RELEASE