Merge branch 'master' of https://github.com/joinfaces/joinfaces into …

…update/gradle/6.1.1

.github/workflows/gradle-wrapper-validation.yml

@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1

build.gradle

@@ -30,6 +30,7 @@ allprojects {
 
     repositories {
         mavenCentral()
+        maven { url "https://repo.spring.io/milestone" }
     }
 
     apply plugin: "io.spring.dependency-management"

buildSrc/build.gradle

@@ -2,11 +2,14 @@ apply plugin: "java"
 
 repositories {
     mavenCentral()
+    maven { url "https://repo.spring.io/milestone" }
 }
 
-def springBootVersion = "2.2.4.RELEASE"
+def springBootVersion = "2.3.0.M2"
 
 dependencies {
     compile "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
     implementation "org.springframework.boot:spring-boot-configuration-metadata:$springBootVersion"
+
+    compile 'org.apache.maven:maven-model:3.6.3'
 }

buildSrc/src/main/java/org/joinfaces/build/BomDocumentation.java

@@ -21,10 +21,10 @@
 import java.io.PrintWriter;
 import java.util.Comparator;
 
-import io.spring.gradle.dependencymanagement.org.apache.maven.model.Dependency;
-import io.spring.gradle.dependencymanagement.org.apache.maven.model.Model;
-import io.spring.gradle.dependencymanagement.org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import io.spring.gradle.dependencymanagement.org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.codehaus.groovy.runtime.ResourceGroovyMethods;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.RegularFileProperty;

buildSrc/src/main/java/org/joinfaces/build/PropertyDocumentation.java

@@ -35,7 +35,6 @@
 import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepository;
 import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepositoryJsonBuilder;
 import org.springframework.boot.configurationmetadata.ConfigurationMetadataSource;
-import org.springframework.util.StringUtils;
 
 /**
  * @author Lars Grefer
@@ -69,7 +68,7 @@ public void generatePropertyDocumentation() throws IOException {
 						group.getSources().values()
 								.stream()
 								.map(ConfigurationMetadataSource::getShortDescription)
-								.filter(StringUtils::hasText)
+								.filter(s -> s != null && !s.isEmpty())
 								.forEach(d -> writer.printf("# %s\n", d));
 
 						group.getProperties().values().stream()

joinfaces-tools/joinfaces-gradle-plugin/build.gradle

@@ -49,6 +49,7 @@ dependencies {
     compile project(":joinfaces-tools:joinfaces-scan-tools")
 
     compile "org.springframework.boot:spring-boot-gradle-plugin:${SpringBootPlugin.SPRING_BOOT_VERSION}"
+    compile "io.spring.gradle:dependency-management-plugin"
 }
 
 publishing {