Skip to content

Commit 9111891

Browse files
committed
Reformat readme
See gh-591.
1 parent dc17c56 commit 9111891

File tree

1 file changed

+32
-24
lines changed

1 file changed

+32
-24
lines changed

README.adoc

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ image::https://spring.io/badges/spring-vault/snapshot.svg[link=https://projects.
44

55
= Spring Vault
66

7-
87
Spring Vault provides client-side support for accessing, storing and revoking secrets.
98
With https://www.vaultproject.io[HashiCorp's Vault] you have a central place to manage external secret data for applications across all environments.
109
Vault can manage static and dynamic secrets such as application data, username/password for remote applications/resources and provide credentials for external services such as MySQL, PostgreSQL, Apache Cassandra, Consul, AWS and more.
@@ -75,8 +74,7 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
7574

7675
*Prerequisites*
7776

78-
To get started with Vault and this guide you need a
79-
*NIX-like operating systems that provides:
77+
To get started with Vault and this guide you need a *NIX-like operating systems that provides:
8078

8179
* `wget`, `openssl` and `unzip`
8280
* at least Java 8 and a properly configured `JAVA_HOME` environment variable
@@ -93,7 +91,8 @@ $ src/test/bash/install_vault.sh
9391
$ src/test/bash/create_certificates.sh
9492
----
9593

96-
NOTE: `create_certificates.sh` creates certificates in `work/ca` and a JKS truststore `work/keystore.jsk`. If you want to run Spring Vault using this quickstart guide you need to configure the truststore to `file:work/keystore.jks`.
94+
NOTE: `create_certificates.sh` creates certificates in `work/ca` and a JKS truststore `work/keystore.jsk`.
95+
If you want to run Spring Vault using this quickstart guide you need to configure the truststore to `file:work/keystore.jks`.
9796

9897
*Start Vault server*
9998

@@ -103,8 +102,7 @@ $ src/test/bash/local_run_vault.sh
103102

104103
Vault is started listening on `0.0.0.0:8200` using the `inmem` storage and
105104
`https`.
106-
Vault is sealed and not initialized when starting up
107-
so you need to initialize it first.
105+
Vault is sealed and not initialized when starting up so you need to initialize it first.
108106

109107
----
110108
$ export VAULT_ADDR="https://localhost:8200"
@@ -144,8 +142,8 @@ Vault is now initialized and unsealed.
144142

145143
=== Using VaultTemplate
146144

147-
The class VaultTemplate, located in the package org.springframework.vault.core, is the central class of the Spring’s Vault support providing a rich feature set to interact with Vault. The template offers convenience operations to read, write and delete data in Vault and provides a mapping between your domain objects and Vault data.
148-
145+
The class VaultTemplate, located in the package org.springframework.vault.core, is the central class of the Spring’s Vault support providing a rich feature set to interact with Vault.
146+
The template offers convenience operations to read, write and delete data in Vault and provides a mapping between your domain objects and Vault data.
149147

150148
You can have Spring initializing Spring Vault by providing a JavaConfig:
151149

@@ -204,16 +202,13 @@ public class MyApp {
204202

205203
=== @VaultPropertySource
206204

207-
`@VaultPropertySource` provides a convenient and declarative
208-
mechanism for adding a `PropertySource` to Spring’s `Environment`.
205+
`@VaultPropertySource` provides a convenient and declarative mechanism for adding a `PropertySource` to Spring’s `Environment`.
209206

210207
To be used in conjunction with @Configuration classes.
211208
Example usage
212209

213-
Given a Vault path `secret/my-application` containing the configuration data
214-
pair `database.password=mysecretpassword`, the following `@Configuration`
215-
class uses `@VaultPropertySource` to contribute `secret/my-application` to
216-
the `Environment`'s set of `PropertySources`.
210+
Given a Vault path `secret/my-application` containing the configuration data pair `database.password=mysecretpassword`, the following `@Configuration`
211+
class uses `@VaultPropertySource` to contribute `secret/my-application` to the `Environment`'s set of `PropertySources`.
217212

218213
====
219214
[source,java]
@@ -238,7 +233,8 @@ public class AppConfig {
238233

239234
==== Build requirements for Vault
240235

241-
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`.
236+
Spring Vault requires SSL certificates and a running Vault instance listening on `localhost:8200`.
237+
Certificates and the Vault setup are scripted, the scripts are located in `src/test/bash`.
242238

243239
The following scripts need to be run prior to building the project for the tests to pass.
244240

@@ -259,11 +255,16 @@ Spring Vault uses Maven for most build-related activities, and you should be abl
259255
$ ./mvnw install
260256
----
261257

262-
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.
258+
NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command in place of `./mvnw` in the examples below.
259+
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.
263260

264-
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.
261+
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`.
262+
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.
265263

266-
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.
264+
For hints on how to build the project look in `.travis.yml` if there is one.
265+
There should be a "script" and maybe "install" command.
266+
Also look at the "services" section to see if any services need to be running locally (e.g. mongo or rabbit).
267+
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.
267268

268269
NOTE: If all else fails, build with the command from `.travis.yml` (usually
269270
`./mvnw install`).
@@ -277,14 +278,19 @@ The module has a "distribute" profile, and if you switch that on it will try to
277278

278279
If you don't have an IDE preference we would recommend that you use
279280
https://www.springsource.com/developer/sts[Spring Tools Suite] or
280-
https://eclipse.org[Eclipse] when working with the code. We use the
281-
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.
281+
https://eclipse.org[Eclipse] when working with the code.
282+
We use the
283+
https://eclipse.org/m2e/[m2eclipe] eclipse plugin for maven support.
284+
Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better.
282285

283286
==== Importing into eclipse with m2eclipse
284287

285-
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".
288+
We recommend the https://eclipse.org/m2e/[m2eclipe] eclipse plugin when working with eclipse.
289+
If you don't already have m2eclipse installed it is available from the "eclipse marketplace".
286290

287-
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`.
291+
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.
292+
If you can't upgrade m2e, add the "spring" profile to your `settings.xml`.
293+
Alternatively you can copy the repository settings from the "spring" profile of the parent pom into your `settings.xml`.
288294

289295
==== Importing into eclipse without m2eclipse
290296

@@ -300,13 +306,15 @@ from the `file` menu.
300306

301307
== Contributing
302308

303-
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.
309+
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.
310+
If you want to contribute even something trivial please do not hesitate, but follow the guidelines below.
304311

305312
=== Sign the Contributor License Agreement
306313

307314
Before we accept a non-trivial patch or pull request we will need you to sign the
308315
https://cla.pivotal.io/sign/spring[Contributor License Agreement].
309-
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.
316+
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.
317+
Active contributors might be asked to join the core team, and given the ability to merge pull requests.
310318

311319
=== Code of Conduct
312320

0 commit comments

Comments
 (0)