Merge branch 'chore/2688/upgrade-dependencies'

dilipkrish · dilipkrish · commit 17fd865d867d · 2018-09-16T08:18:22.000-05:00
resolves springfox#2688
diff --git a/build.gradle b/build.gradle
@@ -12,10 +12,11 @@ buildscript {
     classpath "com.github.adrianbk:gradle-travisci-trigger-plugin:1.0.0"
     classpath 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.2'
     classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
-    classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2"
-    classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.4"
-    classpath "org.asciidoctor:asciidoctor-gradle-plugin:1.5.7"
+    classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
+    classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5"
+    classpath "org.asciidoctor:asciidoctor-gradle-plugin:1.5.8.1"
     classpath "org.ajoberstar:gradle-git:1.7.2"
+    classpath 'org.ajoberstar:gradle-git-publish:1.0.1'
   }
 }
 
@@ -90,7 +91,7 @@ subprojects {
   jacoco {
     toolVersion = "$jacocoVersion"
   }
-  
+
   jacocoTestReport {
     reports {
       xml.enabled true
@@ -105,8 +106,8 @@ subprojects {
 
 apply from: "$rootDir/gradle/documentation.gradle"
 
-task wrapper(type: Wrapper) {
-  gradleVersion = '4.4.1'
+wrapper {
+  gradleVersion = '4.10.1'
 }
 
 task codeCoverageReport(type: JacocoReport) {
@@ -120,7 +121,7 @@ task codeCoverageReport(type: JacocoReport) {
 
   reports {
     xml.enabled true
-    xml.destination "${buildDir}/reports/jacoco/report.xml"
+    xml.destination file("${buildDir}/reports/jacoco/report.xml")
     html.enabled false
     csv.enabled false
   }
diff --git a/buildSrc/src/main/groovy/springfox/gradlebuild/plugins/MultiProjectReleasePlugin.groovy b/buildSrc/src/main/groovy/springfox/gradlebuild/plugins/MultiProjectReleasePlugin.groovy
@@ -65,15 +65,15 @@ class MultiProjectReleasePlugin implements Plugin<Project> {
     showPublishInfo = project.task('showPublishInfo') {
       group = 'Help'
       description = 'Show project publishing information'
+      doLast {
+        project.logger.lifecycle "[RELEASE] Project version: $project.version, $versioningInfo"
+      }
     }
 
     configureVersion(project, versioningInfo)
     configureGlobalTasks()
     configureSnapshotTaskGraph(project)
     configureReleaseTaskGraph(project)
-    project.tasks.showPublishInfo << {
-      project.logger.lifecycle "[RELEASE] Project version: $project.version, $versioningInfo"
-    }
   }
 
   def configureGlobalTasks() {
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,29 +1,29 @@
 ext {
   aptIdeaVersion = 0.17
-  byteBuddyVersion = "1.8.12"
-  cglib = "3.2.6"
+  byteBuddyVersion = "1.8.22"
+  cglib = "3.2.8"
   classmate = "1.4.0"
-  equalsverifierVersion = '2.4.7'
+  classGraph = "4.1.7"
+  equalsverifierVersion = '2.5.2'
   groovy = "2.5.0"
   jacocoVersion = '0.8.1'
   jackson = '2.9.6'
   joda = "2.10"
   jsonPath = "2.4.0"
   jsonAssert = "1.5.0"
   mapstruct = "1.2.0.Final"
-  mockito = "2.15.0"
+  mockito = "2.22.0"
   objenesis = "2.6"
-  classGraph = "4.0.3"
   servlet = "3.1.0"
   slf4j = "1.7.25"
-  snakeyaml = '1.21'
+  snakeyaml = '1.23'
   spock = "1.1-groovy-2.4"
-  spring = "5.0.7.RELEASE"
+  spring = "5.0.9.RELEASE"
   springHateoas = "0.24.0.RELEASE"
-  springDataRest = "3.0.8.RELEASE"
+  springDataRest = "3.0.10.RELEASE"
   springPluginVersion = "1.2.0.RELEASE"
   swagger2Core = "1.5.20"
-  springBoot = "2.0.3.RELEASE"
+  springBoot = "2.0.5.RELEASE"
   springfoxRfc6570Version = "1.0.0"
   undercouch = "3.4.3"
   validationApiVersion = '2.0.1.Final'
diff --git a/gradle/documentation.gradle b/gradle/documentation.gradle
@@ -2,11 +2,13 @@ import springfox.gradlebuild.BuildInfo
 import springfox.gradlebuild.utils.ProjectDefinitions
 
 apply plugin: "org.asciidoctor.convert"
-apply plugin: 'org.ajoberstar.github-pages'
+apply plugin: 'org.ajoberstar.git-publish'
 
-githubPages {
-  deleteExistingFiles = false
-  pages {
+gitPublish {
+  preserve {
+    include '**/*'
+  }
+  contents {
     from "${buildDir}/all-docs"
   }
 }
@@ -45,7 +47,7 @@ task allDocs {
 }
 
 task publishDocs {
-  dependsOn publishGhPages
+  dependsOn gitPublishPush
 }
 
 task createReleaseDocs(type: Exec, dependsOn: allDocs) {
@@ -84,4 +86,4 @@ task releaseDocs {
   dependsOn createReleaseDocs, publishDocs
 }
 
-publishGhPages.dependsOn allDocs
+gitPublishPush.dependsOn allDocs
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,5 @@
 rootProject.name = 'springfox'
+enableFeaturePreview('STABLE_PUBLISHING')
 include 'springfox-core'
 include 'springfox-spi'
 include 'springfox-schema'
diff --git a/springfox-swagger-ui/src/web/package-lock.json b/springfox-swagger-ui/src/web/package-lock.json
diff --git a/springfox-swagger-ui/src/web/package.json b/springfox-swagger-ui/src/web/package.json
@@ -16,7 +16,7 @@
   "repository": "https://github.com/springfox/springfox.git",
   "dependencies": {},
   "devDependencies": {
-    "babel-core": "^6.26.0",
+    "babel-core": "^6.26.3",
     "babel-loader": "^7.1.4",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.1",
diff --git a/springfox-swagger1/build.gradle b/springfox-swagger1/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "net.ltgt.apt-idea" version "0.17"
+  id "net.ltgt.apt-idea" version "0.18"
 }
 
 ext {
@@ -25,7 +25,7 @@ sourceSets {
 
 // Define integration test task
 task integrationTest(type: Test) {
-  testClassesDir = sourceSets.integrationTest.output.classesDir
+  testClassesDirs = sourceSets.integrationTest.output.classesDirs
   classpath = sourceSets.integrationTest.runtimeClasspath
 }
 
diff --git a/springfox-swagger1/src/test/java/springfox/documentation/swagger1/configuration/CustomJavaPluginConfig.java b/springfox-swagger1/src/test/java/springfox/documentation/swagger1/configuration/CustomJavaPluginConfig.java
@@ -27,6 +27,7 @@
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger1.annotations.EnableSwagger;
 
@@ -72,7 +73,10 @@ private ApiInfo apiInfo() {
         .title("My Apps API Title")
         .description("My Apps API Description")
         .termsOfServiceUrl("My Apps API terms of service")
-        .contact("My Apps API Contact Email")
+        .contact(new Contact(
+            "My Apps API Contact Email",
+            "",
+            ""))
         .license("My Apps API Licence Type")
         .licenseUrl("My Apps API License URL")
         .build();
diff --git a/springfox-swagger2/build.gradle b/springfox-swagger2/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "net.ltgt.apt-idea" version "0.17"
+  id "net.ltgt.apt-idea" version "0.18"
 }
 
 ext {
diff --git a/springfox-swagger2/src/main/java/springfox/documentation/swagger2/mappers/ModelMapper.java b/springfox-swagger2/src/main/java/springfox/documentation/swagger2/mappers/ModelMapper.java
@@ -38,6 +38,7 @@
 import springfox.documentation.service.AllowableValues;
 import springfox.documentation.service.ApiListing;
 
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,7 +63,7 @@ public Map<String, Model> mapModels(Map<String, springfox.documentation.schema.M
       return null;
     }
 
-    Map<String, Model> map = new TreeMap();
+    Map<String, Model> map = new TreeMap<>();
     InheritanceDeterminer determiner = new InheritanceDeterminer(from);
     for (java.util.Map.Entry<String, springfox.documentation.schema.Model> entry : from.entrySet()) {
       String key = entry.getKey();
@@ -253,10 +254,10 @@ static Property modelRefToProperty(ModelReference modelRef) {
   }
 
   Map<String, Model> modelsFromApiListings(Map<String, List<ApiListing>> apiListings) {
-    Map<String, springfox.documentation.schema.Model> definitions = new TreeMap();
-    apiListings.values().stream().flatMap(l -> l.stream()).forEachOrdered(each -> {
-      definitions.putAll(each.getModels());
-    });
+    Map<String, springfox.documentation.schema.Model> definitions = new TreeMap<>();
+    apiListings.values().stream()
+        .flatMap(Collection::stream)
+        .forEachOrdered(each -> definitions.putAll(each.getModels()));
     return mapModels(definitions);
   }
 
diff --git a/swagger-contract-tests-webflux/src/main/java/springfox/test/contract/swagger/listeners/ObjectMapperEventListener.java b/swagger-contract-tests-webflux/src/main/java/springfox/test/contract/swagger/listeners/ObjectMapperEventListener.java
@@ -29,7 +29,6 @@ public class ObjectMapperEventListener implements ApplicationListener<ObjectMapp
   @Override
   public void onApplicationEvent(ObjectMapperConfigured event) {
     ObjectMapper objectMapper = event.getObjectMapper();
-    objectMapper.configure(com.fasterxml.jackson.databind.SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, true);
     objectMapper.setSerializationInclusion(JsonInclude.Include.ALWAYS);
   }
 
diff --git a/swagger-contract-tests/src/main/java/springfox/test/contract/swagger/Bug1767ListingScanner.java b/swagger-contract-tests/src/main/java/springfox/test/contract/swagger/Bug1767ListingScanner.java
@@ -57,6 +57,7 @@ public List<ApiDescription> apply(DocumentationContext context) {
     return new ArrayList<>(
         Arrays.asList( //<1>
             new ApiDescription(
+                "test",
                 "/bugs/1767",
                 "This is a bug",
                 Collections.singletonList( //<2>
diff --git a/swagger-contract-tests/src/main/java/springfox/test/contract/swagger/listeners/ObjectMapperEventListener.java b/swagger-contract-tests/src/main/java/springfox/test/contract/swagger/listeners/ObjectMapperEventListener.java
@@ -29,7 +29,6 @@ public class ObjectMapperEventListener implements ApplicationListener<ObjectMapp
   @Override
   public void onApplicationEvent(ObjectMapperConfigured event) {
     ObjectMapper objectMapper = event.getObjectMapper();
-    objectMapper.configure(com.fasterxml.jackson.databind.SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, true);
     objectMapper.setSerializationInclusion(JsonInclude.Include.ALWAYS);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,13 @@ import springfox.gradlebuild.BuildInfo`
`2`	`2`	`import springfox.gradlebuild.utils.ProjectDefinitions`
`3`	`3`
`4`	`4`	`apply plugin: "org.asciidoctor.convert"`
`5`		`-apply plugin: 'org.ajoberstar.github-pages'`
	`5`	`+apply plugin: 'org.ajoberstar.git-publish'`
`6`	`6`
`7`		`-githubPages {`
`8`		`- deleteExistingFiles = false`
`9`		`- pages {`
	`7`	`+gitPublish {`
	`8`	`+ preserve {`
	`9`	`+ include '*/'`
	`10`	`+ }`
	`11`	`+ contents {`
`10`	`12`	`from "${buildDir}/all-docs"`
`11`	`13`	`}`
`12`	`14`	`}`
`@@ -45,7 +47,7 @@ task allDocs {`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`task publishDocs {`
`48`		`- dependsOn publishGhPages`
	`50`	`+ dependsOn gitPublishPush`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`task createReleaseDocs(type: Exec, dependsOn: allDocs) {`
`@@ -84,4 +86,4 @@ task releaseDocs {`
`84`	`86`	`dependsOn createReleaseDocs, publishDocs`
`85`	`87`	`}`
`86`	`88`
`87`		`-publishGhPages.dependsOn allDocs`
	`89`	`+gitPublishPush.dependsOn allDocs`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`rootProject.name = 'springfox'`
	`2`	`+enableFeaturePreview('STABLE_PUBLISHING')`
`2`	`3`	`include 'springfox-core'`
`3`	`4`	`include 'springfox-spi'`
`4`	`5`	`include 'springfox-schema'`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id "net.ltgt.apt-idea" version "0.17"`
	`2`	`+ id "net.ltgt.apt-idea" version "0.18"`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`ext {`
`@@ -25,7 +25,7 @@ sourceSets {`
`25`	`25`
`26`	`26`	`// Define integration test task`
`27`	`27`	`task integrationTest(type: Test) {`
`28`		`- testClassesDir = sourceSets.integrationTest.output.classesDir`
	`28`	`+ testClassesDirs = sourceSets.integrationTest.output.classesDirs`
`29`	`29`	`classpath = sourceSets.integrationTest.runtimeClasspath`
`30`	`30`	`}`
`31`	`31`