diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e06339e..25187d2 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, v0.9 ] pull_request: - branches: [ master, dev ] + branches: [ master, dev, v0.9 ] jobs: # Build and test the code @@ -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 6169f72..ea364a9 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, v0.9 ] jobs: security: @@ -16,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 @@ -30,3 +29,4 @@ jobs: --configuration-matching='^runtimeClasspath$' --org=radar-base --policy-path=$PWD/.snyk + --severity-threshold=high 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") } ``` diff --git a/build.gradle.kts b/build.gradle.kts index edc5be6..567bfef 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 { @@ -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 f8ed7f3..3f0d306 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,23 +3,23 @@ org.gradle.jvmargs=-Xmx2000m org.gradle.vfs.watch=true kotlin.code.style=official -kotlinVersion=1.7.22 -dokkaVersion=1.7.20 +kotlinVersion=1.9.22 +dokkaVersion=1.9.20 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 +mockitoKotlinVersion=5.2.1 hk2Version=3.0.3 -managementPortalVersion=0.8.1 +managementPortalVersion=0.8.3 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,10 +29,10 @@ 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 -liquibaseVersion=4.17.2 -postgresVersion=42.5.1 -h2Version=2.1.214 +hibernateVersion=6.4.2.Final +liquibaseVersion=4.25.1 +postgresVersion=42.7.2 +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 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()