Upgraded to gradle 5.6.3 (#370)

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 jdk:
-- oraclejdk8
+- openjdk8
 before_install:
 - chmod +x gradlew
 after_success:

build.gradle

@@ -3,31 +3,33 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.6'
-        classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
-        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.0.0"
-        classpath "org.ajoberstar:gradle-git:1.7.2"
+        classpath group: 'org.asciidoctor', name: 'asciidoctor-gradle-plugin', version: '1.5.6'
+        classpath group: 'org.asciidoctor', name: 'asciidoctorj-pdf', version: '1.5.0-alpha.16'
+        classpath group: 'org.kt3k.gradle.plugin', name: 'coveralls-gradle-plugin', version: '2.0.1'
+        classpath group: 'com.jfrog.bintray.gradle', name: 'gradle-bintray-plugin', version: '1.6'
+        classpath group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '4.0.0'
+        classpath group: 'org.ajoberstar', name: 'gradle-git', version: '1.7.2'
     }
 }
-description = 'swagger2markup Build'
-version = '1.3.4-SNAPSHOT'
-ext.releaseVersion = '1.3.3'
-group = 'io.github.swagger2markup'
 
-apply plugin: 'java'
-apply plugin: 'eclipse'
+plugins {
+    id 'java'
+    id 'eclipse'
+}
 apply from: 'gradle/publishing.gradle'
 apply from: 'gradle/coverage.gradle'
 apply from: 'gradle/documentation.gradle'
 
+group 'io.github.swagger2markup'
+description = 'swagger2markup Build'
+version = '1.3.4-SNAPSHOT'
+
 tasks.withType(JavaCompile) {
     sourceCompatibility = "1.8"
     targetCompatibility = "1.8"
     options.deprecation = true
     options.encoding = 'UTF-8'
-    options.compilerArgs << "-Xlint:unchecked"
+    options.compilerArgs += ['-Xlint:unchecked']
 }
 
 repositories {
@@ -39,18 +41,18 @@ repositories {
 }
 
 dependencies {
-    compile 'io.github.swagger2markup:markup-document-builder:1.1.3-SNAPSHOT'
-    compile 'io.swagger:swagger-compat-spec-parser:1.0.35'
-    compile 'org.apache.commons:commons-configuration2:2.1'
-    compile 'commons-beanutils:commons-beanutils:1.9.2'
-    compile 'org.apache.commons:commons-collections4:4.1'
-    compile 'io.vavr:vavr:0.9.1'
-    compile 'ch.netzwerg:paleo-core:0.11.0'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.asciidoctor:asciidoctorj:1.5.6'
-    testCompile 'ch.qos.logback:logback-classic:1.1.2'
-    testCompile 'org.assertj:assertj-core:3.8.0'
-    testCompile 'io.github.robwin:assertj-diff:0.1.1'
+    implementation group: 'io.github.swagger2markup', name: 'markup-document-builder', version: '1.1.3-SNAPSHOT'
+    implementation group: 'io.swagger', name: 'swagger-compat-spec-parser', version: '1.0.35'
+    implementation group: 'org.apache.commons', name: 'commons-configuration2', version: '2.1'
+    implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.2'
+    implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.1'
+    implementation group: 'io.vavr', name: 'vavr', version: '0.9.1'
+    implementation group: 'ch.netzwerg', name: 'paleo-core', version: '0.11.0'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'org.asciidoctor', name: 'asciidoctorj', version: '1.5.6'
+    testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.8.0'
+    testImplementation group: 'io.github.robwin', name: 'assertj-diff', version: '0.1.1'
 }
 
 test {
@@ -62,7 +64,6 @@ test {
     systemProperty 'file.encoding', 'UTF-8'
 }
 
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.3.1'
+javadoc {
+    options.encoding = 'UTF-8'
 }

gradle/documentation.gradle

@@ -1,6 +1,10 @@
 apply plugin: 'org.asciidoctor.convert'
 apply plugin: 'org.ajoberstar.github-pages'
 
+ext {
+    releaseVersion = '1.3.3'
+}
+
 asciidoctor {
     sources {
         include 'index.adoc'
@@ -14,7 +18,7 @@ asciidoctor {
             sectlinks: '',
             sectanchors: '',
             hardbreaks: '',
-            'release-version': project.releaseVersion
+            'release-version': project.ext.releaseVersion
     ]
 }
 
@@ -35,6 +39,6 @@ githubPages  {
 
     pages  {
         from file(asciidoctor.outputDir.path + '/html5')
-        into project.releaseVersion
+        into project.ext.releaseVersion
     }
 }

gradle/publishing.gradle

@@ -14,14 +14,14 @@ ext {
     issuesUrl = 'https://github.com/Swagger2Markup/swagger2markup/issues'
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allJava
+    archiveClassifier = 'sources'
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
+task javadocJar(type: Jar) {
+    from javadoc
+    archiveClassifier = 'javadoc'
 }
 
 artifacts {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 04 10:24:38 CET 2017
+#Mon Oct 21 16:35:38 BST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip

gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }