Update gradle wrapper and set source and target compatibility to 1.8

Co-authored-by: Marco Geweke <[email protected]>
otto-de · Sep 24, 2018 · fc04725 · fc04725
1 parent 8ee13b1
commit fc04725
Show file tree

Hide file tree

Showing 18 changed files with 57 additions and 7 deletions.
diff --git a/bin/gradle/wrapper/gradle-wrapper.jar b/bin/gradle/wrapper/gradle-wrapper.jar
diff --git a/bin/gradle/wrapper/gradle-wrapper.properties b/bin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Oct 12 20:55:45 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
diff --git a/build.gradle b/build.gradle
@@ -37,7 +37,7 @@ subprojects {
     // DO NOT FORGET TO DOCUMENT CHANGES IN CHANGELOG.md
     //
     // Add a GitHub release for every new release: https://github.com/otto-de/edison-microservice/releases
-    version = '2.0.0-m4-SNAPSHOT'
+    version = '2.0.0-m5-SNAPSHOT'
     group = 'de.otto.edison'
 
     repositories {
@@ -59,7 +59,7 @@ subprojects {
     apply from: "${rootDir}/gradle/jacoco.gradle"
     apply from: "${rootDir}/gradle/maven.gradle"
     apply from: "${rootDir}/gradle/signing.gradle"
-}
 
-targetCompatibility = '10'
-sourceCompatibility = '10'
+    targetCompatibility = '1.8'
+    sourceCompatibility = '1.8'
+}
diff --git a/edison-aws/build.gradle b/edison-aws/build.gradle
@@ -16,6 +16,10 @@ dependencies {
 
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar

diff --git a/edison-core/build.gradle b/edison-core/build.gradle
@@ -13,6 +13,10 @@ dependencies {
     testCompile libraries.async_http_client
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar

diff --git a/edison-jobs/build.gradle b/edison-jobs/build.gradle
@@ -8,6 +8,10 @@ dependencies {
     testCompile test_libraries.jsonassert
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar

diff --git a/edison-mongo/build.gradle b/edison-mongo/build.gradle
@@ -13,6 +13,10 @@ dependencies {
     testCompile test_libraries.embedded_mongo
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar

diff --git a/edison-oauth/build.gradle b/edison-oauth/build.gradle
@@ -11,6 +11,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar

diff --git a/edison-testsupport/build.gradle b/edison-testsupport/build.gradle
@@ -16,6 +16,10 @@ dependencies {
     compile test_libraries.spring_boot_starter_test
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar

diff --git a/edison-togglz/build.gradle b/edison-togglz/build.gradle
@@ -7,6 +7,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar

diff --git a/edison-validation/build.gradle b/edison-validation/build.gradle
@@ -9,6 +9,9 @@ dependencies {
     testImplementation test_libraries.rest_assured
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
 
 artifacts {
     archives jar

diff --git a/examples/example-jobs/build.gradle b/examples/example-jobs/build.gradle
@@ -8,6 +8,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar

diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle
@@ -6,6 +6,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar

diff --git a/examples/example-status/build.gradle b/examples/example-status/build.gradle
@@ -7,6 +7,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar

diff --git a/examples/example-togglz-mongo/build.gradle b/examples/example-togglz-mongo/build.gradle
@@ -8,6 +8,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar

diff --git a/examples/example-togglz/build.gradle b/examples/example-togglz/build.gradle
@@ -6,6 +6,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar

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.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists