diff --git a/.editorconfig b/.editorconfig
index 323872ee..52e6a1af 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,4 @@
-root=true
+root = true
[*.java]
indent_style = tab
@@ -13,4 +13,12 @@ continuation_indent_size = 8
[*.xml]
indent_style = tab
indent_size = 4
-continuation_indent_size = 8
\ No newline at end of file
+continuation_indent_size = 8
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.yaml]
+indent_style = space
+indent_size = 2
\ No newline at end of file
diff --git a/.settings.xml b/.settings.xml
index 6c355129..6f542c94 100644
--- a/.settings.xml
+++ b/.settings.xml
@@ -1,66 +1,68 @@
-
-
- repo.spring.io
- ${env.CI_DEPLOY_USERNAME}
- ${env.CI_DEPLOY_PASSWORD}
-
-
-
-
-
- spring
- true
-
-
- spring-snapshots
- Spring Snapshots
- http://repo.spring.io/libs-snapshot-local
-
- true
-
-
-
- spring-milestones
- Spring Milestones
- http://repo.spring.io/libs-milestone-local
-
- false
-
-
-
- spring-releases
- Spring Releases
- http://repo.spring.io/release
-
- false
-
-
-
-
-
- spring-snapshots
- Spring Snapshots
- http://repo.spring.io/libs-snapshot-local
-
- true
-
-
-
- spring-milestones
- Spring Milestones
- http://repo.spring.io/libs-milestone-local
-
- false
-
-
-
-
-
+
+
+ repo.spring.io
+ ${env.CI_DEPLOY_USERNAME}
+ ${env.CI_DEPLOY_PASSWORD}
+
+
+
+
+
+ spring
+
+ true
+
+
+
+ spring-snapshots
+ Spring Snapshots
+ http://repo.spring.io/libs-snapshot-local
+
+ true
+
+
+
+ spring-milestones
+ Spring Milestones
+ http://repo.spring.io/libs-milestone-local
+
+ false
+
+
+
+ spring-releases
+ Spring Releases
+ http://repo.spring.io/release
+
+ false
+
+
+
+
+
+ spring-snapshots
+ Spring Snapshots
+ http://repo.spring.io/libs-snapshot-local
+
+ true
+
+
+
+ spring-milestones
+ Spring Milestones
+ http://repo.spring.io/libs-milestone-local
+
+ false
+
+
+
+
+
diff --git a/docs/pom.xml b/docs/pom.xml
index ce631392..0bc5dd3b 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -1,6 +1,7 @@
-
+
4.0.0
spring-cloud-build-docs
spring-cloud-build-docs
diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc
index d467a906..9d81f214 100644
--- a/docs/src/main/asciidoc/README.adoc
+++ b/docs/src/main/asciidoc/README.adoc
@@ -63,7 +63,7 @@ Spring Cloud Build comes with a set of checkstyle rules. You can find them in th
=== Checkstyle configuration
-Checkstyle rules are *disabled by deafult*. To add checkstyle to your project just define the following properties and plugins.
+Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins.
.pom.xml
----
@@ -118,6 +118,8 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i
----
+It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied.
+
== Contributing
diff --git a/docs/src/main/docbook/css/highlight.css b/docs/src/main/docbook/css/highlight.css
index ffefef72..3850f8b9 100644
--- a/docs/src/main/docbook/css/highlight.css
+++ b/docs/src/main/docbook/css/highlight.css
@@ -4,32 +4,32 @@
*/
.hl-keyword {
- color: #7F0055;
- font-weight: bold;
+ color: #7F0055;
+ font-weight: bold;
}
.hl-comment {
- color: #3F5F5F;
- font-style: italic;
+ color: #3F5F5F;
+ font-style: italic;
}
.hl-multiline-comment {
- color: #3F5FBF;
- font-style: italic;
+ color: #3F5FBF;
+ font-style: italic;
}
.hl-tag {
- color: #3F7F7F;
+ color: #3F7F7F;
}
.hl-attribute {
- color: #7F007F;
+ color: #7F007F;
}
.hl-value {
- color: #2A00FF;
+ color: #2A00FF;
}
.hl-string {
- color: #2A00FF;
+ color: #2A00FF;
}
\ No newline at end of file
diff --git a/docs/src/main/docbook/css/manual-multipage.css b/docs/src/main/docbook/css/manual-multipage.css
index 0c484531..b790654b 100644
--- a/docs/src/main/docbook/css/manual-multipage.css
+++ b/docs/src/main/docbook/css/manual-multipage.css
@@ -1,7 +1,7 @@
@IMPORT url("manual.css");
body.firstpage {
- background: url("../images/background.png") no-repeat center top;
+ background: url("../images/background.png") no-repeat center top;
}
div.part h1 {
diff --git a/docs/src/main/docbook/css/manual-singlepage.css b/docs/src/main/docbook/css/manual-singlepage.css
index 4a7fd140..303192a8 100644
--- a/docs/src/main/docbook/css/manual-singlepage.css
+++ b/docs/src/main/docbook/css/manual-singlepage.css
@@ -1,6 +1,6 @@
@IMPORT url("manual.css");
body {
- background: url("../images/background.png") no-repeat center top;
+ background: url("../images/background.png") no-repeat center top;
}
diff --git a/docs/src/main/docbook/css/manual.css b/docs/src/main/docbook/css/manual.css
index 0ecbe2e8..20cf07da 100644
--- a/docs/src/main/docbook/css/manual.css
+++ b/docs/src/main/docbook/css/manual.css
@@ -1,344 +1,342 @@
@IMPORT url("highlight.css");
html {
- padding: 0pt;
- margin: 0pt;
+ padding: 0pt;
+ margin: 0pt;
}
body {
- color: #333333;
- margin: 15px 30px;
- font-family: Helvetica, Arial, Freesans, Clean, Sans-serif;
- line-height: 1.6;
- -webkit-font-smoothing: antialiased;
+ color: #333333;
+ margin: 15px 30px;
+ font-family: Helvetica, Arial, Freesans, Clean, Sans-serif;
+ line-height: 1.6;
+ -webkit-font-smoothing: antialiased;
}
code {
- font-size: 16px;
- font-family: Consolas, "Liberation Mono", Courier, monospace;
+ font-size: 16px;
+ font-family: Consolas, "Liberation Mono", Courier, monospace;
}
-:not(a)>code {
- color: #6D180B;
+:not(a) > code {
+ color: #6D180B;
}
-:not(pre)>code {
- background-color: #F2F2F2;
- border: 1px solid #CCCCCC;
- border-radius: 4px;
- padding: 1px 3px 0;
- text-shadow: none;
- white-space: nowrap;
+:not(pre) > code {
+ background-color: #F2F2F2;
+ border: 1px solid #CCCCCC;
+ border-radius: 4px;
+ padding: 1px 3px 0;
+ text-shadow: none;
+ white-space: nowrap;
}
-body>*:first-child {
- margin-top: 0 !important;
+body > *:first-child {
+ margin-top: 0 !important;
}
div {
- margin: 0pt;
+ margin: 0pt;
}
hr {
- border: 1px solid #CCCCCC;
- background: #CCCCCC;
+ border: 1px solid #CCCCCC;
+ background: #CCCCCC;
}
-h1,h2,h3,h4,h5,h6 {
- color: #000000;
- cursor: text;
- font-weight: bold;
- margin: 30px 0 10px;
- padding: 0;
+h1, h2, h3, h4, h5, h6 {
+ color: #000000;
+ cursor: text;
+ font-weight: bold;
+ margin: 30px 0 10px;
+ padding: 0;
}
-h1,h2,h3 {
- margin: 40px 0 10px;
+h1, h2, h3 {
+ margin: 40px 0 10px;
}
h1 {
- margin: 70px 0 30px;
- padding-top: 20px;
+ margin: 70px 0 30px;
+ padding-top: 20px;
}
div.part h1 {
- border-top: 1px dotted #CCCCCC;
+ border-top: 1px dotted #CCCCCC;
}
-h1,h1 code {
- font-size: 32px;
+h1, h1 code {
+ font-size: 32px;
}
-h2,h2 code {
- font-size: 24px;
+h2, h2 code {
+ font-size: 24px;
}
-h3,h3 code {
- font-size: 20px;
+h3, h3 code {
+ font-size: 20px;
}
-h4,h1 code,h5,h5 code,h6,h6 code {
- font-size: 18px;
+h4, h1 code, h5, h5 code, h6, h6 code {
+ font-size: 18px;
}
-div.book,div.chapter,div.appendix,div.part,div.preface {
- min-width: 300px;
- max-width: 1200px;
- margin: 0 auto;
+div.book, div.chapter, div.appendix, div.part, div.preface {
+ min-width: 300px;
+ max-width: 1200px;
+ margin: 0 auto;
}
p.releaseinfo {
- font-weight: bold;
- margin-bottom: 40px;
- margin-top: 40px;
+ font-weight: bold;
+ margin-bottom: 40px;
+ margin-top: 40px;
}
div.authorgroup {
- line-height: 1;
+ line-height: 1;
}
p.copyright {
- line-height: 1;
- margin-bottom: -5px;
+ line-height: 1;
+ margin-bottom: -5px;
}
.legalnotice p {
- font-style: italic;
- font-size: 14px;
- line-height: 1;
+ font-style: italic;
+ font-size: 14px;
+ line-height: 1;
}
-div.titlepage+p,div.titlepage+p {
- margin-top: 0;
+div.titlepage + p, div.titlepage + p {
+ margin-top: 0;
}
pre {
- line-height: 1.0;
- color: black;
+ line-height: 1.0;
+ color: black;
}
a {
- color: #4183C4;
- text-decoration: none;
+ color: #4183C4;
+ text-decoration: none;
}
p {
- margin: 15px 0;
- text-align: left;
+ margin: 15px 0;
+ text-align: left;
}
-ul,ol {
- padding-left: 30px;
+ul, ol {
+ padding-left: 30px;
}
li p {
- margin: 0;
+ margin: 0;
}
div.table {
- margin: 1em;
- padding: 0.5em;
- text-align: center;
+ margin: 1em;
+ padding: 0.5em;
+ text-align: center;
}
-div.table table,div.informaltable table {
- display: table;
- width: 100%;
+div.table table, div.informaltable table {
+ display: table;
+ width: 100%;
}
div.table td {
- padding-left: 7px;
- padding-right: 7px;
+ padding-left: 7px;
+ padding-right: 7px;
}
.sidebar {
- line-height: 1.4;
- padding: 0 20px;
- background-color: #F8F8F8;
- border: 1px solid #CCCCCC;
- border-radius: 3px 3px 3px 3px;
+ line-height: 1.4;
+ padding: 0 20px;
+ background-color: #F8F8F8;
+ border: 1px solid #CCCCCC;
+ border-radius: 3px 3px 3px 3px;
}
.sidebar p.title {
- color: #6D180B;
+ color: #6D180B;
}
-pre.programlisting,pre.screen {
- font-size: 15px;
- padding: 6px 10px;
- background-color: #F8F8F8;
- border: 1px solid #CCCCCC;
- border-radius: 3px 3px 3px 3px;
- clear: both;
- overflow: auto;
- line-height: 1.4;
- font-family: Consolas, "Liberation Mono", Courier, monospace;
+pre.programlisting, pre.screen {
+ font-size: 15px;
+ padding: 6px 10px;
+ background-color: #F8F8F8;
+ border: 1px solid #CCCCCC;
+ border-radius: 3px 3px 3px 3px;
+ clear: both;
+ overflow: auto;
+ line-height: 1.4;
+ font-family: Consolas, "Liberation Mono", Courier, monospace;
}
table {
- border-collapse: collapse;
- border-spacing: 0;
- border: 1px solid #DDDDDD !important;
- border-radius: 4px !important;
- border-collapse: separate !important;
- line-height: 1.6;
+ border-collapse: collapse;
+ border-spacing: 0;
+ border: 1px solid #DDDDDD !important;
+ border-radius: 4px !important;
+ border-collapse: separate !important;
+ line-height: 1.6;
}
table thead {
- background: #F5F5F5;
+ background: #F5F5F5;
}
table tr {
- border: none;
- border-bottom: none;
+ border: none;
+ border-bottom: none;
}
table th {
- font-weight: bold;
+ font-weight: bold;
}
-table th,table td {
- border: none !important;
- padding: 6px 13px;
+table th, table td {
+ border: none !important;
+ padding: 6px 13px;
}
table tr:nth-child(2n) {
- background-color: #F8F8F8;
+ background-color: #F8F8F8;
}
td p {
- margin: 0 0 15px 0;
+ margin: 0 0 15px 0;
}
div.table-contents td p {
- margin: 0;
+ margin: 0;
}
-div.important *,div.note *,div.tip *,div.warning *,div.navheader *,div.navfooter *,div.calloutlist *
- {
- border: none !important;
- background: none !important;
- margin: 0;
+div.important *, div.note *, div.tip *, div.warning *, div.navheader *, div.navfooter *, div.calloutlist * {
+ border: none !important;
+ background: none !important;
+ margin: 0;
}
-div.important p,div.note p,div.tip p,div.warning p {
- color: #6F6F6F;
- line-height: 1.6;
+div.important p, div.note p, div.tip p, div.warning p {
+ color: #6F6F6F;
+ line-height: 1.6;
}
-div.important code,div.note code,div.tip code,div.warning code {
- background-color: #F2F2F2 !important;
- border: 1px solid #CCCCCC !important;
- border-radius: 4px !important;
- padding: 1px 3px 0 !important;
- text-shadow: none !important;
- white-space: nowrap !important;
+div.important code, div.note code, div.tip code, div.warning code {
+ background-color: #F2F2F2 !important;
+ border: 1px solid #CCCCCC !important;
+ border-radius: 4px !important;
+ padding: 1px 3px 0 !important;
+ text-shadow: none !important;
+ white-space: nowrap !important;
}
-.note th,.tip th,.warning th {
- display: none;
+.note th, .tip th, .warning th {
+ display: none;
}
-.note tr:first-child td,.tip tr:first-child td,.warning tr:first-child td
- {
- border-right: 1px solid #CCCCCC !important;
- padding-top: 10px;
+.note tr:first-child td, .tip tr:first-child td, .warning tr:first-child td {
+ border-right: 1px solid #CCCCCC !important;
+ padding-top: 10px;
}
-div.calloutlist p,div.calloutlist td {
- padding: 0;
- margin: 0;
+div.calloutlist p, div.calloutlist td {
+ padding: 0;
+ margin: 0;
}
-div.calloutlist>table>tbody>tr>td:first-child {
- padding-left: 10px;
- width: 30px !important;
+div.calloutlist > table > tbody > tr > td:first-child {
+ padding-left: 10px;
+ width: 30px !important;
}
-div.important,div.note,div.tip,div.warning {
- margin-left: 0px !important;
- margin-right: 20px !important;
- margin-top: 20px;
- margin-bottom: 20px;
- padding-top: 10px;
- padding-bottom: 10px;
+div.important, div.note, div.tip, div.warning {
+ margin-left: 0px !important;
+ margin-right: 20px !important;
+ margin-top: 20px;
+ margin-bottom: 20px;
+ padding-top: 10px;
+ padding-bottom: 10px;
}
div.toc {
- line-height: 1.2;
+ line-height: 1.2;
}
-dl,dt {
- margin-top: 1px;
- margin-bottom: 0;
+dl, dt {
+ margin-top: 1px;
+ margin-bottom: 0;
}
-div.toc>dl>dt {
- font-size: 32px;
- font-weight: bold;
- margin: 30px 0 10px 0;
- display: block;
+div.toc > dl > dt {
+ font-size: 32px;
+ font-weight: bold;
+ margin: 30px 0 10px 0;
+ display: block;
}
-div.toc>dl>dd>dl>dt {
- font-size: 24px;
- font-weight: bold;
- margin: 20px 0 10px 0;
- display: block;
+div.toc > dl > dd > dl > dt {
+ font-size: 24px;
+ font-weight: bold;
+ margin: 20px 0 10px 0;
+ display: block;
}
-div.toc>dl>dd>dl>dd>dl>dt {
- font-weight: bold;
- font-size: 20px;
- margin: 10px 0 0 0;
+div.toc > dl > dd > dl > dd > dl > dt {
+ font-weight: bold;
+ font-size: 20px;
+ margin: 10px 0 0 0;
}
tbody.footnotes * {
- border: none !important;
+ border: none !important;
}
div.footnote p {
- margin: 0;
- line-height: 1;
+ margin: 0;
+ line-height: 1;
}
div.footnote p sup {
- margin-right: 6px;
- vertical-align: middle;
+ margin-right: 6px;
+ vertical-align: middle;
}
div.navheader {
- border-bottom: 1px solid #CCCCCC;
+ border-bottom: 1px solid #CCCCCC;
}
div.navfooter {
- border-top: 1px solid #CCCCCC;
+ border-top: 1px solid #CCCCCC;
}
.title {
- margin-left: -1em;
- padding-left: 1em;
+ margin-left: -1em;
+ padding-left: 1em;
}
-.title>a {
- position: absolute;
- visibility: hidden;
- display: block;
- font-size: 0.85em;
- margin-top: 0.05em;
- margin-left: -1em;
- vertical-align: text-top;
- color: black;
+.title > a {
+ position: absolute;
+ visibility: hidden;
+ display: block;
+ font-size: 0.85em;
+ margin-top: 0.05em;
+ margin-left: -1em;
+ vertical-align: text-top;
+ color: black;
}
-.title>a:before {
- content: "\00A7";
+.title > a:before {
+ content: "\00A7";
}
-.title:hover>a,.title>a:hover,.title:hover>a:hover {
- visibility: visible;
+.title:hover > a, .title > a:hover, .title:hover > a:hover {
+ visibility: visible;
}
-.title:focus>a,.title>a:focus,.title:focus>a:focus {
- outline: 0;
+.title:focus > a, .title > a:focus, .title:focus > a:focus {
+ outline: 0;
}
diff --git a/docs/src/main/docbook/xsl/common.xsl b/docs/src/main/docbook/xsl/common.xsl
index 157bf9d8..c921d3c3 100644
--- a/docs/src/main/docbook/xsl/common.xsl
+++ b/docs/src/main/docbook/xsl/common.xsl
@@ -20,10 +20,10 @@
-->
+ xmlns:xslthl="http://xslthl.sf.net"
+ xmlns:d="http://docbook.org/ns/docbook"
+ exclude-result-prefixes="xslthl d"
+ version='1.0'>
1
diff --git a/docs/src/main/docbook/xsl/epub.xsl b/docs/src/main/docbook/xsl/epub.xsl
index 031406ca..c83cbf95 100644
--- a/docs/src/main/docbook/xsl/epub.xsl
+++ b/docs/src/main/docbook/xsl/epub.xsl
@@ -20,10 +20,10 @@ under the License.
-->
+ xmlns:xslthl="http://xslthl.sf.net"
+ xmlns:d="http://docbook.org/ns/docbook"
+ exclude-result-prefixes="xslthl d"
+ version='1.0'>
diff --git a/docs/src/main/docbook/xsl/html-multipage.xsl b/docs/src/main/docbook/xsl/html-multipage.xsl
index be9cc52d..2fe13e12 100644
--- a/docs/src/main/docbook/xsl/html-multipage.xsl
+++ b/docs/src/main/docbook/xsl/html-multipage.xsl
@@ -39,12 +39,12 @@ under the License.
-
+
-
-
+
+
diff --git a/docs/src/main/docbook/xsl/html.xsl b/docs/src/main/docbook/xsl/html.xsl
index fd96f9a7..a1ac81d6 100644
--- a/docs/src/main/docbook/xsl/html.xsl
+++ b/docs/src/main/docbook/xsl/html.xsl
@@ -20,10 +20,10 @@ under the License.
-->
+ xmlns:xslthl="http://xslthl.sf.net"
+ xmlns:d="http://docbook.org/ns/docbook"
+ exclude-result-prefixes="xslthl"
+ version='1.0'>
@@ -35,7 +35,7 @@ under the License.
1
-
+
120
images/callouts/
.png
@@ -68,35 +68,51 @@ under the License.
-
+
+
+
-
+
-
+
-
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/docs/src/main/docbook/xsl/pdf.xsl b/docs/src/main/docbook/xsl/pdf.xsl
index 77360a7b..579976d2 100644
--- a/docs/src/main/docbook/xsl/pdf.xsl
+++ b/docs/src/main/docbook/xsl/pdf.xsl
@@ -69,32 +69,39 @@ under the License.
-
+
-
+
-
+
-
+
-
+
,
@@ -103,15 +110,19 @@ under the License.
-
+
-
- Copyright ©
+
+ Copyright ©
-
+
@@ -236,11 +247,13 @@ under the License.
-
+
-
+
@@ -248,11 +261,13 @@ under the License.
-
+
-
+
@@ -308,9 +323,9 @@ under the License.
Let's remove it, so this sucker can use our attribute-set only... -->
+ xsl:use-attribute-sets="chapter.titlepage.recto.style">
-
+
@@ -455,7 +470,8 @@ under the License.
-
+
normal
italic
@@ -524,7 +540,7 @@ under the License.
1.5em
-
+
10pt
bold
false
@@ -545,38 +561,51 @@ under the License.
-
+
-
-
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/docs/src/main/docbook/xsl/xslthl-config.xml b/docs/src/main/docbook/xsl/xslthl-config.xml
index e4d677fc..1dce4071 100644
--- a/docs/src/main/docbook/xsl/xslthl-config.xml
+++ b/docs/src/main/docbook/xsl/xslthl-config.xml
@@ -1,23 +1,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml b/docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml
index 5478b1d6..959434e1 100644
--- a/docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml
@@ -5,37 +5,37 @@ Syntax highlighting definition for AsciiDoc files
-->
-
- ////
- ////
-
-
- //
-
-
-
- ^(={1,6} .+)$
-
- MULTILINE
-
-
- ^(\.[^\.\s].+)$
-
- MULTILINE
-
-
- ^(:!?\w.*?:)
-
- MULTILINE
-
-
- ^(-|\*{1,5}|\d*\.{1,5})(?= .+$)
-
- MULTILINE
-
-
- ^(\[.+\])$
-
- MULTILINE
-
+
+ ////
+ ////
+
+
+ //
+
+
+
+ ^(={1,6} .+)$
+
+ MULTILINE
+
+
+ ^(\.[^\.\s].+)$
+
+ MULTILINE
+
+
+ ^(:!?\w.*?:)
+
+ MULTILINE
+
+
+ ^(-|\*{1,5}|\d*\.{1,5})(?= .+$)
+
+ MULTILINE
+
+
+ ^(\[.+\])$
+
+ MULTILINE
+
diff --git a/docs/src/main/docbook/xsl/xslthl/bourne-hl.xml b/docs/src/main/docbook/xsl/xslthl/bourne-hl.xml
index e2cd98d8..518fdb86 100644
--- a/docs/src/main/docbook/xsl/xslthl/bourne-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/bourne-hl.xml
@@ -31,8 +31,8 @@ freely, subject to the following restrictions:
'
"
-
-
-
+
+
"
@@ -41,16 +41,16 @@ freely, subject to the following restrictions:
'
\
-
+
0x
-
+
.
-
-
+
+
diff --git a/docs/src/main/docbook/xsl/xslthl/c-hl.xml b/docs/src/main/docbook/xsl/xslthl/c-hl.xml
index 176cc379..0c994db7 100644
--- a/docs/src/main/docbook/xsl/xslthl/c-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/c-hl.xml
@@ -46,7 +46,7 @@ Michiel Hendriks
#
\
-
+
"
@@ -62,18 +62,18 @@ Michiel Hendriks
lu
u
l
-
+
.
-
+
e
ul
lu
u
f
l
-
+
auto
diff --git a/docs/src/main/docbook/xsl/xslthl/cpp-hl.xml b/docs/src/main/docbook/xsl/xslthl/cpp-hl.xml
index ef83c4f5..a9f7d0de 100644
--- a/docs/src/main/docbook/xsl/xslthl/cpp-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/cpp-hl.xml
@@ -64,18 +64,18 @@ Michiel Hendriks
lu
u
l
-
+
.
-
+
e
ul
lu
u
f
l
-
+
diff --git a/docs/src/main/docbook/xsl/xslthl/csharp-hl.xml b/docs/src/main/docbook/xsl/xslthl/csharp-hl.xml
index d57e6310..e21a1258 100644
--- a/docs/src/main/docbook/xsl/xslthl/csharp-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/csharp-hl.xml
@@ -62,7 +62,7 @@ Michiel Hendriks
@"
"
\
-
+
"
@@ -78,11 +78,11 @@ Michiel Hendriks
lu
u
l
-
+
.
-
+
e
ul
lu
@@ -91,7 +91,7 @@ Michiel Hendriks
d
m
l
-
+
abstract
diff --git a/docs/src/main/docbook/xsl/xslthl/css-hl.xml b/docs/src/main/docbook/xsl/xslthl/css-hl.xml
index 164c48c3..e5a14286 100644
--- a/docs/src/main/docbook/xsl/xslthl/css-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/css-hl.xml
@@ -30,147 +30,147 @@ Reference: http://www.w3.org/TR/CSS21/propidx.html
-->
-
- /*
- */
-
-
+
+ /*
+ */
+
+
"
- \
-
-
-
+ \
+
+
+
'
\
-
-
-
- .
-
-
-
- @charset
- @import
- @media
- @page
-
-
-
- -
- azimuth
- background-attachment
- background-color
- background-image
- background-position
- background-repeat
- background
- border-collapse
- border-color
- border-spacing
- border-style
- border-top
- border-right
- border-bottom
- border-left
- border-top-color
- border-right-color
- border-bottom-color
- border-left-color
- border-top-style
- border-right-style
- border-bottom-style
- border-left-style
- border-top-width
- border-right-width
- border-bottom-width
- border-left-width
- border-width
- border
- bottom
- caption-side
- clear
- clip
- color
- content
- counter-increment
- counter-reset
- cue-after
- cue-before
- cue
- cursor
- direction
- display
- elevation
- empty-cells
- float
- font-family
- font-size
- font-style
- font-variant
- font-weight
- font
- height
- left
- letter-spacing
- line-height
- list-style-image
- list-style-position
- list-style-type
- list-style
- margin-right
- margin-left
- margin-top
- margin-bottom
- margin
- max-height
- max-width
- min-height
- min-width
- orphans
- outline-color
- outline-style
- outline-width
- outline
- overflow
- padding-top
- padding-right
- padding-bottom
- padding-left
- padding
- page-break-after
- page-break-before
- page-break-inside
- pause-after
- pause-before
- pause
- pitch-range
- pitch
- play-during
- position
- quotes
- richness
- right
- speak-header
- speak-numeral
- speak-punctuation
- speak
- speech-rate
- stress
- table-layout
- text-align
- text-decoration
- text-indent
- text-transform
- top
- unicode-bidi
- vertical-align
- visibility
- voice-family
- volume
- white-space
- widows
- width
- word-spacing
- z-index
-
+
+
+
+ .
+
+
+
+ @charset
+ @import
+ @media
+ @page
+
+
+
+ -
+ azimuth
+ background-attachment
+ background-color
+ background-image
+ background-position
+ background-repeat
+ background
+ border-collapse
+ border-color
+ border-spacing
+ border-style
+ border-top
+ border-right
+ border-bottom
+ border-left
+ border-top-color
+ border-right-color
+ border-bottom-color
+ border-left-color
+ border-top-style
+ border-right-style
+ border-bottom-style
+ border-left-style
+ border-top-width
+ border-right-width
+ border-bottom-width
+ border-left-width
+ border-width
+ border
+ bottom
+ caption-side
+ clear
+ clip
+ color
+ content
+ counter-increment
+ counter-reset
+ cue-after
+ cue-before
+ cue
+ cursor
+ direction
+ display
+ elevation
+ empty-cells
+ float
+ font-family
+ font-size
+ font-style
+ font-variant
+ font-weight
+ font
+ height
+ left
+ letter-spacing
+ line-height
+ list-style-image
+ list-style-position
+ list-style-type
+ list-style
+ margin-right
+ margin-left
+ margin-top
+ margin-bottom
+ margin
+ max-height
+ max-width
+ min-height
+ min-width
+ orphans
+ outline-color
+ outline-style
+ outline-width
+ outline
+ overflow
+ padding-top
+ padding-right
+ padding-bottom
+ padding-left
+ padding
+ page-break-after
+ page-break-before
+ page-break-inside
+ pause-after
+ pause-before
+ pause
+ pitch-range
+ pitch
+ play-during
+ position
+ quotes
+ richness
+ right
+ speak-header
+ speak-numeral
+ speak-punctuation
+ speak
+ speech-rate
+ stress
+ table-layout
+ text-align
+ text-decoration
+ text-indent
+ text-transform
+ top
+ unicode-bidi
+ vertical-align
+ visibility
+ voice-family
+ volume
+ white-space
+ widows
+ width
+ word-spacing
+ z-index
+
diff --git a/docs/src/main/docbook/xsl/xslthl/html-hl.xml b/docs/src/main/docbook/xsl/xslthl/html-hl.xml
index 5b6761ba..fd48f118 100644
--- a/docs/src/main/docbook/xsl/xslthl/html-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/html-hl.xml
@@ -10,113 +10,113 @@
This file has been customized for the Asciidoctor project (http://asciidoctor.org).
-->
-
-
-
- a
- abbr
- address
- area
- article
- aside
- audio
- b
- base
- bdi
- blockquote
- body
- br
- button
- caption
- canvas
- cite
- code
- command
- col
- colgroup
- dd
- del
- dialog
- div
- dl
- dt
- em
- embed
- fieldset
- figcaption
- figure
- font
- form
- footer
- h1
- h2
- h3
- h4
- h5
- h6
- head
- header
- hr
- html
- i
- iframe
- img
- input
- ins
- kbd
- label
- legend
- li
- link
- map
- mark
- menu
- menu
- meta
- nav
- noscript
- object
- ol
- optgroup
- option
- p
- param
- pre
- q
- samp
- script
- section
- select
- small
- source
- span
- strong
- style
- sub
- summary
- sup
- table
- tbody
- td
- textarea
- tfoot
- th
- thead
- time
- title
- tr
- track
- u
- ul
- var
- video
- wbr
- xmp
-
-
-
-
- xsl:
-
-
+
+
+
+ a
+ abbr
+ address
+ area
+ article
+ aside
+ audio
+ b
+ base
+ bdi
+ blockquote
+ body
+ br
+ button
+ caption
+ canvas
+ cite
+ code
+ command
+ col
+ colgroup
+ dd
+ del
+ dialog
+ div
+ dl
+ dt
+ em
+ embed
+ fieldset
+ figcaption
+ figure
+ font
+ form
+ footer
+ h1
+ h2
+ h3
+ h4
+ h5
+ h6
+ head
+ header
+ hr
+ html
+ i
+ iframe
+ img
+ input
+ ins
+ kbd
+ label
+ legend
+ li
+ link
+ map
+ mark
+ menu
+ menu
+ meta
+ nav
+ noscript
+ object
+ ol
+ optgroup
+ option
+ p
+ param
+ pre
+ q
+ samp
+ script
+ section
+ select
+ small
+ source
+ span
+ strong
+ style
+ sub
+ summary
+ sup
+ table
+ tbody
+ td
+ textarea
+ tfoot
+ th
+ thead
+ time
+ title
+ tr
+ track
+ u
+ ul
+ var
+ video
+ wbr
+ xmp
+
+
+
+
+ xsl:
+
+
diff --git a/docs/src/main/docbook/xsl/xslthl/java-hl.xml b/docs/src/main/docbook/xsl/xslthl/java-hl.xml
index f7bb1641..96ef3da7 100644
--- a/docs/src/main/docbook/xsl/xslthl/java-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/java-hl.xml
@@ -54,7 +54,7 @@ Michiel Hendriks
0x
-
+
.
@@ -62,7 +62,7 @@ Michiel Hendriks
f
d
l
-
+
abstract
diff --git a/docs/src/main/docbook/xsl/xslthl/javascript-hl.xml b/docs/src/main/docbook/xsl/xslthl/javascript-hl.xml
index 99b8a71e..f74807f3 100644
--- a/docs/src/main/docbook/xsl/xslthl/javascript-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/javascript-hl.xml
@@ -44,12 +44,12 @@ Michiel Hendriks
0x
-
+
.
e
-
+
break
diff --git a/docs/src/main/docbook/xsl/xslthl/json-hl.xml b/docs/src/main/docbook/xsl/xslthl/json-hl.xml
index 59b9c481..c13923c2 100644
--- a/docs/src/main/docbook/xsl/xslthl/json-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/json-hl.xml
@@ -20,7 +20,7 @@
f
d
l
-
+
true
diff --git a/docs/src/main/docbook/xsl/xslthl/perl-hl.xml b/docs/src/main/docbook/xsl/xslthl/perl-hl.xml
index 73d71cc0..adf7b094 100644
--- a/docs/src/main/docbook/xsl/xslthl/perl-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/perl-hl.xml
@@ -47,12 +47,12 @@ Michiel Hendriks
0x
-
+
.
-
-
+
+
if
diff --git a/docs/src/main/docbook/xsl/xslthl/php-hl.xml b/docs/src/main/docbook/xsl/xslthl/php-hl.xml
index 1da25b8c..1060ae4d 100644
--- a/docs/src/main/docbook/xsl/xslthl/php-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/php-hl.xml
@@ -47,24 +47,24 @@ Michiel Hendriks
"
\
-
+
'
\
-
+
<<<
0x
-
+
.
e
-
+
and
@@ -142,7 +142,7 @@ Michiel Hendriks
__NAMESPACE__
goto
__DIR__
-
+
diff --git a/docs/src/main/docbook/xsl/xslthl/python-hl.xml b/docs/src/main/docbook/xsl/xslthl/python-hl.xml
index a4674432..fd6db57b 100644
--- a/docs/src/main/docbook/xsl/xslthl/python-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/python-hl.xml
@@ -38,11 +38,11 @@ Michiel Hendriks
#
"""
-
+
'''
-
+
"
@@ -55,14 +55,14 @@ Michiel Hendriks
0x
l
-
+
.
-
+
e
l
-
+
and
diff --git a/docs/src/main/docbook/xsl/xslthl/ruby-hl.xml b/docs/src/main/docbook/xsl/xslthl/ruby-hl.xml
index d105640e..5bf3473d 100644
--- a/docs/src/main/docbook/xsl/xslthl/ruby-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/ruby-hl.xml
@@ -59,12 +59,12 @@ Michiel Hendriks
0x
-
+
.
e
-
+
alias
diff --git a/docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml b/docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml
index ac1d5d04..bb561c64 100644
--- a/docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml
@@ -32,36 +32,36 @@ freely, subject to the following restrictions:
'
-
+
U'
'
-
+
B'
'
-
+
N'
'
-
+
X'
'
-
+
.
-
+
e
-
+
-
+
A
ABS
diff --git a/docs/src/main/docbook/xsl/xslthl/yaml-hl.xml b/docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
index a28008ec..e678bad6 100644
--- a/docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
+++ b/docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
@@ -20,7 +20,7 @@
f
d
l
-
+
true
diff --git a/pom.xml b/pom.xml
index 226ef692..66232513 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
-
4.0.0
org.springframework.cloud
@@ -7,7 +8,9 @@
2.1.3.BUILD-SNAPSHOT
pom
Spring Cloud Parent
- Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects
+ Spring Cloud parent pom, managing plugins and dependencies for Spring
+ Cloud projects
+
docs
spring-cloud-build-dependencies
@@ -17,7 +20,8 @@
https://spring.io/spring-cloud
1.8
- @
+ @
+
UTF-8
UTF-8
${java.version}
@@ -31,7 +35,8 @@
jacoco
reuseReports
- ${project.basedir}/../target/jacoco.exec
+ ${project.basedir}/../target/jacoco.exec
+
java
@@ -68,9 +73,14 @@
false
- master
- https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/${spring-cloud-build-checkstyle.branch}/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
- ${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle-suppressions.xml
+ master
+
+
+ https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/${spring-cloud-build-checkstyle.branch}/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
+
+
+ ${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle-suppressions.xml
+
@@ -92,28 +102,31 @@
Apache License, Version 2.0
https://www.apache.org/licenses/LICENSE-2.0
-Copyright 2014-2015 the original author or authors.
+ Copyright 2014-2015 the original author or authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+ See the License for the specific language governing permissions and
+ limitations under the License.
https://github.com/spring-cloud/spring-cloud-build
- scm:git:git://github.com/spring-cloud/spring-cloud-build.git
- scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git
+ scm:git:git://github.com/spring-cloud/spring-cloud-build.git
+
+
+ scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git
+
HEAD
@@ -252,7 +265,8 @@ limitations under the License.
${start-class}
- true
+ true
+
@@ -285,7 +299,8 @@ limitations under the License.
${start-class}
- true
+ true
+
@@ -356,14 +371,21 @@ limitations under the License.
${disable.checks}
checkstyle.xml
checkstyle-header.txt
- checkstyle.build.directory=${project.build.directory}
+
+ checkstyle.build.directory=${project.build.directory}
checkstyle.suppressions.file=${checkstyle.suppressions.file}
- checkstyle.additional.suppressions.file=${checkstyle.additional.suppressions.file}
+ checkstyle.additional.suppressions.file=${checkstyle.additional.suppressions.file}
+
true
- ${maven-checkstyle-plugin.includeTestSourceDirectory}
- ${maven-checkstyle-plugin.failsOnError}
- ${maven-checkstyle-plugin.failOnViolation}
+
+ ${maven-checkstyle-plugin.includeTestSourceDirectory}
+
+ ${maven-checkstyle-plugin.failsOnError}
+
+
+ ${maven-checkstyle-plugin.failOnViolation}
+
check
@@ -386,7 +408,9 @@ limitations under the License.
true
yyyy-MM-dd'T'HH:mm:ssZ
true
- ${project.build.outputDirectory}/git.properties
+
+ ${project.build.outputDirectory}/git.properties
+
@@ -418,7 +442,8 @@ limitations under the License.
- true
+ true
+
true
@@ -439,17 +464,22 @@ limitations under the License.
-
+
META-INF/spring.handlers
-
+
META-INF/spring.factories
-
+
META-INF/spring.schemas
-
-
+
+
${start-class}
@@ -514,7 +544,9 @@ limitations under the License.
https://github.com/spring-cloud
spring-docs
- scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
+
+ scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
+
sonatype-nexus-staging
@@ -605,7 +637,9 @@ limitations under the License.
bintray
Jcenter Repository
- https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
+
+ https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
+
@@ -715,13 +749,17 @@ limitations under the License.
- org.springframework.cloud
- spring-cloud-build-docs
- ${spring-cloud-build.version}
+ org.springframework.cloud
+
+ spring-cloud-build-docs
+
+ ${spring-cloud-build.version}
+
sources
jar
false
- ${docs.resources.dir}
+ ${docs.resources.dir}
+
@@ -747,13 +785,17 @@ limitations under the License.
process-asciidoc
- ${docs.main}.adoc
+ ${docs.main}.adoc
+
docbook5
book
true
- ${spring-boot.version}
- ${project.version}
+
+ ${spring-boot.version}
+
+ ${project.version}
+
true
unsafe
@@ -766,16 +808,21 @@ limitations under the License.
process-asciidoc
- ${docs.main}.adoc
- ${basedir}/target/generated-index/
+ ${docs.main}.adoc
+
+
+ ${basedir}/target/generated-index/
+
html
article
true
- ${project.version}
+ ${project.version}
+
true
unsafe
- prettify
+ prettify
+
${docs.main}
@@ -787,14 +834,19 @@ limitations under the License.
docbkx-maven-plugin
${docbkx-maven-plugin.version}
- ${basedir}/target/generated-docs
+ ${basedir}/target/generated-docs
+
${docs.main}.xml
true
false
- ${docs.resources.dir}/docbook/xsl/pdf.xsl
+
+ ${docs.resources.dir}/docbook/xsl/pdf.xsl
+
1
1
- ${docs.resources.dir}/docbook/xsl/xslthl-config.xml
+
+ ${docs.resources.dir}/docbook/xsl/xslthl-config.xml
+
@@ -819,20 +871,26 @@ limitations under the License.
prepare-package
- ${docs.resources.dir}/docbook/xsl/html-singlepage.xsl
- ${basedir}/target/docbook/htmlsingle
+
+ ${docs.resources.dir}/docbook/xsl/html-singlepage.xsl
+
+
+ ${basedir}/target/docbook/htmlsingle
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
@@ -845,23 +903,29 @@ limitations under the License.
prepare-package
- ${docs.resources.dir}/docbook/xsl/html-multipage.xsl
- ${basedir}/target/docbook/html
+
+ ${docs.resources.dir}/docbook/xsl/html-multipage.xsl
+
+ ${basedir}/target/docbook/html
+
- multi_
+ multi_
+
true
-
-
+
+
-
-
-
-
-
+
+
+
+
+
@@ -921,7 +985,8 @@ limitations under the License.
-
+
@@ -938,10 +1003,13 @@ limitations under the License.
-
+
-
-
+
+
@@ -955,19 +1023,21 @@ limitations under the License.
-:nofooter:
-:linkcss:
-:stylesdir: css
-:stylesheet: manual-singlepage.css
+ :nofooter:
+ :linkcss:
+ :stylesdir: css
+ :stylesheet: manual-singlepage.css
-= {docs-main}
+ = {docs-main}
-{spring-cloud-version}
+ {spring-cloud-version}
-== Pick The Documentation Option
+ == Pick The Documentation Option
-- link:single/{docs-main}.html[Single HTML]
-- link:multi/multi_{docs-main}.html[Multi HTML]
+ - link:single/{docs-main}.html[Single
+ HTML]
+ - link:multi/multi_{docs-main}.html[Multi
+ HTML]
@@ -981,10 +1051,12 @@ limitations under the License.
-
+
-
+
@@ -997,12 +1069,16 @@ limitations under the License.
-
+
-
+
@@ -1017,27 +1093,43 @@ limitations under the License.
true
-
-
-
+
+
+
+ override="true"
+ input="${version-type}"
+ regexp=".*\.(.*)"
+ replace="\1"/>
+ override="true"
+ input="${version-type}"
+ regexp="(M)\d+"
+ replace="MILESTONE"/>
+ override="true"
+ input="${version-type}"
+ regexp="(RC)\d+"
+ replace="MILESTONE"/>
-
+ override="true"
+ input="${version-type}"
+ regexp="BUILD-(.*)"
+ replace="SNAPSHOT"/>
+
-
-
+
+
@@ -1059,9 +1151,11 @@ limitations under the License.
docs
- https://repo.spring.io
+ https://repo.spring.io
+
libs-release-local
- libs-snapshots-local
+ libs-snapshots-local
+
diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml
index ce19d729..ee7d7ff9 100644
--- a/spring-cloud-build-dependencies/pom.xml
+++ b/spring-cloud-build-dependencies/pom.xml
@@ -1,6 +1,6 @@
-
4.0.0
org.springframework.cloud
@@ -8,7 +8,9 @@
2.1.3.BUILD-SNAPSHOT
spring-cloud-build-dependencies
pom
- Spring Cloud Build Dependencies: an internal BOM for use with Spring Cloud projects. Use as a BOM or by inheriting from the spring-cloud build parent.
+ Spring Cloud Build Dependencies: an internal BOM for use with Spring
+ Cloud projects. Use as a BOM or by inheriting from the spring-cloud build parent.
+
org.springframework.boot
spring-boot-dependencies
@@ -38,8 +40,9 @@
https://github.com/spring-cloud
spring-docs
- scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
-
+
+ scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
+
repo.spring.io
@@ -69,7 +72,9 @@
bintray
Jcenter Repository
- https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
+
+ https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
+
@@ -84,7 +89,8 @@
sonatype-nexus-staging
Nexus Release Repository
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
+ https://oss.sonatype.org/service/local/staging/deploy/maven2/
+
diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml
index e526261f..877e78b7 100644
--- a/spring-cloud-build-tools/pom.xml
+++ b/spring-cloud-build-tools/pom.xml
@@ -1,6 +1,6 @@
-
4.0.0
org.springframework.cloud
@@ -20,5 +20,5 @@
${puppycrawl-tools-checkstyle.version}
-
+
diff --git a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
index 4fb1ace5..2c620df6 100644
--- a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
+++ b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
@@ -3,12 +3,13 @@
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle.xml b/spring-cloud-build-tools/src/main/resources/checkstyle.xml
index 5803182f..6ebcc0d9 100644
--- a/spring-cloud-build-tools/src/main/resources/checkstyle.xml
+++ b/spring-cloud-build-tools/src/main/resources/checkstyle.xml
@@ -17,8 +17,8 @@
-
-
+
+
@@ -33,7 +33,7 @@
-
+
@@ -45,75 +45,75 @@
-
+
-
-
+
+
+ value="false"/>
-
+
-
+
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
@@ -122,42 +122,44 @@
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+ value="Line has leading space characters; indentation should be performed with tabs only."/>
+
-
+
-
+ value="Please use AssertJ imports."/>
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml b/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml
index 37a8e928..e9627181 100644
--- a/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml
+++ b/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml
@@ -1,6 +1,7 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml b/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml
index 9bbee5a9..f89b19a8 100644
--- a/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml
+++ b/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml
@@ -1,85 +1,87 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-cloud-dependencies-parent/eclipse-code-formatter.xml b/spring-cloud-dependencies-parent/eclipse-code-formatter.xml
index b6057671..a0902cc8 100644
--- a/spring-cloud-dependencies-parent/eclipse-code-formatter.xml
+++ b/spring-cloud-dependencies-parent/eclipse-code-formatter.xml
@@ -1,296 +1,755 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml
index 434389e6..e4768341 100644
--- a/spring-cloud-dependencies-parent/pom.xml
+++ b/spring-cloud-dependencies-parent/pom.xml
@@ -1,6 +1,7 @@
-
+
4.0.0
org.springframework.cloud
2.1.3.BUILD-SNAPSHOT
@@ -18,28 +19,31 @@
Apache License, Version 2.0
https://www.apache.org/licenses/LICENSE-2.0
-Copyright 2014-2015 the original author or authors.
+ Copyright 2014-2015 the original author or authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+ See the License for the specific language governing permissions and
+ limitations under the License.
https://github.com/spring-cloud/spring-cloud-build
- scm:git:git://github.com/spring-cloud/spring-cloud-build.git
- scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git
+ scm:git:git://github.com/spring-cloud/spring-cloud-build.git
+
+
+ scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git
+
HEAD
@@ -71,8 +75,9 @@ limitations under the License.
https://github.com/spring-cloud
spring-docs
- scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
-
+
+ scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
+
repo.spring.io
@@ -102,7 +107,9 @@ limitations under the License.
bintray
Jcenter Repository
- https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
+
+ https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
+
@@ -117,7 +124,8 @@ limitations under the License.
sonatype-nexus-staging
Nexus Release Repository
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
+ https://oss.sonatype.org/service/local/staging/deploy/maven2/
+