From 8882c532cdeb462e087672798212af0fe807e892 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 6 Sep 2019 12:40:52 +0100 Subject: [PATCH] Correct attribute references in reference documentation Fixes gh-18163 --- spring-boot-project/spring-boot-docs/pom.xml | 1 + .../main/asciidoc/appendix-application-properties.adoc | 10 +++++----- .../spring-boot-docs/src/main/asciidoc/howto.adoc | 2 +- .../groovy/generateAutoConfigurationClassTables.groovy | 4 ++-- .../src/main/groovy/generateStarterTables.groovy | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/pom.xml b/spring-boot-project/spring-boot-docs/pom.xml index 5361677f77..ac42e49b86 100644 --- a/spring-boot-project/spring-boot-docs/pom.xml +++ b/spring-boot-project/spring-boot-docs/pom.xml @@ -1290,6 +1290,7 @@ book true + warn ${spring-boot-artifactory-repo} ${github-tag} ${jooq.version} diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 1511afcb8b..9b6bf1de90 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -261,9 +261,9 @@ Rather, pick only the properties that you need. 192\\.168\\.\\d{1,3}\\.\\d{1,3}|\\ 169\\.254\\.\\d{1,3}\\.\\d{1,3}|\\ 127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|\\ - 172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|\\ - 172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|\\ - 172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}\\ + 172\\.1[6-9]\{1}\\.\\d{1,3}\\.\\d{1,3}|\\ + 172\\.2[0-9]\{1}\\.\\d{1,3}\\.\\d{1,3}|\\ + 172\\.3[0-1]\{1}\\.\\d{1,3}\\.\\d{1,3}\\ 0:0:0:0:0:0:0:1\\ ::1 # Regular expression that matches proxies that are to be trusted. server.tomcat.max-connections=10000 # Maximum number of connections that the server accepts and processes at any given time. @@ -565,7 +565,7 @@ Rather, pick only the properties that you need. spring.flyway.ignore-pending-migrations=false # Whether to ignore pending migrations when reading the schema history table. spring.flyway.init-sqls= # SQL statements to execute to initialize a connection immediately after obtaining it. spring.flyway.installed-by= # Username recorded in the schema history table as having applied the migration. - spring.flyway.locations=classpath:db/migration # Locations of migrations scripts. Can contain the special "{vendor}" placeholder to use vendor-specific locations. + spring.flyway.locations=classpath:db/migration # Locations of migrations scripts. Can contain the special "\{vendor}" placeholder to use vendor-specific locations. spring.flyway.mixed=false # Whether to allow mixing transactional and non-transactional statements within the same migration. spring.flyway.out-of-order=false # Whether to allow migrations to be run out of order. spring.flyway.password= # Login password of the database to migrate. @@ -730,7 +730,7 @@ Rather, pick only the properties that you need. spring.datasource.jndi-name= # JNDI location of the datasource. Class, url, username & password are ignored when set. spring.datasource.name= # Name of the datasource. Default to "testdb" when using an embedded database. spring.datasource.password= # Login password of the database. - spring.datasource.platform=all # Platform to use in the DDL or DML scripts (such as schema-${platform}.sql or data-${platform}.sql). + spring.datasource.platform=all # Platform to use in the DDL or DML scripts (such as schema-$\{platform}.sql or data-$\{platform}.sql). spring.datasource.schema= # Schema (DDL) script resource references. spring.datasource.schema-username= # Username of the database to execute DDL scripts (if different). spring.datasource.schema-password= # Password of the database to execute DDL scripts (if different). diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc index 48a33ac2dd..58fd467043 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -1962,7 +1962,7 @@ Assume the following: [source,properties,indent=0] ---- - spring.flyway.locations=classpath:db/migration/\{vendor} + spring.flyway.locations=classpath:db/migration/{vendor} ---- Rather than using `db/migration`, the preceding configuration sets the folder to use according to the type of the database (such as `db/migration/mysql` for MySQL). diff --git a/spring-boot-project/spring-boot-docs/src/main/groovy/generateAutoConfigurationClassTables.groovy b/spring-boot-project/spring-boot-docs/src/main/groovy/generateAutoConfigurationClassTables.groovy index 9c34fc42b1..573be49be5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/groovy/generateAutoConfigurationClassTables.groovy +++ b/spring-boot-project/spring-boot-docs/src/main/groovy/generateAutoConfigurationClassTables.groovy @@ -14,8 +14,8 @@ def generateAutoConfigurationClassTable(String module, File factories, PrintWrit getAutoConfigurationClasses(factories).each { writer.println '' - writer.println "| {github-code}/spring-boot-project/$module/src/main/java/$it.path.{sc-ext}[`$it.name`]" - writer.println "| {dc-root}/$it.path.{dc-ext}[javadoc]" + writer.println "| {spring-boot-code}/spring-boot-project/$module/src/main/java/{$it.path}.java[`$it.name`]" + writer.println "| {spring-boot-api}/{$it.path}.html[javadoc]" } writer.println '|===' diff --git a/spring-boot-project/spring-boot-docs/src/main/groovy/generateStarterTables.groovy b/spring-boot-project/spring-boot-docs/src/main/groovy/generateStarterTables.groovy index 82bfe34e3c..b1c7d9a4ac 100644 --- a/spring-boot-project/spring-boot-docs/src/main/groovy/generateStarterTables.groovy +++ b/spring-boot-project/spring-boot-docs/src/main/groovy/generateStarterTables.groovy @@ -11,7 +11,7 @@ def getStarters(File dir) { 'name': name, 'description': postProcessDescription(pom.description.text()), 'dependencies': dependencies, - 'pomUrl': "{github-code}/spring-boot-project/spring-boot-starters/$name/pom.xml" + 'pomUrl': "{spring-boot-code}/spring-boot-project/spring-boot-starters/$name/pom.xml" ] } }