diff --git a/build.gradle b/build.gradle index 4bd4938..0fd1830 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "2.6.1" id "io.codearte.nexus-staging" version "0.11.0" - id "org.xbib.gradle.plugin.asciidoctor" version "1.6.0.0" + id "org.xbib.gradle.plugin.asciidoctor" version "1.5.6.0.1" } printf "Host: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGradle: %s Groovy: %s Java: %s\n" + @@ -47,12 +47,12 @@ allprojects { wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}" } - sourceCompatibility = JavaVersion.VERSION_1_9 + sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:all" << "--release" << "8"// << "-profile" << "compact1" + options.compilerArgs << "-Xlint:all" //<< "--release" << "8"// << "-profile" << "compact1" } jar { diff --git a/content-resource/build.gradle b/content-resource/build.gradle index 49954cc..9c86318 100644 --- a/content-resource/build.gradle +++ b/content-resource/build.gradle @@ -4,6 +4,6 @@ tasks.withType(JavaCompile) { } dependencies { - compile "org.xbib:net:${project.property('xbib-net.version')}" + compile "org.xbib:net-url:${project.property('xbib-net.version')}" testCompile "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a822a99..3f0baae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,10 @@ group = org.xbib name = content version = 1.3.0 -xbib-net.version = 1.0.0 +xbib-net.version = 1.1.0 jackson.version = 2.8.11 junit.version = 4.12 hamcrest.version = 1.3 mockito.version = 2.15.0 wagon.version = 3.0.0 +asciidoclet.version = 1.5.4 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8252d7e..758de96 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6f83a67..03aaa1c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Feb 21 09:12:23 CET 2018 +#Mon Jul 09 22:08:37 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-rc-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip