Update for 1.2.2.RELEASE

Add version plugins for maven jar/javadoc/source
* Use latest versions in 2.x family of plugins.
2026-09-17 21:09:00 +00:00 · 2017-02-03 09:20:24 +00:00 · 2016-11-19 21:51:22 +00:00 · 2016-11-03 15:29:58 -04:00 · 2016-11-02 22:42:52 +01:00 · 2016-10-24 12:04:31 +01:00
5 changed files with 35 additions and 17 deletions
@@ -55,11 +55,11 @@ a modified file in the correct place. Just commit it and push the change.
 If you don't have an IDE preference we would recommend that you use
 http://www.springsource.com/developer/sts[Spring Tools Suite] or
 http://eclipse.org[Eclipse] when working with the code. We use the
-http://eclipse.org/m2e/[m2eclipe] eclipse plugin for maven support. Other IDEs and tools
+http://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.

 ==== Importing into eclipse with m2eclipse
-We recommend the http://eclipse.org/m2e/[m2eclipe] eclipse plugin when working with
+We recommend the http://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
 eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
 marketplace".

@@ -1,5 +1,7 @@
 #!/bin/bash -x

+# Usage: (cd <project root>; ghpages.sh -v <version> -b -c)
+
 set -e

 # Set default props like MAVEN_PATH, ROOT_FOLDER etc.
@@ -16,8 +18,15 @@ function set_default_props() {
    # Prop that will let commit the changes
    COMMIT_CHANGES="no"
    MAVEN_PATH=${MAVEN_PATH:-}
-    echo "Path to Maven is [${MAVEN_PATH}]"
-    REPO_NAME=${PWD##*/}
+    if [ -e "${ROOT_FOLDER}/mvnw" ]; then
+        MAVEN_EXEC="$ROOT_FOLDER/mvnw"
+    else
+        MAVEN_EXEC="${MAVEN_PATH}mvn"
+    fi
+    echo "Path to Maven is [${MAVEN_EXEC}]"
+    if [ -z $REPO_NAME ]; then
+        REPO_NAME=$(git remote -v | grep origin | head -1 | sed -e 's!.*/!!' -e 's/ .*//' -e 's/\.git.*//')
+    fi
    echo "Repo name is [${REPO_NAME}]"
    SPRING_CLOUD_STATIC_REPO=${SPRING_CLOUD_STATIC_REPO:-git@github.com:spring-cloud/spring-cloud-static.git}
    echo "Spring Cloud Static repo is [${SPRING_CLOUD_STATIC_REPO}"
@@ -69,22 +78,22 @@ function build_docs_if_applicable() {
 # Get the name of the `docs.main` property
 # Get whitelisted branches - assumes that a `docs` module is available under `docs` profile
 function retrieve_doc_properties() {
-    MAIN_ADOC_VALUE=$("${MAVEN_PATH}"mvn -q \
+    MAIN_ADOC_VALUE=$("${MAVEN_EXEC}" -q \
        -Dexec.executable="echo" \
        -Dexec.args='${docs.main}' \
        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
        -P docs \
-        -pl docs)
+        -pl docs | tail -1 )
    echo "Extracted 'main.adoc' from Maven build [${MAIN_ADOC_VALUE}]"


    WHITELIST_PROPERTY=${WHITELIST_PROPERTY:-"docs.whitelisted.branches"}
-    WHITELISTED_BRANCHES_VALUE=$("${MAVEN_PATH}"mvn -q \
+    WHITELISTED_BRANCHES_VALUE=$("${MAVEN_EXEC}" -q \
        -Dexec.executable="echo" \
        -Dexec.args="\${${WHITELIST_PROPERTY}}" \
        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
        -P docs \
-        -pl docs)
+        -pl docs | tail -1 )
    echo "Extracted '${WHITELIST_PROPERTY}' from Maven build [${WHITELISTED_BRANCHES_VALUE}]"
 }

@@ -152,9 +161,9 @@ function copy_docs_for_current_version() {
            if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
                # Not ignored...
                cp -rf $f ${ROOT_FOLDER}/
-                git add -A ${ROOT_FOLDER}/$file
            fi
        done
+        git add -A ${ROOT_FOLDER}
        COMMIT_CHANGES="yes"
    else
        echo -e "Current branch is [${CURRENT_BRANCH}]"
@@ -213,11 +222,10 @@ function copy_docs_for_branch() {
            # We don't want to copy the spring-cloud-sleuth.html
            # we want it to be converted to index.html
            cp -rf $f ${destination}/index.html
-            git add -A ${destination}/index.html
        else
            cp -rf $f ${destination}
-            git add -A ${destination}/$file
        fi
+        git add -A ${destination}
    fi
 }

@@ -345,4 +353,4 @@ build_docs_if_applicable
 retrieve_doc_properties
 stash_changes
 add_docs_from_target
-checkout_previous_branch
+checkout_previous_branch
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>1.2.1.RELEASE</version>
+	<version>1.2.2.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects</description>
@@ -23,7 +23,7 @@
 		<lombok.version>1.16.6</lombok.version>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>1.4.1.RELEASE</spring-boot.version>
+		<spring-boot.version>1.4.2.RELEASE</spring-boot.version>

 		<!-- Sonar -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -131,6 +131,7 @@ limitations under the License.
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
 				<executions>
 					<execution>
 						<id>javadoc</id>
@@ -146,6 +147,7 @@ limitations under the License.
 			</plugin>
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
+				<version>2.4</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -175,6 +177,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.6</version>
 					<configuration>
 						<archive>
 							<manifest>
@@ -184,6 +187,11 @@ limitations under the License.
 						</archive>
 					</configuration>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.7</version>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
@@ -250,6 +258,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
+					<version>${spring-boot.version}</version>
 					<executions>
 						<execution>
 							<goals>
@@ -265,6 +274,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
+					<version>2.2</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.springframework.boot</groupId>
@@ -5,14 +5,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-tools</artifactId>
-	<version>1.2.1.RELEASE</version>
+	<version>1.2.2.RELEASE</version>
 	<name>spring-cloud-build-tools</name>
 	<packaging>jar</packaging>
 	<description>Spring Cloud Build Tools</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.2.1.RELEASE</version>
+		<version>1.2.2.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.2.1.RELEASE</version>
+	<version>1.2.2.RELEASE</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
Author	SHA1	Message	Date
Dave Syer	28ab788e2c	Update for 1.2.2.RELEASE	2017-02-03 09:20:24 +00:00
Mark Pollack	ade61f45df	Add version plugins for maven jar/javadoc/source * Use latest versions in 2.x family of plugins.	2016-11-19 21:51:22 +00:00
Spencer Gibb	3ce22f282c	Merge pull request #44 from copa2/patch-1 Fix typo	2016-11-03 15:29:58 -04:00
copa2	c80858652b	Fix typo Obvious fix	2016-11-02 22:42:52 +01:00
Dave Syer	af055cf9c3	Add versions for some plugins	2016-10-24 12:04:31 +01:00
Marcin Grzejszczak	786ffe9db5	Fixing git remote	2016-10-18 15:50:56 +02:00
Marcin Grzejszczak	3abc7bdef4	Added tail to pick proper echoed value	2016-09-22 22:58:45 +02:00
Dave Syer	26a0e7df3d	Fix commented out git push Otherwise the result is not persisted	2016-09-22 12:03:14 +01:00
Dave Syer	96e92e5dd4	Fix project name and git additions The project name is not necessarily the same as the artifactId (some projects use *-parent), so it's better to guess from the git remote. Also "git add -A <a file>" can easily fail if you add an ignored file by mistake. It's better just to add the directory.	2016-09-22 11:15:35 +01:00
Dave Syer	c68034276a	Update ghpages script to do project name discovery Also uses local mvnw wrapper if it it is there.	2016-09-21 11:50:26 +01:00
Dave Syer	41622b37dc	Revert to snapshots	2016-09-21 11:07:24 +01:00