From 7d879086cba8078d3a420e3fd1e741ef424692d1 Mon Sep 17 00:00:00 2001 From: Bastiaan Date: Mon, 18 Mar 2024 16:27:20 +0100 Subject: [PATCH 01/10] bump postgresql --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f8ed7f3..dd9813a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,5 +34,5 @@ mustacheVersion=0.9.10 hibernateVersion=6.1.5.Final liquibaseVersion=4.17.2 -postgresVersion=42.5.1 +postgresVersion=42.7.1 h2Version=2.1.214 From aa6f3655fd750af71265d5d5df85128ed66d5fa3 Mon Sep 17 00:00:00 2001 From: Bastiaan Date: Mon, 18 Mar 2024 16:42:28 +0100 Subject: [PATCH 02/10] run tests on release branch --- .github/workflows/main.yml | 4 ++-- .github/workflows/snyk.yaml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e06339e..e442b25 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,9 +4,9 @@ name: CI # Run in master and dev branches and in all pull requests to those branches on: push: - branches: [ master, dev ] + branches: [ master, dev, release-0.9.2 ] pull_request: - branches: [ master, dev ] + branches: [ master, dev, release-0.9.2 ] jobs: # Build and test the code diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index 6169f72..8b9fc92 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -1,8 +1,7 @@ name: Snyk test on: pull_request: - branches: - - master + branches: [ master, dev, release-0.9.2 ] jobs: security: From 84d5f0cc7dbac65635194ec3c3489fd7a96911a8 Mon Sep 17 00:00:00 2001 From: Bastiaan Date: Mon, 18 Mar 2024 16:48:09 +0100 Subject: [PATCH 03/10] update liquibase and postgres --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index dd9813a..dddf909 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ hamcrestVersion=2.2 mockitoKotlinVersion=4.1.0 hk2Version=3.0.3 -managementPortalVersion=0.8.1 +managementPortalVersion=0.8.2 javaJwtVersion=4.2.1 jakartaWsRsVersion=3.1.0 jakartaAnnotationVersion=2.1.1 @@ -33,6 +33,6 @@ swaggerVersion=2.2.7 mustacheVersion=0.9.10 hibernateVersion=6.1.5.Final -liquibaseVersion=4.17.2 -postgresVersion=42.7.1 +liquibaseVersion=4.21.0 +postgresVersion=42.7.2 h2Version=2.1.214 From e3f93005648e83299efa70a027d0694ea3ac5b4b Mon Sep 17 00:00:00 2001 From: Bastiaan Date: Mon, 18 Mar 2024 16:53:31 +0100 Subject: [PATCH 04/10] update kotlin --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index dddf909..bae4ba6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2000m org.gradle.vfs.watch=true kotlin.code.style=official -kotlinVersion=1.7.22 +kotlinVersion=1.9.22 dokkaVersion=1.7.20 jsoupVersion=1.15.3 From 2aee3da1cbfe942a37b64f12e877a1f429fb61d3 Mon Sep 17 00:00:00 2001 From: Bastiaan Date: Mon, 18 Mar 2024 16:54:15 +0100 Subject: [PATCH 05/10] bump version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index edc5be6..1a6f6ab 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ plugins { allprojects { group = "org.radarbase" - version = "0.9.2" + version = "0.9.3" } subprojects { From 045466e70341b5fea0500a4ea9e553c85dd899b7 Mon Sep 17 00:00:00 2001 From: Bastiaan Date: Mon, 18 Mar 2024 17:02:23 +0100 Subject: [PATCH 06/10] bump versions for okhttp swagger and jackson --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index bae4ba6..3e48fec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ jsoupVersion=1.15.3 jerseyVersion=3.1.0 grizzlyVersion=4.0.0 -okhttpVersion=4.10.0 +okhttpVersion=4.12.0 junitVersion=5.9.1 hamcrestVersion=2.2 mockitoKotlinVersion=4.1.0 @@ -19,7 +19,7 @@ managementPortalVersion=0.8.2 javaJwtVersion=4.2.1 jakartaWsRsVersion=3.1.0 jakartaAnnotationVersion=2.1.1 -jacksonVersion=2.14.1 +jacksonVersion=2.15.2 slf4jVersion=2.0.5 log4j2Version=2.19.0 jakartaXmlBindVersion=4.0.0 @@ -29,7 +29,7 @@ jakartaValidationVersion=3.0.2 hibernateValidatorVersion=8.0.0.Final glassfishJakartaElVersion=4.0.2 jakartaActivation=2.1.0 -swaggerVersion=2.2.7 +swaggerVersion=2.2.9 mustacheVersion=0.9.10 hibernateVersion=6.1.5.Final From 61e3a4363f7ed2df5f0085d531d90710b2a53a6b Mon Sep 17 00:00:00 2001 From: Bastiaan Date: Mon, 18 Mar 2024 17:04:04 +0100 Subject: [PATCH 07/10] snyk severity threshold --- .github/workflows/snyk.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index 8b9fc92..6293697 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -29,3 +29,4 @@ jobs: --configuration-matching='^runtimeClasspath$' --org=radar-base --policy-path=$PWD/.snyk + --severity-threshold=high From c297fd0a4ac47b82a862c78727a0a60c540ce973 Mon Sep 17 00:00:00 2001 From: Bastiaan Date: Fri, 22 Mar 2024 14:22:32 +0100 Subject: [PATCH 08/10] change base branch to v0.9. THIS BRANCH IS EOL --- .github/workflows/main.yml | 4 ++-- .github/workflows/snyk.yaml | 2 +- README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e442b25..f31b145 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,9 +4,9 @@ name: CI # Run in master and dev branches and in all pull requests to those branches on: push: - branches: [ master, dev, release-0.9.2 ] + branches: [ master, dev, v0.9 ] pull_request: - branches: [ master, dev, release-0.9.2 ] + branches: [ master, dev, v0.9 ] jobs: # Build and test the code diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index 6293697..3592bb8 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -1,7 +1,7 @@ name: Snyk test on: pull_request: - branches: [ master, dev, release-0.9.2 ] + branches: [ master, dev, v0.9 ] jobs: security: diff --git a/README.md b/README.md index 55434d5..13a09db 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ repositories { } dependencies { - api("org.radarbase:radar-jersey:0.9.2") + api("org.radarbase:radar-jersey:0.9.3") } ``` From 285a3ad5dcf4b070776ee54e776816dd83576b64 Mon Sep 17 00:00:00 2001 From: Bastiaan Date: Fri, 22 Mar 2024 14:50:22 +0100 Subject: [PATCH 09/10] more updates, crucially dokkaversion to 1.9.20 --- .github/workflows/main.yml | 2 +- .github/workflows/publish_snapshots.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/scheduled_snyk.yaml | 2 +- .github/workflows/snyk.yaml | 2 +- build.gradle.kts | 10 +++++----- gradle.properties | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 3 ++- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f31b145..25187d2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/publish_snapshots.yml b/.github/workflows/publish_snapshots.yml index 7a6727c..06ffe1f 100644 --- a/.github/workflows/publish_snapshots.yml +++ b/.github/workflows/publish_snapshots.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7794c91..7db5901 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/scheduled_snyk.yaml b/.github/workflows/scheduled_snyk.yaml index b4b2e61..c823efe 100644 --- a/.github/workflows/scheduled_snyk.yaml +++ b/.github/workflows/scheduled_snyk.yaml @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml index 3592bb8..ea364a9 100644 --- a/.github/workflows/snyk.yaml +++ b/.github/workflows/snyk.yaml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/build.gradle.kts b/build.gradle.kts index 1a6f6ab..567bfef 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,14 +76,14 @@ subprojects { } tasks.withType { - options.release.set(11) + options.release.set(17) } tasks.withType { kotlinOptions { - jvmTarget = "11" - apiVersion = "1.7" - languageVersion = "1.7" + jvmTarget = "17" + apiVersion = "1.9" + languageVersion = "1.9" } } @@ -212,5 +212,5 @@ nexusPublishing { } tasks.wrapper { - gradleVersion = "7.6" + gradleVersion = "8.3" } diff --git a/gradle.properties b/gradle.properties index 3e48fec..3f0d306 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.vfs.watch=true kotlin.code.style=official kotlinVersion=1.9.22 -dokkaVersion=1.7.20 +dokkaVersion=1.9.20 jsoupVersion=1.15.3 jerseyVersion=3.1.0 @@ -12,10 +12,10 @@ grizzlyVersion=4.0.0 okhttpVersion=4.12.0 junitVersion=5.9.1 hamcrestVersion=2.2 -mockitoKotlinVersion=4.1.0 +mockitoKotlinVersion=5.2.1 hk2Version=3.0.3 -managementPortalVersion=0.8.2 +managementPortalVersion=0.8.3 javaJwtVersion=4.2.1 jakartaWsRsVersion=3.1.0 jakartaAnnotationVersion=2.1.1 @@ -32,7 +32,7 @@ jakartaActivation=2.1.0 swaggerVersion=2.2.9 mustacheVersion=0.9.10 -hibernateVersion=6.1.5.Final -liquibaseVersion=4.21.0 +hibernateVersion=6.4.2.Final +liquibaseVersion=4.25.1 postgresVersion=42.7.2 -h2Version=2.1.214 +h2Version=2.2.224 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33..3fa8f86 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 32f6cb637baa2786ee7d0458dc89a514620e3d6a Mon Sep 17 00:00:00 2001 From: Bastiaan Date: Fri, 22 Mar 2024 14:52:08 +0100 Subject: [PATCH 10/10] update to comply with radartoken interface --- .../kotlin/org/radarbase/jersey/auth/disabled/DisabledAuth.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/radar-jersey/src/main/kotlin/org/radarbase/jersey/auth/disabled/DisabledAuth.kt b/radar-jersey/src/main/kotlin/org/radarbase/jersey/auth/disabled/DisabledAuth.kt index 3c6702a..d733813 100644 --- a/radar-jersey/src/main/kotlin/org/radarbase/jersey/auth/disabled/DisabledAuth.kt +++ b/radar-jersey/src/main/kotlin/org/radarbase/jersey/auth/disabled/DisabledAuth.kt @@ -30,6 +30,7 @@ class DisabledAuth( override fun getGrantType(): String = "none" override fun getSubject(): String = "anonymous" + override fun getUsername(): String = "anonymous" override fun getIssuedAt(): Date = Date()