Polishing

See gh-563.

Author: mp911de

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip

README.adoc

@@ -238,9 +238,7 @@ public class AppConfig {
 
 ==== Build requirements for Vault
 
-Spring Vault requires SSL certificates and a running
-Vault instance listening on `localhost:8200`. Certificates and the Vault
-setup are scripted, the scripts are located in `src/test/bash`.
+Spring Vault requires SSL certificates and a running Vault instance listening on `localhost:8200`.Certificates and the Vault setup are scripted, the scripts are located in `src/test/bash`.
 
 The following scripts need to be run prior to building the project for the tests to pass.
 
@@ -255,66 +253,42 @@ Changes to the documentation should be made to the adocs found under `src/main/a
 
 To build the source you will need to install JDK 1.6.
 
-Spring Vault uses Maven for most build-related activities, and you
-should be able to get off the ground quite quickly by cloning the
-project you are interested in and typing
+Spring Vault uses Maven for most build-related activities, and you should be able to get off the ground quite quickly by cloning the project you are interested in and typing
 
 ----
 $ ./mvnw install
 ----
 
-NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command
-in place of `./mvnw` in the examples below. If you do that you also
-might need to add `-P spring` if your local Maven settings do not
-contain repository declarations for spring pre-release artifacts.
-
-NOTE: Be aware that you might need to increase the amount of memory
-available to Maven by setting a `MAVEN_OPTS` environment variable with
-a value like `-Xmx512m -XX:MaxPermSize=128m`. We try to cover this in
-the `.mvn` configuration, so if you find you have to do it to make a
-build succeed, please raise a ticket to get the settings added to
-source control.
-
-For hints on how to build the project look in `.travis.yml` if there
-is one. There should be a "script" and maybe "install" command. Also
-look at the "services" section to see if any services need to be
-running locally (e.g. mongo or rabbit).  Ignore the git-related bits
-that you might find in "before_install" since they're related to setting git
-credentials and you already have those.
+NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command in place of `./mvnw` in the examples below.If you do that you also might need to add `-P spring` if your local Maven settings do not contain repository declarations for spring pre-release artifacts.
+
+NOTE: Be aware that you might need to increase the amount of memory available to Maven by setting a `MAVEN_OPTS` environment variable with a value like `-Xmx512m -XX:MaxPermSize=128m`.We try to cover this in the `.mvn` configuration, so if you find you have to do it to make a build succeed, please raise a ticket to get the settings added to source control.
+
+For hints on how to build the project look in `.travis.yml` if there is one.There should be a "script" and maybe "install" command.Also look at the "services" section to see if any services need to be running locally (e.g. mongo or rabbit).Ignore the git-related bits that you might find in "before_install" since they're related to setting git credentials and you already have those.
 
 NOTE: If all else fails, build with the command from `.travis.yml` (usually
 `./mvnw install`).
 
 === Documentation
 
-The module has a "distribute" profile, and if you switch
-that on it will try to build asciidoc sources from
+The module has a "distribute" profile, and if you switch that on it will try to build asciidoc sources from
 `src/main/asciidoc`.
 
 === Working with the code
+
 If you don't have an IDE preference we would recommend that you use
 https://www.springsource.com/developer/sts[Spring Tools Suite] or
-https://eclipse.org[Eclipse] when working with the code. We use the
-https://eclipse.org/m2e/[m2eclipe] 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.
+https://eclipse.org[Eclipse] when working with the code.We use the
+https://eclipse.org/m2e/[m2eclipe] 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 https://eclipse.org/m2e/[m2eclipe] eclipse plugin when working with
-eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
-marketplace".
-
-NOTE: Older versions of m2e do not support Maven 3.3, so once the
-projects are imported into Eclipse you will also need to tell
-m2eclipse to use the right profile for the projects.  If you
-see many different errors related to the POMs in the projects, check
-that you have an up to date installation.  If you can't upgrade m2e,
-add the "spring" profile to your `settings.xml`. Alternatively you can
-copy the repository settings from the "spring" profile of the parent
-pom into your `settings.xml`.
+
+We recommend the https://eclipse.org/m2e/[m2eclipe] eclipse plugin when working with eclipse.If you don't already have m2eclipse installed it is available from the "eclipse marketplace".
+
+NOTE: Older versions of m2e do not support Maven 3.3, so once the projects are imported into Eclipse you will also need to tell m2eclipse to use the right profile for the projects.If you see many different errors related to the POMs in the projects, check that you have an up to date installation.If you can't upgrade m2e, add the "spring" profile to your `settings.xml`.Alternatively you can copy the repository settings from the "spring" profile of the parent pom into your `settings.xml`.
 
 ==== Importing into eclipse without m2eclipse
-If you prefer not to use m2eclipse you can generate eclipse project metadata using the
-following command:
+
+If you prefer not to use m2eclipse you can generate eclipse project metadata using the following command:
 
 [indent=0]
 ----
@@ -326,45 +300,33 @@ from the `file` menu.
 
 == Contributing
 
-Spring Vault 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.
+Spring Vault 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://cla.pivotal.io/sign/spring[Contributor License 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.
+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 of Conduct
+
 This project adheres to the Contributor Covenant https://github.com/spring-framework/spring-vault/blob/master/CODE_OF_CONDUCT.adoc[code of
-conduct]. By participating, you  are expected to uphold this code. Please report
-unacceptable behavior to [email protected].
+conduct].
+By participating, you are expected to uphold this code.
+Please report unacceptable behavior to [email protected].
 
 === 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
-  you can import formatter settings using the
-  `eclipse-code-formatter.xml` file from the
-  https://raw.githubusercontent.com/spring-framework/spring-vault/master/etc/ide/eclipse-code-formatter.xml[project]. If using IntelliJ, you can use the
-  https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
-  Plugin] to import the same file.
+
+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.
+
+* Spring Vault uses the Spring JavaFormat conventions.
+Formatting is applied when running the build through `$ ./mvnw compile`
+IDE plugins are available from https://github.com/spring-io/spring-javaformat.
 * Make sure all new `.java` files to have a 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).
+`@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).
 * Please include unit tests.
-* 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],
-  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).
+* 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], 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).