diff --git a/README.adoc b/README.adoc index fac561e2..eeda37f4 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,4 @@ -//// -DO NOT EDIT THIS FILE. IT WAS GENERATED. -Manual changes to this file will be lost when it is generated again. -Edit the files in the src/main/asciidoc/ directory instead. -//// +// Do not edit this file (e.g. go instead to src/main/asciidoc) image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"] @@ -76,7 +72,7 @@ added after the original pull request but before a merge. `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the - https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is @@ -89,7 +85,7 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], +* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). @@ -160,7 +156,7 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i + "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> diff --git a/docs/pom.xml b/docs/pom.xml index 14c33e73..bf0ef91f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index a249a3c5..4dc7ebea 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,7 +28,7 @@ ${basedir} ${project.artifactId} 2.1.3.RELEASE - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT ${project.build.directory}/build-docs diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 5d4ba4f7..b5b3fda4 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index e17b6a33..86076aa4 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 4085827e..8c10af99 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent