Skip to content

Commit

Permalink
Set kotlin.version=1.9.22, spring-cloud.version=2023.0.0, spring-boot…
Browse files Browse the repository at this point in the history
….version=3.2.2
  • Loading branch information
aryabokon committed Feb 12, 2024
1 parent dae4076 commit 2f62b7d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ jobs:
uses: octopusden/octopus-base/.github/workflows/[email protected]
with:
flow-type: public
java-version: '11'
java-version: '21'
docker-image: config-server
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ jobs:
uses: octopusden/octopus-base/.github/workflows/[email protected]
with:
flow-type: public
java-version: '11'
java-version: '21'
docker-image: config-server
secrets: inherit
10 changes: 8 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
kotlin("jvm")
id("org.springframework.boot")
id("com.bmuschko.docker-spring-boot-application") version "7.1.0"
id("com.bmuschko.docker-spring-boot-application")
id("maven-publish")
id("io.github.gradle-nexus.publish-plugin")
signing
Expand Down Expand Up @@ -81,7 +81,7 @@ val octopusGithubDockerRegistry = System.getenv().getOrDefault("OCTOPUS_GITHUB_D

docker {
springBootApplication {
baseImage.set("$dockerRegistry/openjdk:11")
baseImage.set("$dockerRegistry/openjdk:21-oracle")
ports.set(listOf(8888, 8888))
images.set(setOf("$octopusGithubDockerRegistry/octopusden/${project.name}:${project.version}"))
}
Expand All @@ -91,6 +91,12 @@ tasks.getByName("dockerBuildImage").doFirst {
validateDockerRegistryParams()
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions {
jvmTarget = "21"
}
}

dependencies {
implementation(platform("org.springframework.cloud:spring-cloud-dependencies:${project.property("spring-cloud.version")}"))
implementation(platform("org.springframework.boot:spring-boot-dependencies:${project.property("spring-boot.version")}"))
Expand Down
7 changes: 4 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
kotlin.version=1.6.21
spring-cloud.version=2021.0.0
spring-boot.version=2.6.1
kotlin.version=1.9.22
spring-cloud.version=2023.0.0
spring-boot.version=3.2.2
bmuschko-docker-plugin.version=7.4.0
docker.registry=
octopus.github.docker.registry=
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ pluginManagement {
kotlin("jvm") version (extra["kotlin.version"] as String)
id("org.springframework.boot") version (extra["spring-boot.version"] as String)
id("io.github.gradle-nexus.publish-plugin") version("1.1.0") apply(false)
id("com.bmuschko.docker-spring-boot-application") version (extra["bmuschko-docker-plugin.version"] as String)
}
}
1 change: 1 addition & 0 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ spring:
passphrase: ${SSH_PASSPHRASE}
private-key: ${SSH_KEY}
order: 1
default-label: master
vault:
host: # set on deployment via ENV
port: 443
Expand Down

0 comments on commit 2f62b7d

Please sign in to comment.