Skip to content

Commit

Permalink
Merge branch 'main' into renovate/fabric8-kubernetes-client-monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanbethke authored Jul 17, 2024
2 parents 838feb3 + 3d1259b commit f433df9
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import java.nio.charset.StandardCharsets

plugins {
id 'org.springframework.boot' version '2.7.18'
id 'io.spring.dependency-management' version '1.1.5'
id 'io.spring.dependency-management' version '1.1.6'
id 'java'
id 'com.google.cloud.tools.jib' version '3.4.3'
}
Expand Down Expand Up @@ -31,21 +31,21 @@ compileJava {
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter:3.3.0'
implementation 'org.springframework.boot:spring-boot-starter:3.3.1'
// developmentOnly 'org.springframework.boot:spring-boot-devtools:3.2.0'
implementation 'org.springframework.boot:spring-boot-starter-actuator:3.3.0'
implementation 'org.springframework.boot:spring-boot-starter-web:3.3.0'
implementation 'org.springframework.boot:spring-boot-starter-actuator:3.3.1'
implementation 'org.springframework.boot:spring-boot-starter-web:3.3.1'
implementation 'io.javaoperatorsdk:operator-framework-spring-boot-starter:5.5.0'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
// required for the fabric8 k8s client to grok k3d certificates
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor:3.3.0'
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor:3.3.1'
compileOnly 'org.projectlombok:lombok'
testCompileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
annotationProcessor 'io.fabric8:crd-generator-apt:6.13.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation 'org.springframework.boot:spring-boot-starter-test:3.3.0'
testImplementation 'org.springframework.boot:spring-boot-starter-test:3.3.1'
testImplementation 'io.javaoperatorsdk:operator-framework-spring-boot-starter-test:5.5.0'
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down

0 comments on commit f433df9

Please sign in to comment.