This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 13aaf26 upgrade to gradle 6.1 and refresh other dependencies too
13aaf26 is described below
commit 13aaf267f6c654dc28b9414d0fbbd84ca79fcfe1
Author: Paul King <[email protected]>
AuthorDate: Mon Jan 20 17:37:59 2020 +1000
upgrade to gradle 6.1 and refresh other dependencies too
---
build.gradle | 1 +
buildSrc/src/main/groovy/util/CheckLinks.groovy | 4 ++--
generator/build.gradle | 5 +++--
gradle/wrapper/gradle-wrapper.jar | Bin 54212 -> 54711 bytes
gradle/wrapper/gradle-wrapper.properties | 4 ++--
site-dev/build.gradle | 2 +-
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/build.gradle b/build.gradle
index 994400a..57397d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,6 +22,7 @@ buildscript {
jcenter()
}
dependencies {
+ classpath 'org.apache.ant:ant:1.9.13'
classpath 'com.yahoo.platform.yui:yuicompressor:2.4.7'
}
}
diff --git a/buildSrc/src/main/groovy/util/CheckLinks.groovy
b/buildSrc/src/main/groovy/util/CheckLinks.groovy
index ef03a6b..b06c9ae 100644
--- a/buildSrc/src/main/groovy/util/CheckLinks.groovy
+++ b/buildSrc/src/main/groovy/util/CheckLinks.groovy
@@ -25,7 +25,7 @@ import org.apache.http.client.methods.HttpGet
import org.apache.http.impl.client.CloseableHttpClient
import org.apache.http.impl.client.HttpClients
import org.gradle.api.logging.Logger
-import org.gradle.util.GFileUtils
+import org.apache.tools.ant.util.FileUtils
class CheckLinks {
Logger logger = null
@@ -92,7 +92,7 @@ class CheckLinks {
}
def checkPage(File f) {
- def currentPath = GFileUtils.relativePath(baseDir, f.parentFile)
+ def currentPath = FileUtils.getRelativePath(baseDir, f.parentFile)
f.eachLine('utf-8') { String line, int nb ->
def dead = []
[/\shref=['"](.+?)['"]/, /src=['"](.+?)['"]/].each { regex ->
diff --git a/generator/build.gradle b/generator/build.gradle
index b68660b..bf57002 100644
--- a/generator/build.gradle
+++ b/generator/build.gradle
@@ -24,9 +24,10 @@ repositories {
}
dependencies {
- ext.groovyVersion = '2.4.17'
- ext.asciidocVersion = '2.0.0'
+ ext.groovyVersion = '2.5.9'
+ ext.asciidocVersion = '2.2.0'
compile "org.codehaus.groovy:groovy:$groovyVersion"
+ compile "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
compile "org.codehaus.groovy:groovy-json:$groovyVersion"
compile "org.codehaus.groovy:groovy-templates:$groovyVersion"
compile("org.asciidoctor:asciidoctorj:$asciidocVersion") {
diff --git a/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
index d69138c..59b281d 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 8ab61f9..0d1d6c1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 28 15:54:35 AEST 2018
+#Mon Jan 20 16:35:34 AEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
diff --git a/site-dev/build.gradle b/site-dev/build.gradle
index 6ad5f8a..96f4b9a 100644
--- a/site-dev/build.gradle
+++ b/site-dev/build.gradle
@@ -26,7 +26,7 @@ import util.CheckLinks
plugins {
id 'base' // common lifecycle tasks and artifact types
- id 'org.ajoberstar.grgit' version '2.3.0' // to publish website to asf-git
branch
+ id 'org.ajoberstar.grgit' version '4.0.1' // to publish website to asf-git
branch
}
ext.watchmode =
project.hasProperty('watchmode')?project.getProperty('watchmode'):'false'
