Version changes for RC3 release

Fix versions of some maven plugins
add SuppresionFilter module (#79 )
2026-09-17 21:09:00 +00:00 · 2018-12-11 15:30:34 -05:00 · 2018-12-10 09:04:19 +00:00 · 2018-12-05 21:13:17 +01:00 · 2018-12-04 13:47:54 +00:00 · 2018-11-20 19:47:13 +01:00
9 changed files with 60 additions and 34 deletions
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.0.RC2</version>
+		<version>2.1.0.RC3</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
@@ -32,10 +32,20 @@ function set_default_props() {
    echo "Spring Cloud Static repo is [${SPRING_CLOUD_STATIC_REPO}"
 }

+# Adds the oauth token if present to the remote url
+function add_oauth_token_to_remote_url() {
+    if [[ "${RELEASER_GIT_OAUTH_TOKEN}" != "" ]]; then
+        echo "OAuth token found. Will reuse it to push the code"
+        git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/' | sed -e "s|^git://|https://${RELEASER_GIT_OAUTH_TOKEN}@|"`
+    else
+        echo "No OAuth token found"
+        git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
+    fi
+}
+
 # Check if gh-pages exists and docs have been built
 function check_if_anything_to_sync() {
-    git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
-
+    add_oauth_token_to_remote_url
    if ! (git remote set-branches --add origin gh-pages && git fetch -q) && [[ "${RELEASE_TRAIN}" != "yes" ]] ; then
        echo "No gh-pages, so not syncing"
        exit 0
@@ -240,6 +250,7 @@ function commit_changes_if_applicable() {
        # This is a little extreme. Use with care!
        ###################################################################
        if [[ "${COMMIT_SUCCESSFUL}" == "yes" ]] ; then
+            add_oauth_token_to_remote_url
            git push origin gh-pages
        fi
    fi
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>2.1.0.RC2</version>
+	<version>2.1.0.RC3</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects</description>
@@ -24,8 +24,8 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.1.0.RELEASE</spring-boot.version>
-		<spring-cloud-build.version>2.1.0.RC2</spring-cloud-build.version>
+		<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
+		<spring-cloud-build.version>2.1.0.RC3</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>

 		<!-- Sonar -->
@@ -41,11 +41,12 @@
 		<checkstyle.version>${maven-checkstyle-plugin.version}</checkstyle.version>
 		<puppycrawl-tools-checkstyle.version>8.12</puppycrawl-tools-checkstyle.version>
 		<spring-javaformat.version>0.0.6</spring-javaformat.version>
+		<maven-failsafe-plugin.version>2.22.1</maven-failsafe-plugin.version>
 		<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
 		<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
 		<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
 		<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
-		<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
 		<maven-war-plugin.version>3.2.2</maven-war-plugin.version>
 		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
 		<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
@@ -215,6 +216,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
+					<version>${maven-compiler-plugin.version}</version>
 					<configuration>
 						<source>${maven.compiler.source}</source>
 						<target>${maven.compiler.target}</target>
@@ -224,6 +226,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>${maven-failsafe-plugin.version}</version>
 					<executions>
 						<execution>
 							<goals>
@@ -326,7 +329,8 @@ limitations under the License.
 							<inherited>true</inherited>
 							<configuration>
 								<configLocation>checkstyle.xml</configLocation>
-								<headerLocation>LICENSE.txt</headerLocation>
+								<headerLocation>checkstyle-header.txt</headerLocation>
+								<propertyExpansion>checkstyle.build.directory=${project.build.directory}</propertyExpansion>
 								<consoleOutput>true</consoleOutput>
 								<!-- TODO: Start fixing the errors -->
 								<includeTestSourceDirectory>false</includeTestSourceDirectory>
@@ -5,19 +5,19 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>2.1.0.RC2</version>
+	<version>2.1.0.RC3</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring Cloud projects. Use as a BOM or by inheriting from the spring-cloud build parent.</description>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>2.1.0.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<lombok.version>1.16.14</lombok.version>
-		<spring-boot.version>2.1.0.RELEASE</spring-boot.version>
+		<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.0.RC2</version>
+		<version>2.1.0.RC3</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -0,0 +1,17 @@
+^\Q/*\E$
+^\Q * Copyright \E20\d\d\-20\d\d\Q the original author or authors.\E$
+^\Q *\E$
+^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
+^\Q * you may not use this file except in compliance with the License.\E$
+^\Q * You may obtain a copy of the License at\E$
+^\Q *\E$
+^\Q *      http://www.apache.org/licenses/LICENSE-2.0\E$
+^\Q *\E$
+^\Q * Unless required by applicable law or agreed to in writing, software\E$
+^\Q * distributed under the License is distributed on an "AS IS" BASIS,\E$
+^\Q * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\E$
+^\Q * See the License for the specific language governing permissions and\E$
+^\Q * limitations under the License.\E$
+^\Q */\E$
+^$
+^.*$
@@ -4,13 +4,17 @@
 		"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="com.puppycrawl.tools.checkstyle.Checker">

+	<module name="SuppressionFilter">
+		<property name="file" value="src/checkstyle/checkstyle-suppressions.xml"/>
+		<property name="optional" value="true"/>
+	</module>
+
 	<!-- TAKEN FROM SPRING BOOT -->
 	<!-- Root Checks -->
-	<!--<module name="io.spring.javaformat.checkstyle.check.SpringHeaderCheck">
-		<property name="fileExtensions" value="java" />
-		<property name="headerType" value="${headerType}"/>
-		<property name="headerCopyrightPattern" value="${headerCopyrightPattern}"/>
-	</module>-->
+	<module name="com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck">
+		<property name="headerFile" value="${checkstyle.header.file}" />
+		<property name="fileExtensions" value="java,groovy" />
+	</module>
 	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
 		<property name="lineSeparator" value="lf"/>
 	</module>
@@ -4,21 +4,6 @@
      <option name="USE_TAB_CHARACTER" value="true" />
    </value>
  </option>
-  <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-  <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-  <option name="IMPORT_LAYOUT_TABLE">
-    <value>
-      <emptyLine />
-      <package name="java" withSubpackages="true" static="false" />
-      <package name="javax" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="org.springramework" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="" withSubpackages="true" static="true" />
-    </value>
-  </option>
  <option name="RIGHT_MARGIN" value="90" />
  <option name="FORMATTER_TAGS_ENABLED" value="true" />
  <GroovyCodeStyleSettings>
@@ -27,6 +12,7 @@
    <option name="IMPORT_LAYOUT_TABLE">
      <value>
        <package name="java" withSubpackages="true" static="false" />
+        <emptyLine />
        <package name="javax" withSubpackages="true" static="false" />
        <emptyLine />
        <package name="" withSubpackages="true" static="false" />
@@ -62,6 +48,10 @@
    <option name="ENABLE_JAVADOC_FORMATTING" value="false" />
  </JavaCodeStyleSettings>
  <codeStyleSettings language="Groovy">
+    <option name="ELSE_ON_NEW_LINE" value="true" />
+    <option name="CATCH_ON_NEW_LINE" value="true" />
+    <option name="FINALLY_ON_NEW_LINE" value="true" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
    <indentOptions>
      <option name="USE_TAB_CHARACTER" value="true" />
      <option name="LABEL_INDENT_SIZE" value="4" />
@@ -75,7 +65,7 @@
    <option name="FINALLY_ON_NEW_LINE" value="true" />
    <option name="INDENT_CASE_FROM_SWITCH" value="false" />
    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-    <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+    <option name="SPACE_WITHIN_BRACES" value="true" />
    <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
@@ -3,7 +3,7 @@
 	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>
 	<groupId>org.springframework.cloud</groupId>
-	<version>2.1.0.RC2</version>
+	<version>2.1.0.RC3</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
Author	SHA1	Message	Date
Ryan Baxter	85e49e2cd5	Version changes for RC3 release	2018-12-11 15:30:34 -05:00
Dave Syer	1212d08afb	Fix versions of some maven plugins	2018-12-10 09:04:19 +00:00
dmitry-s	32da4095f5	add SuppresionFilter module (#79 )	2018-12-05 21:13:17 +01:00
Dave Syer	d3f2e082d6	Update to Boot 2.1.1	2018-12-04 13:47:54 +00:00
Artem Bilan	2e986256a2	GH-62: Fix Checkstyle plugin configuration (#77 ) Fixes spring-cloud/spring-cloud-build#62 Since Checkstyle plugin is declared in the dependency management, we can't use a relative path to Checkstyle resources. We can only rely on the classpath as it is present in the `spring-cloud-build-tools` dependency, so downstream projects just rely on the common Checkstyle configuration from the parent	2018-11-20 19:47:13 +01:00
Marcin Grzejszczak	bdfc3591ee	Should use the token	2018-11-18 10:03:18 +01:00
Marcin Grzejszczak	2014a30efa	Updated Groovy conventions	2018-11-16 14:37:48 +01:00
Marcin Grzejszczak	b61fcecfb4	Fixed copyright pattern; fixes gh-62	2018-11-16 13:04:03 +01:00
Ryan Baxter	807a327c8c	Moving version back to snapshots	2018-11-01 19:51:22 -04:00