Skip to content

Commit 02ed8e5

Browse files
authored
Merge pull request #50 from enigbe/2025-07-upgrade-jooq-and-add-junit-platform
build: upgrade jooq and add junit platform
2 parents c54b2c3 + f31eeed commit 02ed8e5

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.github/workflows/build-and-deploy-java.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,15 @@ jobs:
5454
run: |
5555
# Print Info
5656
java -version
57-
gradle --version
57+
GRADLE_VERSION=$(gradle --version | awk '/^Gradle/ {print $2}' | head -1)
58+
if [ -z "$GRADLE_VERSION" ]; then
59+
echo "Failed to extract Gradle version, using default"
60+
GRADLE_VERSION="9.0"
61+
fi
62+
echo "Gradle $GRADLE_VERSION"
5863
5964
cd java
60-
gradle wrapper --gradle-version 8.1.1
65+
gradle wrapper --gradle-version $GRADLE_VERSION
6166
./gradlew --version
6267
./gradlew build
6368

java/app/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
ext.junitVersion = '5.9.0'
66
ext.mockitoVersion = '5.2.0'
77
ext.postgresVersion = '42.5.1'
8-
ext.jooqVersion = '3.17.7'
8+
ext.jooqVersion = '3.19.1'
99
ext.guiceVersion = '5.1.0'
1010
}
1111

@@ -14,7 +14,7 @@ plugins {
1414
id 'com.google.protobuf' version "${protobufPlugInVersion}"
1515
id 'war'
1616
id 'idea'
17-
id 'nu.studer.jooq' version '8.0'
17+
id 'nu.studer.jooq' version '8.2.2'
1818
}
1919

2020
repositories {
@@ -69,6 +69,7 @@ dependencies {
6969
testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
7070
testImplementation "org.mockito:mockito-core:$mockitoVersion"
7171
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
72+
testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.9.0"
7273
testImplementation "org.hamcrest:hamcrest-library:2.2"
7374
testImplementation "org.testcontainers:junit-jupiter:1.17.6"
7475
testImplementation "org.testcontainers:postgresql:1.17.6"

0 commit comments

Comments
 (0)