From 15dee6004986319f29a833e908cd641b1f5b56eb Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sat, 16 Apr 2016 08:30:56 -0700 Subject: [PATCH] Restore spring-boot-starter-ws Rename spring-boot-starter-webservices back to spring-boot-starter-ws. Unfortunately the starter exists in Spring Boot 1.3 so we can't rename it without consequence. See gh-5711 --- spring-boot-dependencies/pom.xml | 12 ++++++------ spring-boot-docs/pom.xml | 2 +- .../spring-boot-sample-webservices/pom.xml | 2 +- spring-boot-starters/pom.xml | 2 +- .../pom.xml | 2 +- .../src/main/resources/META-INF/spring.provides | 0 6 files changed, 10 insertions(+), 10 deletions(-) rename spring-boot-starters/{spring-boot-starter-webservices => spring-boot-starter-ws}/pom.xml (95%) rename spring-boot-starters/{spring-boot-starter-webservices => spring-boot-starter-ws}/src/main/resources/META-INF/spring.provides (100%) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index e137bfb771..f0aeab85e8 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -160,7 +160,7 @@ 2.0.3.RELEASE 1.0.2.RELEASE 1.1.2.RELEASE - 2.3.0.RELEASE + 2.3.0.RELEASE 3.8.11.2 3.1.0 ${javax-mail.version} @@ -505,7 +505,7 @@ org.springframework.boot - spring-boot-starter-webservices + spring-boot-starter-ws 1.4.0.BUILD-SNAPSHOT @@ -2179,7 +2179,7 @@ org.springframework.ws spring-ws-core - ${spring-webservices.version} + ${spring-ws.version} commons-logging @@ -2190,7 +2190,7 @@ org.springframework.ws spring-ws-security - ${spring-webservices.version} + ${spring-ws.version} commons-logging @@ -2201,7 +2201,7 @@ org.springframework.ws spring-ws-support - ${spring-webservices.version} + ${spring-ws.version} commons-logging @@ -2212,7 +2212,7 @@ org.springframework.ws spring-ws-test - ${spring-webservices.version} + ${spring-ws.version} commons-logging diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml index 99a5dba842..f0db87a0d7 100644 --- a/spring-boot-docs/pom.xml +++ b/spring-boot-docs/pom.xml @@ -843,7 +843,7 @@ ${spring-boot-repo} ${spring.version} ${spring-security.version} - ${spring-ws.version} + ${spring-ws.version} ${github-tag} diff --git a/spring-boot-samples/spring-boot-sample-webservices/pom.xml b/spring-boot-samples/spring-boot-sample-webservices/pom.xml index ffca8e3ada..3725a9d014 100644 --- a/spring-boot-samples/spring-boot-sample-webservices/pom.xml +++ b/spring-boot-samples/spring-boot-sample-webservices/pom.xml @@ -26,7 +26,7 @@ org.springframework.boot - spring-boot-starter-webservices + spring-boot-starter-ws jaxen diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml index a363e64c74..6c8b7917bf 100644 --- a/spring-boot-starters/pom.xml +++ b/spring-boot-starters/pom.xml @@ -69,7 +69,7 @@ spring-boot-starter-velocity spring-boot-starter-web spring-boot-starter-websocket - spring-boot-starter-webservices + spring-boot-starter-ws diff --git a/spring-boot-starters/spring-boot-starter-webservices/pom.xml b/spring-boot-starters/spring-boot-starter-ws/pom.xml similarity index 95% rename from spring-boot-starters/spring-boot-starter-webservices/pom.xml rename to spring-boot-starters/spring-boot-starter-ws/pom.xml index 84d9d97ed4..659d2a474a 100644 --- a/spring-boot-starters/spring-boot-starter-webservices/pom.xml +++ b/spring-boot-starters/spring-boot-starter-ws/pom.xml @@ -6,7 +6,7 @@ spring-boot-starters 1.4.0.BUILD-SNAPSHOT - spring-boot-starter-webservices + spring-boot-starter-ws Spring Boot Web Services Starter Starter for using Spring Web Services http://projects.spring.io/spring-boot/ diff --git a/spring-boot-starters/spring-boot-starter-webservices/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-ws/src/main/resources/META-INF/spring.provides similarity index 100% rename from spring-boot-starters/spring-boot-starter-webservices/src/main/resources/META-INF/spring.provides rename to spring-boot-starters/spring-boot-starter-ws/src/main/resources/META-INF/spring.provides