1.3.4.RELEASE

Fixing boot property
Bumping boot version
2026-09-17 21:09:00 +00:00 · 2017-08-24 15:06:46 -04:00 · 2017-08-24 15:00:49 -04:00 · 2017-08-24 14:27:57 -04:00 · 2017-07-12 15:36:48 -04:00 · 2017-06-19 11:49:11 +01:00
8 changed files with 223 additions and 52 deletions
@@ -0,0 +1,20 @@
+general:
+  branches:
+    ignore:
+      - gh-pages # list of branches to ignore
+machine:
+  java:
+    version: openjdk8 #Open JDK has the JCE extentions installed by default
+  environment:
+    _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
+dependencies:
+  override:
+    - ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
+test:
+  override:
+    - ./mvnw -s .settings.xml clean install 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
+  post:
+    - find . -type f -regex ".*/spring-cloud-*.*/target/*.*" | cpio -pdm $CIRCLE_ARTIFACTS
+    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
+    - find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+    - bash <(curl -s https://codecov.io/bash)
@@ -1,3 +1,5 @@
+image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"]
+
 Spring Cloud Build is a common utility project for Spring Cloud
 to use for plugin and dependency management.

@@ -38,4 +40,4 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging:

 == Contributing

-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
@@ -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
 }
@@ -344,8 +345,11 @@ done
 assert_properties
 set_default_props
 check_if_anything_to_sync
-if [[ -z "${VERSION}" ]] ; then
-    retrieve_current_branch
+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"
 else
    switch_to_tag
 fi
@@ -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" \
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>1.3.1.RC1</version>
+	<version>1.3.4.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects</description>
 	<modules>
+		<module>spring-cloud-build-dependencies</module>
 		<module>spring-cloud-dependencies-parent</module>
 		<module>spring-cloud-build-tools</module>
 	</modules>
@@ -20,10 +21,9 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-		<lombok.version>1.16.14</lombok.version>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>1.5.2.RELEASE</spring-boot.version>
+		<spring-boot.version>1.5.6.RELEASE</spring-boot.version>

 		<!-- Sonar -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -31,6 +31,17 @@
 		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
 		<sonar.language>java</sonar.language>
 	</properties>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-build-dependencies</artifactId>
+				<version>1.3.4.RELEASE</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
 		<url>https://www.spring.io</url>
@@ -375,32 +386,6 @@ limitations under the License.
 			</plugins>
 		</pluginManagement>
 	</build>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-core</artifactId>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>org.projectlombok</groupId>
-				<artifactId>lombok</artifactId>
-				<version>${lombok.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-dependencies</artifactId>
-				<version>${spring-boot.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 	<distributionManagement>
 		<downloadUrl>https://github.com/spring-cloud</downloadUrl>
 		<site>
@@ -408,9 +393,9 @@ limitations under the License.
 			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}</url>
 		</site>
 		<repository>
-			<id>repo.spring.io</id>
-			<name>Spring Release Repository</name>
-			<url>https://repo.spring.io/libs-release-local</url>
+			<id>sonatype-nexus-staging</id>
+			<name>Nexus Release Repository</name>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 		<snapshotRepository>
 			<id>repo.spring.io</id>
@@ -505,18 +490,6 @@ limitations under the License.
 					</plugin>
 				</plugins>
 			</build>
-			<distributionManagement>
-				<snapshotRepository>
-					<id>sonatype-nexus-snapshots</id>
-					<name>Sonatype Nexus Snapshots</name>
-					<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-				</snapshotRepository>
-				<repository>
-					<id>sonatype-nexus-staging</id>
-					<name>Nexus Release Repository</name>
-					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-				</repository>
-			</distributionManagement>
 		</profile>
 		<profile>
 			<id>java8</id>
@@ -639,6 +612,7 @@ limitations under the License.
 											<docinfo>true</docinfo>
 											<spring-cloud-version>${project.version}</spring-cloud-version>
 											<allow-uri-read>true</allow-uri-read>
+											<source-highlighter>prettify</source-highlighter>
 										</attributes>
 									</configuration>
 								</execution>
@@ -688,13 +662,13 @@ limitations under the License.
 										<goal>run</goal>
 									</goals>
 									<configuration>
-										<tasks>
+										<target>
 											<java classname="org.jruby.Main" failonerror="yes">
 												<arg value="${basedir}/src/main/ruby/generate_readme.sh"/>
 												<arg value="-o"/>
 												<arg value="${main.basedir}/README.adoc"/>
 											</java>
-										</tasks>
+										</target>
 									</configuration>
 								</execution>
 								<execution>
@@ -775,6 +749,7 @@ limitations under the License.
 						<plugin>
 							<groupId>org.codehaus.mojo</groupId>
 							<artifactId>build-helper-maven-plugin</artifactId>
+							<version>3.0.0</version>
 							<executions>
 								<execution>
 									<id>attach-zip</id>
@@ -0,0 +1,162 @@
+<?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>
+	<groupId>org.springframework.cloud</groupId>
+	<artifactId>spring-cloud-build-dependencies</artifactId>
+	<version>1.3.4.RELEASE</version>
+	<name>spring-cloud-build-tools</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>1.5.6.RELEASE</version>
+	</parent>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<lombok.version>1.16.14</lombok.version>
+		<spring-boot.version>${parent.version}</spring-boot.version>
+	</properties>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-core</artifactId>
+				<version>${spring.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.projectlombok</groupId>
+				<artifactId>lombok</artifactId>
+				<version>${lombok.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	<distributionManagement>
+		<downloadUrl>https://github.com/spring-cloud</downloadUrl>
+		<site>
+			<id>spring-docs</id>
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
+		</url>
+		</site>
+		<repository>
+			<id>repo.spring.io</id>
+			<name>Spring Release Repository</name>
+			<url>https://repo.spring.io/libs-release-local</url>
+		</repository>
+		<snapshotRepository>
+			<id>repo.spring.io</id>
+			<name>Spring Snapshot Repository</name>
+			<url>https://repo.spring.io/libs-snapshot-local</url>
+		</snapshotRepository>
+	</distributionManagement>
+	<profiles>
+		<profile>
+			<id>milestone</id>
+			<distributionManagement>
+				<repository>
+					<id>repo.spring.io</id>
+					<name>Spring Milestone Repository</name>
+					<url>https://repo.spring.io/libs-milestone-local</url>
+				</repository>
+			</distributionManagement>
+		</profile>
+		<profile>
+			<id>bintray</id>
+			<distributionManagement>
+				<repository>
+					<id>bintray</id>
+					<name>Jcenter Repository</name>
+					<url>https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}</url>
+				</repository>
+			</distributionManagement>
+		</profile>
+		<profile>
+			<id>central</id>
+			<distributionManagement>
+				<snapshotRepository>
+					<id>sonatype-nexus-snapshots</id>
+					<name>Sonatype Nexus Snapshots</name>
+					<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+				</snapshotRepository>
+				<repository>
+					<id>sonatype-nexus-staging</id>
+					<name>Nexus Release Repository</name>
+					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+				</repository>
+			</distributionManagement>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>spring</id>
+			<repositories>
+				<repository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>https://repo.spring.io/libs-milestone-local</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>https://repo.spring.io/release</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+			<pluginRepositories>
+				<pluginRepository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</pluginRepository>
+				<pluginRepository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>https://repo.spring.io/libs-milestone-local</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</pluginRepository>
+			</pluginRepositories>
+		</profile>
+	</profiles>
+
+</project>
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.3.1.RC1</version>
+		<version>1.3.4.RELEASE</version>
 	</parent>

 </project>
@@ -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>1.3.1.RC1</version>
+	<version>1.3.4.RELEASE</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
Author	SHA1	Message	Date
Ryan Baxter	ebdc00ddea	1.3.4.RELEASE	2017-08-24 15:06:46 -04:00
Ryan Baxter	450ea884db	Fixing boot property	2017-08-24 15:00:49 -04:00
Ryan Baxter	261cbf51ec	Bumping boot version	2017-08-24 14:27:57 -04:00
Kyle Anderson	a9ced4513e	Maven Configuration Improvements (#57 ) * Specify build-helper-maven-plugin Version * Refactored Deprecated AntRun Plugin Parameter	2017-07-12 15:36:48 -04:00
Dave Syer	4cc410cfc0	Revert to snapshots	2017-06-19 11:49:11 +01:00
Dave Syer	e5ed9b4f90	Update for 1.3.3.RELEASE	2017-06-19 11:42:13 +01:00
Spencer Gibb	68a2afff02	Merge pull request #55 from mbogoevici/boot-1.5.4 Update Spring Boot to 1.5.4.RELEASE	2017-06-09 15:53:29 -04:00
Marius Bogoevici	eb8ffcff45	Update Spring Boot to 1.5.4.RELEASE	2017-06-09 15:33:34 -04:00
Marcin Grzejszczak	aaa6a2c973	Let's start highlighting syntax... (#54 )	2017-05-12 14:17:53 +02:00
Jon Schneider	de403a2553	Add CircleCI badge to README.adoc	2017-05-11 13:14:12 -05:00
Dave Syer	171be768c7	Revert to snapshots	2017-04-26 09:08:57 +01:00
Dave Syer	22e98d294c	Update to 1.3.2.RELEASE	2017-04-26 09:07:45 +01:00
Dave Syer	db0cd55df2	Remove unused resources	2017-04-24 11:48:18 +01:00
Dave Syer	d4257bc99c	Add spring-cloud-build-dependencies BOM layer Users, and even Spring Cloud libraries never need to know about this, but the extra level of indirection helps because of the commons-logging dependency, which we want to exclude from Spring Cloud libraries, but which can only be excluded globally from all of them here. The previous solution to that problem was to add the exclusion with a spring-core dependency managed by spring-cloud-build directly. The problem with that is that it needs to have the spring-core version explicitly, or else libraries that depend directly on spring-core cannot find the version (not many libraries do depend directly on spring-core so it only hurts on the margin to not have the version, which is where we were with 1.3.1.RELEASE and lower).	2017-04-24 11:00:42 +01:00
Ryan Baxter	b4e4209ce4	Merge branch 'master' of https://github.com/spring-cloud/spring-cloud-build	2017-03-17 14:33:23 -04:00
Ryan Baxter	055edea9cb	adding circle ci config	2017-03-17 14:33:03 -04:00
Marcin Grzejszczak	736d29ac18	Fixed the retrieval of current branch	2017-03-17 10:10:08 +01:00
Marcin Grzejszczak	ef8189dc88	Fixed the retrieval of current branch	2017-03-17 09:43:26 +01:00
Marcin Grzejszczak	03fd279df1	Added logging to the script	2017-03-10 16:53:19 +01:00
Marcin Grzejszczak	3bfe13c793	Updated ghpages	2017-03-10 16:48:13 +01:00
Marcin Grzejszczak	931e8fe555	Updated ghpages	2017-03-10 16:00:12 +01:00
Marcin Grzejszczak	88118aa277	Don't switch to tag for snapshots	2017-03-10 15:36:59 +01:00
Dave Syer	74a746b71e	Revert to snapshots	2017-03-06 12:32:45 +00:00
Dave Syer	541b8f302e	Update to 1.3.1	2017-03-06 12:31:37 +00:00
Spencer Gibb	9685ebad24	Update to SNAPSHOTS	2017-03-03 12:15:46 -07:00