Upgrade dependencies, including Gradle
This commit is contained in:
36
build.gradle
36
build.gradle
@@ -6,7 +6,7 @@ plugins {
|
||||
id 'org.sonarqube' version '2.7.1'
|
||||
id 'checkstyle'
|
||||
id 'org.ajoberstar.grgit' version '3.1.1'
|
||||
id "io.spring.dependency-management" version "1.0.8.RELEASE"
|
||||
id "io.spring.dependency-management" version '1.0.8.RELEASE'
|
||||
}
|
||||
description = 'Spring Integration AWS Support'
|
||||
|
||||
@@ -24,14 +24,14 @@ repositories {
|
||||
|
||||
ext {
|
||||
assertjVersion = '3.13.2'
|
||||
awaitilityVersion = '4.0.0'
|
||||
awaitilityVersion = '4.0.1'
|
||||
dynamodbLockClientVersion = '1.1.0'
|
||||
jacksonVersion = '2.9.9.20190807'
|
||||
servletApiVersion = '4.0.1'
|
||||
log4jVersion = '2.12.1'
|
||||
springCloudAwsVersion = '2.2.0.BUILD-SNAPSHOT'
|
||||
springIntegrationVersion = '5.2.0.BUILD-SNAPSHOT'
|
||||
kinesisClientVersion = '1.11.1'
|
||||
kinesisClientVersion = '1.11.2'
|
||||
kinesisProducerVersion = '0.13.1'
|
||||
|
||||
idPrefix = 'aws'
|
||||
@@ -48,7 +48,7 @@ ext {
|
||||
}
|
||||
|
||||
ext.javadocLinks = [
|
||||
"https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/"
|
||||
'https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/'
|
||||
] as String[]
|
||||
|
||||
compileJava {
|
||||
@@ -80,12 +80,12 @@ dependencyManagement {
|
||||
}
|
||||
|
||||
jacoco {
|
||||
toolVersion = "0.8.4"
|
||||
toolVersion = '0.8.4'
|
||||
}
|
||||
|
||||
checkstyle {
|
||||
configFile = file("${rootDir}/src/checkstyle/checkstyle.xml")
|
||||
toolVersion = "8.24"
|
||||
toolVersion = '8.24'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -128,13 +128,13 @@ javadoc {
|
||||
options.author = true
|
||||
options.header = project.description
|
||||
options.overview = 'src/api/overview.html'
|
||||
options.stylesheetFile = file("src/api/stylesheet.css")
|
||||
options.stylesheetFile = file('src/api/stylesheet.css')
|
||||
options.splitIndex = true
|
||||
options.links(project.ext.javadocLinks)
|
||||
|
||||
source = sourceSets.main.allJava
|
||||
classpath = project.sourceSets.main.compileClasspath
|
||||
destinationDir = new File(buildDir, "api")
|
||||
destinationDir = file("$buildDir/api")
|
||||
|
||||
// suppress warnings due to cross-module @see and @link references;
|
||||
// note that global 'api' task does display all warnings.
|
||||
@@ -147,7 +147,7 @@ ext.xLintArg = '-Xlint:all,-options'
|
||||
[compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg]
|
||||
|
||||
test {
|
||||
maxHeapSize = "1024m"
|
||||
maxHeapSize = '1024m'
|
||||
jacoco {
|
||||
append = false
|
||||
destinationFile = file("$buildDir/jacoco.exec")
|
||||
@@ -163,7 +163,7 @@ jacocoTestReport {
|
||||
reports {
|
||||
xml.enabled false
|
||||
csv.enabled false
|
||||
html.destination file("${buildDir}/reports/jacoco/html")
|
||||
html.destination file("$buildDir/reports/jacoco/html")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,7 +174,7 @@ build.dependsOn jacocoTestReport
|
||||
task updateCopyrights {
|
||||
onlyIf { !System.getenv('TRAVIS') && !System.getenv('bamboo_buildKey') }
|
||||
inputs.files(modifiedFiles)
|
||||
outputs.dir('build/classes')
|
||||
outputs.dir("$buildDir/classes")
|
||||
|
||||
doLast {
|
||||
def now = Calendar.instance.get(Calendar.YEAR) as String
|
||||
@@ -219,13 +219,13 @@ artifacts {
|
||||
|
||||
sonarqube {
|
||||
properties {
|
||||
property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
|
||||
property "sonar.links.homepage", linkHomepage
|
||||
property "sonar.links.ci", linkCi
|
||||
property "sonar.links.issue", linkIssue
|
||||
property "sonar.links.scm", linkScmUrl
|
||||
property "sonar.links.scm_dev", linkScmDevConnection
|
||||
property "sonar.java.coveragePlugin", "jacoco"
|
||||
property 'sonar.jacoco.reportPath', "${buildDir.name}/jacoco.exec"
|
||||
property 'sonar.links.homepage', linkHomepage
|
||||
property 'sonar.links.ci', linkCi
|
||||
property 'sonar.links.issue', linkIssue
|
||||
property 'sonar.links.scm', linkScmUrl
|
||||
property 'sonar.links.scm_dev', linkScmDevConnection
|
||||
property 'sonar.java.coveragePlugin', 'jacoco'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
6
gradlew
vendored
6
gradlew
vendored
@@ -7,7 +7,7 @@
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@@ -125,8 +125,8 @@ if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin, switch paths to Windows format before running java
|
||||
if $cygwin ; then
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
2
gradlew.bat
vendored
2
gradlew.bat
vendored
@@ -5,7 +5,7 @@
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem http://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
|
||||
Reference in New Issue
Block a user