Merge branch 'master' of github.com:micronaut-projects/micronaut-core

Author: graemerocher

build.gradle

@@ -416,6 +416,8 @@ subprojects { Project subproject ->
     }
 
     task replaceAtLink(dependsOn: moveConfigProps) {
+        group 'documentation'
+
         doLast {
             File file = new File("${rootProject.buildDir}/config-props/${subproject.name}-config-properties.adoc")
             if ( file.exists()) {
@@ -441,6 +443,8 @@ subprojects { Project subproject ->
         }
     }
     task createDocsGeneratedFolders {
+        group 'documentation'
+
         doLast {
             if(!new File("${rootProject.buildDir}/generated").exists()) {
                 new File("${rootProject.buildDir}/generated").mkdir()
@@ -484,8 +488,6 @@ subprojects { Project subproject ->
         }
     }
 
-    jar.dependsOn(processConfigProps)
-
     groovydoc {
         classpath += project.configurations.documentation
     }

gradle/docs.gradle

@@ -115,10 +115,8 @@ task mergeConfigProps(dependsOn: createDocsGeneratedFolders) {
     }
 }
 
-mergeConfigProps.mustRunAfter cleanupPropertyReference
-
 task publishConfigurationReference(type: Copy) {
-    dependsOn cleanupPropertyReference, mergeConfigProps
+    dependsOn mergeConfigProps, cleanupPropertyReference
     ext {
         destinationFileName = "configurationreference.html"
         inputFileName = "${rootProject.buildDir}/generated/propertyReference.adoc"

travis-build.sh

@@ -34,10 +34,9 @@ if [[ $EXIT_STATUS -eq 0 ]]; then
       fi
 
       ./gradlew --stop
-      ./gradlew --console=plain --no-daemon clean  || EXIT_STATUS=$?
       ./gradlew --console=plain --no-daemon assemble  || EXIT_STATUS=$?
+      ./gradlew --console=plain --no-daemon processConfigProps  || EXIT_STATUS=$?
       ./gradlew --console=plain --no-daemon docs  || EXIT_STATUS=$?
-      ./gradlew --console=plain --no-daemon mergeConfigProp  || EXIT_STATUS=$?
       ./gradlew --console=plain --no-daemon publishConfigurationReference  || EXIT_STATUS=$?
 
       git clone https://${GH_TOKEN}@github.com/micronaut-projects/micronaut-docs.git -b gh-pages gh-pages --single-branch > /dev/null