Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix log4j2 CVE and update dependencies #34

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 16 ]
java: [ 17 ]
os: [ ubuntu-latest, windows-latest, macos-latest ]

runs-on: ${{ matrix.os }}
Expand Down
8 changes: 4 additions & 4 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ repositories {
}
}

val spineBaseVersion = "2.0.0-SNAPSHOT.47"
val spineMcJavaVersion = "2.0.0-SNAPSHOT.83"

dependencies {
implementation("io.spine.tools:spine-mc-java:${spineBaseVersion}")
implementation("io.spine.tools:spine-mc-java:${spineMcJavaVersion}")
implementation("net.ltgt.gradle:gradle-errorprone-plugin:2.0.2")
implementation("com.google.protobuf:protobuf-gradle-plugin:0.8.17")
implementation("com.google.protobuf:protobuf-gradle-plugin:0.8.18")
implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
implementation("gradle.plugin.com.google.cloud.tools:jib-gradle-plugin:3.1.2")
implementation("gradle.plugin.com.google.cloud.tools:jib-gradle-plugin:3.1.4")
implementation("net.saliman:gradle-properties-plugin:1.5.1")
implementation("io.micronaut.gradle:micronaut-gradle-plugin:1.5.4")
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ package io.spine.internal.dependency

// https://checkerframework.org/
object CheckerFramework {
private const val version = "3.17.0"
private const val version = "3.20.0"
const val annotations = "org.checkerframework:checker-qual:${version}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ package io.spine.internal.dependency

object Gcp {
private const val bomVersion = "20.0.0"
private const val chatVersion = "v1-rev20210818-1.32.1"
private const val chatVersion = "v1-rev20211125-1.32.1"

const val bom = "com.google.cloud:libraries-bom:${bomVersion}"
const val secretManager = "com.google.cloud:google-cloud-secretmanager"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ package io.spine.internal.dependency
* [Gson](https://github.com/google/gson)
*/
object Gson {
private const val version = "2.8.8"
private const val version = "2.8.9"
const val lib = "com.google.code.gson:gson:${version}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ package io.spine.internal.dependency

// https://github.com/google/guava
object Guava {
private const val version = "30.1.1-jre"
private const val version = "31.0.1-jre"
const val lib = "com.google.guava:guava:${version}"
const val testLib = "com.google.guava:guava-testlib:${version}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ package io.spine.internal.dependency

// https://junit.org/junit5/
object JUnit {
private const val version = "5.7.2"
private const val version = "5.8.2"

// https://github.com/apiguardian-team/apiguardian
private const val apiGuardianVersion = "1.1.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ package io.spine.internal.dependency

// https://logging.apache.org/log4j/2.x/
object Log4j2 {
const val version = "2.14.1"
const val version = "2.15.0"
const val core = "org.apache.logging.log4j:log4j-core:${version}"
const val api = "org.apache.logging.log4j:log4j-api:${version}"
const val slf4jBridge = "org.apache.logging.log4j:log4j-slf4j18-impl:${version}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ package io.spine.internal.dependency
// https://github.com/protocolbuffers/protobuf
@Suppress("MemberVisibilityCanBePrivate") // used directly from outside
object Protobuf {
const val version = "3.17.3"
const val version = "3.18.0"
val libs = listOf(
"com.google.protobuf:protobuf-java:${version}",
"com.google.protobuf:protobuf-java-util:${version}"
Expand Down
10 changes: 5 additions & 5 deletions buildSrc/src/main/kotlin/io/spine/internal/dependency/Spine.kt
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ package io.spine.internal.dependency

// https://github.com/SpineEventEngine
object Spine {
private const val baseVersion = "2.0.0-SNAPSHOT.47"
private const val baseTypesVersion = "2.0.0-SNAPSHOT.40"
private const val coreVersion = "2.0.0-SNAPSHOT.47"
private const val timeVersion = "2.0.0-SNAPSHOT.40"
private const val gcloudVersion = "2.0.0-SNAPSHOT.4"
private const val baseVersion = "2.0.0-SNAPSHOT.79"
private const val baseTypesVersion = "2.0.0-SNAPSHOT.75"
private const val coreVersion = "2.0.0-SNAPSHOT.88"
private const val timeVersion = "2.0.0-SNAPSHOT.76"
private const val gcloudVersion = "2.0.0-SNAPSHOT.63"

const val base = "io.spine:spine-base:${baseVersion}"
const val baseTypes = "io.spine:spine-base-types:${baseTypesVersion}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ package io.spine.internal.dependency

// https://www.testcontainers.org/
object Testcontainers {
const val version = "1.16.0"
const val version = "1.16.2"

const val lib = "org.testcontainers:testcontainers:${version}"
const val junitJupiter = "org.testcontainers:junit-jupiter:${version}"
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/java-convention.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ plugins {
}

java {
sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ steps:
# The following step starts the build process using Gradle official image, performs the build
# and runs `jib` for the specified `GCP_PROJECT` in order to build and deploy the container
# image to the Google Container Registry.
- name: 'gradle:7.2-jdk16'
- name: 'gradle:7.3-jdk17'
entrypoint: 'gradle'
args: [ 'build', 'jib', '-PGCP_PROJECT=${PROJECT_ID}' ]
env: ["GITHUB_ACTOR=CloudBuild"]
Expand Down
2 changes: 1 addition & 1 deletion google-chat-bot/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ application {

jib {
from {
image = "amazoncorretto:16"
image = "amazoncorretto:17"
}
to {
image = "gcr.io/${extras.gcpProject}/chat-bot-server"
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,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading