From 215a981377d89d2232f8f6d2db33ec30c5419bab Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 31 Jan 2017 06:10:05 -0700 Subject: [PATCH 01/17] Update to boot 1.5.1.BUILD-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d0556ec..b2e147ea 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 1.16.6 ${basedir} ${project.artifactId} - 1.5.0.BUILD-SNAPSHOT + 1.5.1.BUILD-SNAPSHOT jacoco From 28ab788e2c4b4a16f5b965e7c7e91e9aa34349b6 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 3 Feb 2017 09:20:24 +0000 Subject: [PATCH 02/17] Update for 1.2.2.RELEASE --- pom.xml | 4 ++-- spring-cloud-build-tools/pom.xml | 4 ++-- spring-cloud-dependencies-parent/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index ffa64a16..4f54aa8d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 1.2.2.BUILD-SNAPSHOT + 1.2.2.RELEASE pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects @@ -23,7 +23,7 @@ 1.16.6 ${basedir} ${project.artifactId} - 1.4.2.BUILD-SNAPSHOT + 1.4.2.RELEASE jacoco diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 799b5801..1a8d9c8b 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -5,14 +5,14 @@ 4.0.0 org.springframework.cloud spring-cloud-build-tools - 1.2.2.BUILD-SNAPSHOT + 1.2.2.RELEASE spring-cloud-build-tools jar Spring Cloud Build Tools org.springframework.cloud spring-cloud-build - 1.2.2.BUILD-SNAPSHOT + 1.2.2.RELEASE diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index d5201dc0..57829f66 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 1.2.2.BUILD-SNAPSHOT + 1.2.2.RELEASE spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 3364e45e20967df1aad9623ef85ecbc1e40e0497 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 3 Feb 2017 09:21:24 +0000 Subject: [PATCH 03/17] Revert to snapshots --- pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 4 ++-- spring-cloud-dependencies-parent/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 4f54aa8d..e29fc031 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 1.2.2.RELEASE + 1.2.3.BUILD-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 1a8d9c8b..50b4ab52 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -5,14 +5,14 @@ 4.0.0 org.springframework.cloud spring-cloud-build-tools - 1.2.2.RELEASE + 1.2.3.BUILD-SNAPSHOT spring-cloud-build-tools jar Spring Cloud Build Tools org.springframework.cloud spring-cloud-build - 1.2.2.RELEASE + 1.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 57829f66..7d984f08 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 1.2.2.RELEASE + 1.2.3.BUILD-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 49e5d2a1d4b227b8c829c6a24f0aa24dd4859089 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 9 Feb 2017 17:40:07 +0000 Subject: [PATCH 04/17] Manage version of jar plugin to not break STS --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2e147ea..d2a9a6e7 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ limitations under the License. org.apache.maven.plugins maven-jar-plugin - 2.6 + 3.0.0 From 9665f34a7ffe0cc620963bc5c4058e8f4af08993 Mon Sep 17 00:00:00 2001 From: Pei-Tang Huang Date: Tue, 14 Feb 2017 09:33:30 +0800 Subject: [PATCH 05/17] Fixed the format of JCenter deploying snippet. --- docs/src/main/asciidoc/README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index f4958d1b..25b77a08 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -24,9 +24,9 @@ $ mvn deploy -DaltReleaseDeploymentRepository=repo.spring.io::default::https://r and for jcenter use ---- +---- $ mvn deploy -DaltReleaseDeploymentRepository=bintray::default::https://api.bintray.com/maven/spring/jars/org.springframework.cloud:build ---- +---- and for Maven Central use From 76b3e6c32c15f277a2d3f773175b4274e27a4c0f Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 20 Feb 2017 10:50:43 +0000 Subject: [PATCH 06/17] Manage version of jar plugin to not break STS --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e29fc031..ce1a5f72 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ limitations under the License. org.apache.maven.plugins maven-jar-plugin - 2.6 + 3.0.0 From b33ccfd1171534b7e2e8934c89fbc31b4cd5cb69 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 2 Mar 2017 08:36:55 -0700 Subject: [PATCH 07/17] Update to boot 1.5.2.BUILD-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d2a9a6e7..98486d56 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 1.16.6 ${basedir} ${project.artifactId} - 1.5.1.BUILD-SNAPSHOT + 1.5.2.BUILD-SNAPSHOT jacoco From 058cdab1d670f88e43f05d4e0ad78e96c4119ada Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 3 Mar 2017 12:06:06 -0700 Subject: [PATCH 08/17] Update SNAPSHOT to 1.3.1.RC1 --- pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 98486d56..f30479d1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 1.3.1.BUILD-SNAPSHOT + 1.3.1.RC1 pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects @@ -20,10 +20,10 @@ UTF-8 ${java.version} ${java.version} - 1.16.6 + 1.16.14 ${basedir} ${project.artifactId} - 1.5.2.BUILD-SNAPSHOT + 1.5.2.RELEASE jacoco diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 6ec17755..2a5956b4 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 1.3.1.BUILD-SNAPSHOT + 1.3.1.RC1 diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 2605a6e9..ebd0c26f 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 1.3.1.BUILD-SNAPSHOT + 1.3.1.RC1 spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 9685ebad2492a2c35dd9bfc3ac2d6bd1bd82e0c6 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 3 Mar 2017 12:15:46 -0700 Subject: [PATCH 09/17] Update to SNAPSHOTS --- pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f30479d1..cbbc8a41 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 1.3.1.RC1 + 1.3.1.BUILD-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 2a5956b4..6ec17755 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 1.3.1.RC1 + 1.3.1.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index ebd0c26f..2605a6e9 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 1.3.1.RC1 + 1.3.1.BUILD-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 541b8f302e285130e48f59b818ee04ffcbdf8543 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 6 Mar 2017 12:31:37 +0000 Subject: [PATCH 10/17] Update to 1.3.1 --- mvnw | 8 ++++++++ pom.xml | 20 ++++---------------- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/mvnw b/mvnw index 0a7dac22..25f750cb 100755 --- a/mvnw +++ b/mvnw @@ -238,6 +238,14 @@ else echo $MAVEN_ARGS | grep -q milestone && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pmilestone//') fi +if echo $VERSION | egrep -q 'RELEASE'; then + echo Activating \"central\" profile for version=\"$VERSION\" + echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pcentral" +else + echo Deactivating \"central\" profile for version=\"$VERSION\" + echo $MAVEN_ARGS | grep -q central && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pcentral//') +fi + exec "$JAVACMD" \ $MAVEN_OPTS \ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ diff --git a/pom.xml b/pom.xml index cbbc8a41..f77c925f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 1.3.1.BUILD-SNAPSHOT + 1.3.1.RELEASE pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects @@ -408,9 +408,9 @@ limitations under the License. scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} - repo.spring.io - Spring Release Repository - https://repo.spring.io/libs-release-local + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ repo.spring.io @@ -505,18 +505,6 @@ limitations under the License. - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - java8 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 6ec17755..ea76a0fc 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 1.3.1.BUILD-SNAPSHOT + 1.3.1.RELEASE diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 2605a6e9..3ffb57a3 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 1.3.1.BUILD-SNAPSHOT + 1.3.1.RELEASE spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 74a746b71eb5c9260a5aba0c86a39e0ccf31c833 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 6 Mar 2017 12:32:45 +0000 Subject: [PATCH 11/17] Revert to snapshots --- pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f77c925f..b091b214 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 1.3.1.RELEASE + 1.3.2.BUILD-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index ea76a0fc..d88d016e 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 1.3.1.RELEASE + 1.3.2.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 3ffb57a3..6d253716 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 1.3.1.RELEASE + 1.3.2.BUILD-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 88118aa2776649990bdf6da14bbc5b8788f6de09 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 10 Mar 2017 15:36:59 +0100 Subject: [PATCH 12/17] Don't switch to tag for snapshots --- docs/src/main/asciidoc/ghpages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh index 6a05b397..ba548ab1 100755 --- a/docs/src/main/asciidoc/ghpages.sh +++ b/docs/src/main/asciidoc/ghpages.sh @@ -344,7 +344,7 @@ done assert_properties set_default_props check_if_anything_to_sync -if [[ -z "${VERSION}" ]] ; then +if echo $VERSION | egrep -q 'SNAPSHOT' || [[ -z "${VERSION}" ]; then retrieve_current_branch else switch_to_tag From 931e8fe5550461208f770c0df6a3a97576bfb2aa Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 10 Mar 2017 16:00:12 +0100 Subject: [PATCH 13/17] Updated ghpages --- docs/src/main/asciidoc/ghpages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh index ba548ab1..6429e8f7 100755 --- a/docs/src/main/asciidoc/ghpages.sh +++ b/docs/src/main/asciidoc/ghpages.sh @@ -344,7 +344,7 @@ done assert_properties set_default_props check_if_anything_to_sync -if echo $VERSION | egrep -q 'SNAPSHOT' || [[ -z "${VERSION}" ]; then +if echo $VERSION | egrep -q 'SNAPSHOT' || [[ -z "${VERSION}" ]]; then retrieve_current_branch else switch_to_tag From 3bfe13c79389d4207a7631028c7e2cb5c16aed0c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 10 Mar 2017 16:44:55 +0100 Subject: [PATCH 14/17] Updated ghpages --- docs/src/main/asciidoc/ghpages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh index 6429e8f7..794398e4 100755 --- a/docs/src/main/asciidoc/ghpages.sh +++ b/docs/src/main/asciidoc/ghpages.sh @@ -345,6 +345,8 @@ assert_properties set_default_props check_if_anything_to_sync if echo $VERSION | egrep -q 'SNAPSHOT' || [[ -z "${VERSION}" ]]; then + CLONE="" + VERSION="" retrieve_current_branch else switch_to_tag From 03fd279df18691d27c4c87001adf0f59956e8ba1 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 10 Mar 2017 16:53:19 +0100 Subject: [PATCH 15/17] Added logging to the script --- docs/src/main/asciidoc/ghpages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh index 794398e4..db6734de 100755 --- a/docs/src/main/asciidoc/ghpages.sh +++ b/docs/src/main/asciidoc/ghpages.sh @@ -347,6 +347,7 @@ check_if_anything_to_sync if echo $VERSION | egrep -q 'SNAPSHOT' || [[ -z "${VERSION}" ]]; then CLONE="" VERSION="" + echo "You've provided a version variable but it's a snapshot one. Due to this will not clone spring-cloud-static and publish docs over there" retrieve_current_branch else switch_to_tag From ef8189dc884b33969e18abff3aa921ec2a478eda Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 17 Mar 2017 09:43:26 +0100 Subject: [PATCH 16/17] Fixed the retrieval of current branch --- docs/src/main/asciidoc/ghpages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh index db6734de..795b17f3 100755 --- a/docs/src/main/asciidoc/ghpages.sh +++ b/docs/src/main/asciidoc/ghpages.sh @@ -344,11 +344,11 @@ done assert_properties set_default_props check_if_anything_to_sync +retrieve_current_branch if echo $VERSION | egrep -q 'SNAPSHOT' || [[ -z "${VERSION}" ]]; then CLONE="" VERSION="" echo "You've provided a version variable but it's a snapshot one. Due to this will not clone spring-cloud-static and publish docs over there" - retrieve_current_branch else switch_to_tag fi From 736d29ac184e1cd0386a7cbb767fa0d53d91661d Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 17 Mar 2017 10:10:08 +0100 Subject: [PATCH 17/17] Fixed the retrieval of current branch --- docs/src/main/asciidoc/ghpages.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh index 795b17f3..3c41f8c2 100755 --- a/docs/src/main/asciidoc/ghpages.sh +++ b/docs/src/main/asciidoc/ghpages.sh @@ -59,6 +59,7 @@ function retrieve_current_branch() { fi echo "Current branch is [${CURRENT_BRANCH}]" git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script" + PREVIOUS_BRANCH=${CURRENT_BRANCH} } # Switches to the provided value of the release version. We always prefix it with `v` @@ -248,7 +249,7 @@ function commit_changes_if_applicable() { function checkout_previous_branch() { # If -version was provided we need to come back to root project cd ${ROOT_FOLDER} - git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script" + git checkout ${PREVIOUS_BRANCH} || echo "Failed to check the branch... continuing with the script" if [ "$dirty" != "0" ]; then git stash pop; fi exit 0 }