diff --git a/build.gradle.kts b/build.gradle.kts index b9794d0..8b55d1c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,12 +2,12 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.owasp.dependencycheck.reporting.ReportGenerator -version = "0.1.2-SNAPSHOT" +version = "0.1.3-SNAPSHOT" group = "cloud.rio" -val awsSdkVersion = "1.11.671" -val log4jVersion = "2.12.1" -val jacksonVersion = "2.10.1" +val awsSdkVersion = "1.12.56" +val log4jVersion = "2.14.1" +val jacksonVersion = "2.12.5" val repositoryUser: String by project val repositoryPassword: String by project @@ -19,17 +19,17 @@ plugins { java signing `maven-publish` - kotlin("jvm") version "1.3.50" - id("com.github.ben-manes.versions") version "0.27.0" - id("org.owasp.dependencycheck") version "5.2.2" + kotlin("jvm") version "1.5.30" + id("com.github.ben-manes.versions") version "0.39.0" + id("org.owasp.dependencycheck") version "6.2.2" } dependencies { implementation(kotlin("stdlib-jdk8")) implementation("org.apache.logging.log4j:log4j-core:$log4jVersion") implementation("org.apache.logging.log4j:log4j-api:$log4jVersion") - implementation("com.google.code.gson:gson:2.8.6") - implementation("org.apache.commons:commons-io:1.3.2") + implementation("com.google.code.gson:gson:2.8.8") + implementation("commons-io:commons-io:2.11.0") implementation("com.amazonaws:aws-java-sdk-cloudformation:$awsSdkVersion") implementation("com.amazonaws:aws-java-sdk-codepipeline:$awsSdkVersion") implementation("com.amazonaws:aws-java-sdk-sts:$awsSdkVersion") @@ -40,17 +40,15 @@ dependencies { implementation("com.amazonaws:aws-java-sdk-ssm:$awsSdkVersion") implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion") implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") - testImplementation("io.mockk:mockk:1.9.3") - testImplementation("io.findify:s3mock_2.12:0.2.5") - testImplementation("org.junit.jupiter:junit-jupiter:5.5.2") + testImplementation("io.mockk:mockk:1.12.0") + testImplementation("io.findify:s3mock_2.12:0.2.6") + testImplementation("org.junit.jupiter:junit-jupiter:5.7.2") } repositories { mavenCentral() } -tasks.getByName("wrapper").gradleVersion = "5.4" - tasks.withType { useJUnitPlatform() } @@ -92,12 +90,12 @@ tasks { } dependencyCheck { - data { - directory = "owasp-dependency-check/database" - } + data(closureOf { + directory = "${project.rootDir}/owasp-dependency-check/database" + }) failBuildOnCVSS = 0f format = ReportGenerator.Format.ALL - suppressionFile = "owasp-dependency-check/suppressions.xml" + suppressionFile = "${project.rootDir}/owasp-dependency-check/suppressions.xml" cveValidForHours = 24 * 7 } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cc4fdc2..5c2d1cf 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 5f1b120..ffed3a2 100644 --- 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-5.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7..b0d6d0a 100755 --- a/gradlew +++ b/gradlew @@ -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 # -# https://www.apache.org/licenses/LICENSE-2.0 +# http://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 or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` @@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then else eval `echo args$i`="\"$arg\"" fi - i=`expr $i + 1` + i=$((i+1)) done case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -175,9 +175,14 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=`save "$@"` +APP_ARGS=$(save "$@") # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 24467a1..15e1ee3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -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 https://www.apache.org/licenses/LICENSE-2.0 +@rem http://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,