Skip to content

Commit

Permalink
upgrade: Bump Gradle to version 6.8.3
Browse files Browse the repository at this point in the history
- Upgrade the Gradle Wrapper
- Bump spotbugs and spotbugs Gradle plugin to the latest versions

[#181598917]
  • Loading branch information
hsinn0 committed Mar 21, 2022
1 parent 3852c6a commit bcee415
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ buildscript {
mariadbJdbcVersion = '2.7.4' // When using a MariaDB with a driver of version 2.4.0 or greater, FlyWay 5 does not know how to handle the driver reporting itself as "MariaDB" and will throw an exception causing CredHub to be unable to start. Do not upgrade until this issue is resolved. See #174776586.
passayVersion = '1.6.1'
postgresqlJdbcVersion = '42.3.3'
spotBugsToolVersion = '3.1.9'
spotBugsGradlePluginVersion = '1.6.9'
spotBugsToolVersion = '4.6.0'
springRestDocsVersion = '2.0.6.RELEASE'
springBootVersion = '2.4.13' // Springboot 2.5.5 requires Gradle 6.8.x, 6.9.x, or 7.x
springSecurityOauth2Version = '2.5.1.RELEASE'
Expand All @@ -44,6 +43,7 @@ buildscript {

plugins {
id 'com.github.ben-manes.versions' version '0.42.0'
id 'com.github.spotbugs'
}

apply plugin: DependenciesGraphPlugin
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ repositories {
}

dependencies {
compile "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.9"
compile "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:2.0.0"
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
2 changes: 0 additions & 2 deletions spotbugs.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apply plugin: "com.github.spotbugs"

spotbugs {
toolVersion = "$spotBugsToolVersion"
excludeFilter = file("$rootProject.projectDir/config/findbugs/exclude-filter.xml")
Expand Down

0 comments on commit bcee415

Please sign in to comment.