diff --git a/README.adoc b/README.adoc index bfec0e7..a3e1ada 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -// Do not edit this file (e.g. go instead to src/main/asciidoc) +// Do not edit this file (e.g. go instead to docs/src/main/asciidoc) = Spring Cloud Bus @@ -23,10 +23,12 @@ The bus currently supports sending messages to all nodes listening or all nodes == Building +:jdkversion: 1.7 + === Basic Compile and Test To build the source you will need to install -http://maven.apache.org/run-maven/index.html[Apache Maven] v3.0.6 or above and JDK 1.7. +http://maven.apache.org/run-maven/index.html[Apache Maven] v3.0.6 or above and JDK {jdkversion}. Spring Cloud uses Maven for most build-related activities, and you should be able to get off the ground quite quickly by cloning the @@ -66,46 +68,6 @@ parsing or rendering it, just copying it to `${main.basedir}` any changes in the README it will then show up after a Maven build as a modified file in the correct place. Just commit it and push the change. -=== Pull Requests - -Spring Cloud is released under the non-restrictive Apache 2.0 license, -and follows a very standard Github development process, using Github -tracker for issues and merging pull requests into master. If you want -to contribute even something trivial please do not hesitate, but -follow the guidelines below. - -==== Sign the Contributor License Agreement -Before we accept a non-trivial patch or pull request we will need you -to sign the -https://support.springsource.com/spring_committer_signup[contributor's -agreement]. Signing the contributor's agreement does not grant anyone -commit rights to the main repository, but it does mean that we can -accept your contributions, and you will get an author credit if we do. -Active contributors might be asked to join the core team, and given -the ability to merge pull requests. - -==== Code Conventions and Housekeeping -None of these is essential for a pull request, but they will all help. They can also be -added after the original pull request but before a merge. - -* Use the Spring Framework code format conventions. If you use Eclipse and you follow - the ``Importing into eclipse'' instructions below you should get project specific - formatting automatically. You can also import formatter settings using the - `eclipse-code-formatter.xml` file from the `eclipse` folder. If using IntelliJ, you can - use the 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 - for. -* Add the ASF license header comment to all new `.java` files (copy from existing files - in the project) -* Add yourself as an `@author` to the .java files that you modify substantially (more - than cosmetic changes). -* Add some Javadocs and, if you change the namespace, some XSD doc elements. -* 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). - === Working with the code If you don't have an IDE preference we would recommend that you use http://www.springsource.com/developer/sts[Spring Tools Suite] or @@ -153,11 +115,14 @@ The method getLocation() is undefined for the type ProxyRouteLocator.ProxyRouteS ==== Importing into other IDEs Maven is well supported by most Java IDEs. Refer to you vendor documentation. + == Contributing -Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like -to contribute something, or simply want to hack on the code this document should help -you get started. +Spring Cloud is released under the non-restrictive Apache 2.0 license, +and follows a very standard Github development process, using Github +tracker for issues and merging pull requests into master. If you want +to contribute even something trivial please do not hesitate, but +follow the guidelines below. === Sign the Contributor License Agreement Before we accept a non-trivial patch or pull request we will need you to sign the diff --git a/docs/pom.xml b/docs/pom.xml index 1047aa9..a0803e3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.springframework.cloud spring-cloud-bus-docs - 1.0.2.BUILD-SNAPSHOT + 1.0.2.RELEASE org.springframework.cloud spring-cloud-build - 1.0.2.BUILD-SNAPSHOT + 1.0.2.RELEASE pom diff --git a/pom.xml b/pom.xml index b04ca10..c2df85b 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-build - 1.0.2.BUILD-SNAPSHOT + 1.0.2.RELEASE @@ -23,8 +23,8 @@ bus - 1.0.2.BUILD-SNAPSHOT - 1.0.2.BUILD-SNAPSHOT + 1.0.2.RELEASE + 1.0.2.RELEASE 4.1.0.RELEASE 1.1.0.RELEASE 1.0.1.RELEASE @@ -51,12 +51,12 @@ org.springframework.cloud spring-cloud-starter-bus-amqp - 1.0.3.BUILD-SNAPSHOT + 1.0.3.RELEASE org.springframework.cloud spring-cloud-bus - 1.0.2.BUILD-SNAPSHOT + 1.0.2.RELEASE org.springframework diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml index 1cfd79f..f7724e3 100644 --- a/spring-cloud-bus/pom.xml +++ b/spring-cloud-bus/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-bus-parent - 1.0.2.BUILD-SNAPSHOT + 1.0.2.RELEASE ..