Update SNAPSHOT to 2.3.0.RELEASE

Bumping versions
Adds section about activating spring maven profile in IDE.
2026-09-17 21:09:00 +00:00 · 2020-05-28 08:59:41 +00:00 · 2020-05-28 08:46:59 +00:00 · 2020-05-21 16:13:27 -04:00 · 2020-05-15 12:07:26 -04:00 · 2020-05-15 12:06:31 -04:00
18 changed files with 79 additions and 29 deletions
@@ -19,3 +19,4 @@ _site/
 .vscode/
 .flattened-pom.xml
 .DS_Store
+.sdkmanrc
@@ -337,8 +337,8 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
 	<project-version>${project.version}@</project-version>
 	<github-tag>${github-tag}@</github-tag>
 	<version-type>${version-type}@</version-type>
-	<docs-url>${docs-url}@</docs-url>
-	<raw-docs-url>${raw-docs-url}@</raw-docs-url>
+	<docs-url>https://docs.spring.io/${docs.main}/docs/${project.version}@</docs-url>
+	<raw-docs-url>${github-raw}@</raw-docs-url>
 	<project-version>${project.version}@</project-version>
 	<project-name>${docs.main}@</project-name>
 </attributes>
@@ -10,15 +10,17 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.3.0.RELEASE</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
 		<!-- Comma separated list of whitelisted branches -->
-		<docs.whitelisted.branches>1.2.x,1.3.x,2.0.x,2.1.x</docs.whitelisted.branches>
+		<docs.whitelisted.branches>2.1.x,2.2.x</docs.whitelisted.branches>
 		<main.basedir>${basedir}/..</main.basedir>
 		<gmavenplus-plugin.version>1.8.1</gmavenplus-plugin.version>
-		<groovy.version>2.5.9</groovy.version>
+		<groovy.version>2.5.10</groovy.version>
+		<!-- For the Groovy plugin -->
+		<groovyVersion>${groovy.version}</groovyVersion>
 		<!-- We don't want to downloaded sources of our own project-->
 		<maven-dependency-plugin-for-docs.phase>none</maven-dependency-plugin-for-docs.phase>
 		<docs.resources.dir>${project.basedir}/src/main/</docs.resources.dir>
@@ -36,31 +38,65 @@
 			<artifactId>spring-core</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-all</artifactId>
+			<version>${groovy.version}</version>
+			<type>pom</type>
+		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy</artifactId>
+			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-xml</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-datetime</artifactId>
+			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-nio</artifactId>
+			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-json</artifactId>
+			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-all</artifactId>
+			<artifactId>groovy-jsr223</artifactId>
 			<version>${groovy.version}</version>
-			<type>pom</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-macro</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-sql</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-swing</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -173,7 +209,6 @@
 								</goals>
 								<configuration>
 									<skip>${skipTests}</skip>
-									<skip>true</skip>
 									<executable>${basedir}/src/test/bash/run-bats.sh</executable>
 								</configuration>
 							</execution>
@@ -58,6 +58,11 @@ https://eclipse.org[Eclipse] when working with the code. We use the
 https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
 should also work without issue as long as they use Maven 3.3.3 or better.

+==== Activate the Spring Maven profile
+Spring Cloud projects require the 'spring' Maven profile to be activated to resolve
+the spring milestone and snapshot repositories. Use your preferred IDE to set this
+profile to be active, or you may experience build errors.
+
 ==== Importing into eclipse with m2eclipse
 We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
 eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
@@ -20,13 +20,17 @@ if [[ $# -ne 1 ]]; then
    usage
 fi

-SHELLCHECK_VERSION="v0.6.0"
+SHELLCHECK_VERSION="v0.7.0"
+ARCH="x86_64"
+if [ "$(uname -m)" == aarch64 ]; then
+    ARCH="aarch64"
+fi
 SHELLCHECK_BIN="${ROOT_DIR}/../target/shellcheck-${SHELLCHECK_VERSION}/shellcheck"

 case $1 in
    download-shellcheck)
        if [[ "${OSTYPE}" == linux* && ! -z "${SHELLCHECK_BIN}" ]]; then
-            SHELLCHECK_ARCHIVE="shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz"
+            SHELLCHECK_ARCHIVE="shellcheck-${SHELLCHECK_VERSION}.linux.${ARCH}.tar.xz"
            if [[ -x "${ROOT_DIR}/../target/shellcheck-${SHELLCHECK_VERSION}/shellcheck" ]]; then
                echo "shellcheck already downloaded - skipping..."
                exit 0
@@ -55,6 +59,8 @@ case $1 in
            exit 0
        fi
        git clone https://github.com/bats-core/bats-core.git "${ROOT_DIR}/../target/bats"
+        git clone https://github.com/ztombol/bats-support.git "${ROOT_DIR}/target/test_helper/bats-support"
+        git clone https://github.com/ztombol/bats-assert "${ROOT_DIR}/target/test_helper/bats-assert"
        ;;
    run-bats)
            echo "Running bats"
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.5.RELEASE</version>
+		<version>2.3.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.5.RELEASE</version>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.5.RELEASE</version>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.5.RELEASE</version>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

@@ -1,8 +1,8 @@
 #!/usr/bin/env bats

 load 'test_helper'
-load 'test_helper/bats-support/load'
-load 'test_helper/bats-assert/load'
+load '../../../target/test_helper/bats-support/load'
+load '../../../target/test_helper/bats-assert/load'

 setup() {
 	export TEMP_DIR="$( mktemp -d )"
@@ -84,6 +84,7 @@ export -f printing_git_with_remotes
 export -f stubbed_git

@test "should upload the built docs to the root of gh-pages for snapshot versions" {
+	export BRANCH=master
 	export GIT_BIN="stubbed_git"
 	export SOURCE_FUNCTIONS=""
 	export RELEASER_GIT_OAUTH_TOKEN="mytoken"
@@ -111,6 +112,7 @@ export -f stubbed_git
 }

@test "should upload the built docs to spring-cloud-static gh-pages branch for non-snapshot versions" {
+	export BRANCH=master
 	export GIT_BIN="stubbed_git"
 	export SOURCE_FUNCTIONS=""
 	export RELEASER_GIT_OAUTH_TOKEN="mytoken"
@@ -145,6 +147,7 @@ export -f stubbed_git
 }

@test "should upload the release train docs to spring-cloud-static under the release train folder" {
+	export BRANCH=master
 	export GIT_BIN="stubbed_git"
 	export SOURCE_FUNCTIONS=""
 	export RELEASER_GIT_OAUTH_TOKEN="mytoken"
@@ -217,6 +220,7 @@ export -f stubbed_git
 }

@test "should retrieve the name of the current branch" {
+	export BRANCH=master
 	export GIT_BIN="stubbed_git"
 	cd "${TEMP_DIR}/spring-cloud-stream/"
 	source "${SOURCE_DIR}"/ghpages.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bats

 load 'test_helper'
-load 'test_helper/bats-support/load'
-load 'test_helper/bats-assert/load'
+load '../../../target/test_helper/bats-support/load'
+load '../../../target/test_helper/bats-assert/load'

 setup() {
 	export TEMP_DIR="$( mktemp -d )"
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>2.2.3.RELEASE</version>
+	<version>2.3.0.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,11 +28,11 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.2.5.RELEASE</spring-boot.version>
-		<spring-cloud-build.version>2.2.3.RELEASE</spring-cloud-build.version>
+		<spring-boot.version>2.3.0.RELEASE</spring-boot.version>
+		<spring-cloud-build.version>2.3.0.RELEASE</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
 		<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
-		<spring-doc-resources.version>0.1.0.RELEASE</spring-doc-resources.version>
+		<spring-doc-resources.version>0.2.1.RELEASE</spring-doc-resources.version>
 		<spring-asciidoctor-extensions.version>0.1.3.RELEASE
 		</spring-asciidoctor-extensions.version>
 		<asciidoctorj-pdf.version>1.5.0-alpha.18</asciidoctorj-pdf.version>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>2.2.3.RELEASE</version>
+	<version>2.3.0.RELEASE</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,12 +14,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>2.2.5.RELEASE</version>
+		<version>2.3.0.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.2.5.RELEASE</spring-boot.version>
+		<spring-boot.version>2.3.0.RELEASE</spring-boot.version>
 	</properties>
 	<build>
 		<plugins>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.3.RELEASE</version>
+		<version>2.3.0.RELEASE</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -9,6 +9,7 @@
 	<suppress files=".*example.*" checks="(Javadoc*|HideUtility*)"/>
 	<suppress files=".*integration-tests.*" checks="(Javadoc*|HideUtility*)"/>
 	<suppress files="(.*Tests\.java|.*Tests\.groovy)" checks="Javadoc*"/>
+	<suppress files=".*src.test.java.*" checks="Javadoc*"/>
 	<suppress files="generated-sources" checks="[a-zA-Z0-9]*"/>
 	<suppress files=".*target.*" checks="[a-zA-Z0-9]*"/>
 	<suppress files=".*build.*" checks="[a-zA-Z0-9]*"/>
@@ -4,7 +4,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
-	<version>2.2.3.RELEASE</version>
+	<version>2.3.0.RELEASE</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
Author	SHA1	Message	Date
buildmaster	e96132ecf2	Update SNAPSHOT to 2.3.0.RELEASE	2020-05-28 08:59:41 +00:00
buildmaster	881c967d3c	Bumping versions	2020-05-28 08:46:59 +00:00
spencergibb	fb2e92be6b	Adds section about activating spring maven profile in IDE. Fixes gh-159	2020-05-21 16:13:27 -04:00
spencergibb	9bdff877fd	Ignores .sdkmanrc	2020-05-15 12:07:26 -04:00
spencergibb	0911190f3f	Bumps boot to version to 2.3.0.RELEASE	2020-05-15 12:06:31 -04:00
Olga Maciaszek-Sharma	d30799cf5c	Upgrade groovy.version to 2.5.10.	2020-05-13 17:28:05 +02:00
spencergibb	e84caac578	Merge remote-tracking branch 'origin/2.3.x' into 2.3.x	2020-05-08 13:54:14 -04:00
spencergibb	76f15c1cd9	Merge branch '2.2.x' into 2.3.x	2020-05-08 13:49:52 -04:00
spencergibb	27553b9dd9	set current branch for test	2020-05-08 13:45:06 -04:00
spencergibb	fe89ee7de0	set current branch for test	2020-05-08 13:40:16 -04:00
spencergibb	2821e3222c	set current branch for test	2020-05-08 13:36:21 -04:00
spencergibb	bb2126974f	set current branch for test	2020-05-08 13:34:34 -04:00
spencergibb	c7ebf03a2a	removes checked in bats libs	2020-05-08 13:10:50 -04:00
spencergibb	d673bca4da	Updates bats tests to cloe bats-support and bats-assert This along with upgrading to 0.7.0 of bats seems to fix bats tests. Fixes gh-150	2020-05-08 12:23:56 -04:00
maaaace	76873a53ab	fix(bashScript): download shellcheck to support arm64 processor build_helper.sh just downloads shellcheck for x86_64 architecture by hard coding the verison and arch of zip file. Fortunately shellcheck starts to support arm64 since version 0.7.0, as a result update the version and add checking for architecture to support arm64. Signed-off-by: maaaace <fuheming@huawei.com>	2020-05-08 12:23:49 -04:00
Olga Maciaszek-Sharma	bfa24ff981	Revert "Bump checkstyle from 8.18 to 8.29" This reverts commit `eee1278025`.	2020-04-24 15:08:26 +02:00
Olga Maciaszek-Sharma	ea85edf36a	Revert "Bump checkstyle from 8.18 to 8.29" This reverts commit `46c9d176a0`.	2020-04-24 14:57:29 +02:00
Olga Maciaszek-Sharma	a6633729c6	Revert "Adjust to updates." This reverts commit `82cecb77d3`.	2020-04-24 14:57:10 +02:00
Olga Maciaszek-Sharma	680f28b193	Merge pull request #161 from spring-cloud/fix-checkstyle-setup-after-upgrade Adjust to updates.	2020-04-24 14:30:46 +02:00
Olga Maciaszek-Sharma	82cecb77d3	Adjust to updates.	2020-04-24 14:06:31 +02:00
dependabot[bot]	46c9d176a0	Bump checkstyle from 8.18 to 8.29 Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.18 to 8.29. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.18...checkstyle-8.29) Signed-off-by: dependabot[bot] <support@github.com>	2020-04-23 18:08:58 +02:00
dependabot[bot]	eee1278025	Bump checkstyle from 8.18 to 8.29 Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.18 to 8.29. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.18...checkstyle-8.29) Signed-off-by: dependabot[bot] <support@github.com>	2020-04-23 18:08:09 +02:00
Olga Maciaszek-Sharma	be6c1eae80	Suppress javadoc check for files in test directory.	2020-04-23 16:53:16 +02:00
Olga Maciaszek-Sharma	def18bdd4e	Suppress javadoc check for files in test directory.	2020-04-23 16:36:27 +02:00
Jay Bryant	288abb47b5	Upgrade spring-doc-resources Upgrade spring-doc-resources from version 0.2.0 to version 0.2.1 to get a bug fix (setting the width of the HTML output).	2020-04-22 10:53:18 -04:00
Spencer Gibb	dae472a17d	Updates README.adoc	2020-04-22 10:51:16 -04:00
Jay Bryant	fb42a2cf89	Upgrade spring-doc-resources Upgrade spring-doc-resources from version 0.2.0 to version 0.2.1 to get a bug fix (setting the width of the HTML output).	2020-04-22 10:49:32 -04:00
Spencer Gibb	efcd0f89f1	Bumps boot to version to 2.3.0.M4	2020-04-03 10:22:09 -04:00
Spencer Gibb	a33e77df15	Revert "Bumps boot version to 2.3.0.M3" This reverts commit `2f67da30`	2020-03-19 10:33:25 -04:00
Spencer Gibb	2257f255d6	Bumps version to 2.3.0	2020-03-19 10:28:53 -04:00
Marcin Grzejszczak	e8482b1134	Fixing Groovy	2020-03-18 17:38:08 -04:00
Spencer Gibb	2f67da3078	Bumps boot version to 2.3.0.M3 fixes gh-153	2020-03-18 16:44:03 -04:00
Spencer Gibb	9295fc30ef	Updates docs branches	2020-03-06 12:43:48 -05:00
Spencer Gibb	880cf63c2c	Updates remaining versions to 2.2.4.BUILD-SNAPSHOT.	2020-03-04 15:11:09 -05:00
Spencer Gibb	417d78533a	Merge remote-tracking branch 'origin/2.2.x' into 2.2.x # Conflicts: # docs/pom.xml # pom.xml # spring-cloud-build-tools/pom.xml	2020-03-04 15:06:31 -05:00
Marcin Grzejszczak	2e5868c5bd	Bumping build	2020-03-04 14:14:07 +01:00