Bumping versions to 2.3.6.BUILD-SNAPSHOT after release

Going back to snapshots
Update SNAPSHOT to 2.3.5.RELEASE
2026-09-17 21:09:00 +00:00 · 2021-07-06 14:21:17 +00:00 · 2021-07-06 14:21:16 +00:00 · 2021-07-06 14:17:05 +00:00 · 2021-07-05 14:18:08 +02:00 · 2021-07-05 11:48:59 +00:00
25 changed files with 70 additions and 77 deletions
@@ -1,39 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: springcloud/pipeline-base
-        user: appuser
-    environment:
-      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
-      TERM: dumb
-    branches:
-      ignore:
-        - gh-pages # list of branches to ignore
-    steps:
-      - checkout
-      - restore_cache:
-          key: sc-build-{{ .Branch }}
-      - run:
-          name: "Download dependencies"
-          command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
-      - save_cache:
-          key: sc-build-{{ .Branch }}
-          paths:
-            - ~/.m2
-      - run:
-          name: "Running build"
-          command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-      - run:
-          name: "Aggregate test results"
-          when: always
-          command: |
-            mkdir -p ~/junit/
-            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \;
-            bash <(curl -s https://codecov.io/bash)
-      - store_artifacts:
-          path: ~/junit/
-          destination: artifacts
-      - store_test_results:
-          path: ~/junit/
-          destination: testartifacts
@@ -0,0 +1,35 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build
+
+on:
+  push:
+    branches: [ 2.3.x ]
+  pull_request:
+    branches: [ 2.3.x ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java: ["8", "11", "16"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build with Maven
+        run: ./mvnw clean install -B -U
@@ -5,7 +5,7 @@ Edit the files in the src/main/asciidoc/ directory instead.
 ////


-image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"]
+image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"]

 Spring Cloud Build is a common utility project for Spring Cloud
 to use for plugin and dependency management.
@@ -321,6 +321,7 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
    <project-root>${maven.multiModuleProjectDirectory}@</project-root>
    <!-- It's mandatory for you to pass the docs.main property -->
    <github-repo>${docs.main}@</github-repo>
+    <github-project>https://github.com/spring-cloud/${docs.main}@</github-project>
    <github-raw>
        https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}@
    </github-raw>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.1.BUILD-SNAPSHOT</version>
+		<version>2.3.6.BUILD-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
@@ -1,4 +1,4 @@
-image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"]
+image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"]

 Spring Cloud Build is a common utility project for Spring Cloud
 to use for plugin and dependency management.
@@ -32,6 +32,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.util.StreamUtils;
+import org.springframework.util.StringUtils;

 /**
 * @author Marcin Grzejszczak
@@ -127,7 +128,7 @@ public class Main {

 		public String description;

-		public Object defaultValue;
+		public String defaultValue;

 		ConfigValue() {
 		}
@@ -143,7 +144,7 @@ public class Main {
 		}

 		public String toString() {
-			return "|" + name + " | " + defaultValue + " | " + description;
+			return "|" + name + " | " + (StringUtils.hasText(defaultValue) ? ("`" + defaultValue + "`") : "") + " | " + description;
 		}

 	}
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.12.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.3.0.RELEASE</version>
+		<version>2.3.12.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
-		<spring-cloud-contract.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.2.9.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.12.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.3.0.RELEASE</version>
+		<version>2.3.12.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
-		<spring-cloud-contract.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.2.9.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.RELEASE</version>
+		<version>Horsham.SR13</version>
 	</parent>
 	<packaging>pom</packaging>
 	<name>spring-cloud-stream-core-docs</name>
@@ -4,12 +4,12 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-parent</artifactId>
-	<version>2.3.1.BUILD-SNAPSHOT</version>
+	<version>2.3.6.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.1.BUILD-SNAPSHOT</version>
+		<version>2.3.6.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -28,7 +28,7 @@
 		<reactor.version>Californium-SR5</reactor.version>
 		<kryo-shaded.version>3.0.3</kryo-shaded.version>
 		<objenesis.version>2.1</objenesis.version>
-		<spring-cloud-function.version>3.0.7.BUILD-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.0.14.RELEASE</spring-cloud-function.version>

 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.RELEASE</version>
+		<version>Horsham.SR13</version>
 	</parent>

 	<dependencies>
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.RELEASE</version>
+		<version>Horsham.SR13</version>
 	</parent>

 	<dependencies>
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.RELEASE</version>
+		<version>Horsham.SR13</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>spring-cloud-stream-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>Horsham.RELEASE</version>
+		<version>Horsham.SR13</version>
 	</parent>

 	<dependencies>
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-stream-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>Horsham.RELEASE</version>
+		<version>Horsham.SR13</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.RELEASE</version>
+		<version>Horsham.SR13</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support-internal</artifactId>
 	<description>Set of classes and utility code that may assist in testing both
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.RELEASE</version>
+		<version>Horsham.SR13</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support</artifactId>
 	<description>A set of classes to ease testing of Spring Cloud Stream modules.
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <version>2.3.1.BUILD-SNAPSHOT</version>
+    <version>2.3.6.BUILD-SNAPSHOT</version>
    <parent>
        <groupId>org.springframework.cloud</groupId>
        <artifactId>spring-cloud-build</artifactId>
-        <version>2.3.1.BUILD-SNAPSHOT</version>
+        <version>2.3.6.BUILD-SNAPSHOT</version>
        <relativePath />
    </parent>

@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.RELEASE</version>
+		<version>Horsham.SR13</version>
 	</parent>

 	<dependencies>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>2.3.1.BUILD-SNAPSHOT</version>
+	<version>2.3.6.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,8 +28,8 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.3.0.RELEASE</spring-boot.version>
-		<spring-cloud-build.version>2.3.1.BUILD-SNAPSHOT</spring-cloud-build.version>
+		<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
+		<spring-cloud-build.version>2.3.6.BUILD-SNAPSHOT</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
 		<docs.classes.dir>${project.build.directory}/build-docs-classes</docs.classes.dir>
 		<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
@@ -715,11 +715,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</repository>
-				<repository>
-					<id>spring-plugins</id>
-					<name>Spring Maven Plugins Repository</name>
-					<url>https://repo.spring.io/plugins-release</url>
-				</repository>
 			</repositories>
 			<pluginRepositories>
 				<pluginRepository>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>2.3.1.BUILD-SNAPSHOT</version>
+	<version>2.3.6.BUILD-SNAPSHOT</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.3.0.RELEASE</version>
+		<version>2.3.12.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.3.0.RELEASE</spring-boot.version>
+		<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
 	</properties>
 	<build>
 		<plugins>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.1.BUILD-SNAPSHOT</version>
+		<version>2.3.6.BUILD-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -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.3.1.BUILD-SNAPSHOT</version>
+	<version>2.3.6.BUILD-SNAPSHOT</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
Author	SHA1	Message	Date
buildmaster	e182637f0d	Bumping versions to 2.3.6.BUILD-SNAPSHOT after release	2021-07-06 14:21:17 +00:00
buildmaster	61fdd696a0	Going back to snapshots	2021-07-06 14:21:16 +00:00
buildmaster	ca3f430556	Update SNAPSHOT to 2.3.5.RELEASE	2021-07-06 14:17:05 +00:00
Olga MaciaszekSharma	15c06dc1b3	Switch back to 2.3.6.BUILD-SNAPSHOT. This reverts commit `47b9d802fb`.	2021-07-05 14:18:08 +02:00
buildmaster	ea356558fa	Bumping versions	2021-07-05 11:48:59 +00:00
Olga MaciaszekSharma	a00d131824	Revert "Bumping versions" This reverts commit `d0617e7769`.	2021-07-05 13:45:07 +02:00
Olga MaciaszekSharma	47b9d802fb	Revert "Switch version to `2.3.6.BUILD-SNAPSHOT`." This reverts commit `ba151bc2f4`.	2021-07-05 13:44:48 +02:00
Olga MaciaszekSharma	ba151bc2f4	Switch version to `2.3.6.BUILD-SNAPSHOT`.	2021-07-01 13:02:14 +02:00
buildmaster	d0617e7769	Bumping versions	2021-07-01 10:51:01 +00:00
Olga MaciaszekSharma	54ca8896f4	Bump boot to 2.3.12.RELEASE.	2021-07-01 12:28:40 +02:00
Olga MaciaszekSharma	7cc037d7cc	Switch to GH actions.	2021-05-13 12:46:18 +02:00
spencergibb	cef2a68ae1	Updates build to version 2.3.5.BUILD-SNAPSHOT	2021-04-20 15:27:18 -04:00
buildmaster	b9e5eb8bd2	Bumping versions	2021-04-20 19:03:50 +00:00
spencergibb	53a08a58ee	Updates build to version 2.3.4.BUILD-SNAPSHOT	2021-04-20 12:58:16 -04:00
Marcin Grzejszczak	384013e395	Bumping Boot to 2.3.9	2021-02-24 12:10:29 +01:00
Marcin Grzejszczak	2c70866ae7	Fixed wrong version	2021-02-15 11:55:42 +01:00
buildmaster	93716b3d31	Bumping versions to 2.3.3.SNAPSHOT after release	2021-02-08 20:51:44 +00:00
buildmaster	8c93d9c597	Going back to snapshots	2021-02-08 20:51:44 +00:00
buildmaster	1b50fb3d96	Update SNAPSHOT to 2.3.2.RELEASE	2021-02-08 20:47:35 +00:00
Marcin Grzejszczak	4bac0474d9	Removed plugins repo	2020-12-18 10:31:04 +01:00
Marcin Grzejszczak	1506765f75	Changed the plugins-release repo to plugins	2020-12-09 17:39:56 +01:00
Marcin Grzejszczak	6d5d80ae45	Fixed the invalid default value code formatting	2020-11-26 08:29:56 +01:00
Marcin Grzejszczak	80b1c9a661	Code for the default value	2020-11-16 14:14:49 +01:00
Olga Maciaszek-Sharma	09bc053a02	Fix artifact version.	2020-08-03 12:09:35 +02:00
buildmaster	2631bd9e4f	Bumping versions to 2.3.2.SNAPSHOT after release	2020-07-30 16:56:05 +00:00
buildmaster	c2ef62de73	Going back to snapshots	2020-07-30 16:56:04 +00:00
buildmaster	a247cbcfae	Update SNAPSHOT to 2.3.1.RELEASE	2020-07-30 16:47:53 +00:00
Ryan Baxter	c08320254e	Revert "Use https://repo.spring.io/snapshot " This reverts commit `fc23298240`.	2020-07-30 10:29:22 -04:00
Ryan Baxter	e296686584	Revert "Changing to https://repo.spring.io/snapshot " This reverts commit `d4a54620b8`.	2020-07-30 10:28:32 -04:00
spencergibb	53fd3a14c8	Bumps boot to version to 2.3.2.RELEASE	2020-07-30 10:06:50 -04:00
Ryan Baxter	d4a54620b8	Changing to https://repo.spring.io/snapshot	2020-07-29 17:11:38 -04:00
Ryan Baxter	1836d36388	Merge remote-tracking branch 'origin/2.2.x' into 2.3.x	2020-07-29 16:17:10 -04:00
Ryan Baxter	fc23298240	Use https://repo.spring.io/snapshot	2020-07-29 16:01:52 -04:00
spencergibb	d11a135437	Bumps boot to version to 2.2.7.RELEASE	2020-05-13 15:17:42 -04:00