Merge pull request #68 from RADAR-base/release-0.9.1

Release 0.9.1

.github/workflows/main.yml

@@ -17,11 +17,11 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
-          distribution: zulu
+          distribution: temurin
           java-version: 11
 
       - name: Setup Gradle

.github/workflows/publish_snapshots.yml

@@ -15,15 +15,15 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Has SNAPSHOT version
         id: is-snapshot
         run: grep 'version = ".*-SNAPSHOT"' build.gradle.kts
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
-          distribution: zulu
+          distribution: temurin
           java-version: 11
 
       - name: Setup Gradle

.github/workflows/release.yml

@@ -13,10 +13,10 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
-          distribution: zulu
+          distribution: temurin
           java-version: 11
 
       - name: Setup Gradle

.github/workflows/scheduled_snyk.yaml

@@ -2,6 +2,10 @@ name: Snyk scheduled test
 on:
   schedule:
     - cron: '0 2 * * 1'
+  push:
+    branches:
+      - master
+
 jobs:
   security:
     runs-on: ubuntu-latest
@@ -11,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: snyk/actions/setup@master
         with:
-          snyk-version: v1.931.0
+          snyk-version: v1.1032.0
 
       - uses: actions/setup-java@v3
         with:
@@ -29,8 +33,8 @@ jobs:
           --configuration-matching='^runtimeClasspath$'
           --json-file-output=${{ env.REPORT_FILE }}
           --org=radar-base
-          --sub-project=radar-jersey
-          --sub-project=radar-jersey-hibernate
+          --all-sub-projects
+          --policy-path=$PWD/.snyk
 
       - name: Report new vulnerabilities
         uses: thehyve/report-vulnerability@master

.github/workflows/snyk.yaml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: snyk/actions/setup@master
         with:
-          snyk-version: v1.931.0
+          snyk-version: v1.1032.0
 
       - uses: actions/setup-java@v3
         with:
@@ -28,5 +28,5 @@ jobs:
           --configuration-matching='^runtimeClasspath$'
           --fail-on=upgradable
           --org=radar-base
-          --sub-project=radar-jersey
-          --sub-project=radar-jersey-hibernate
+          --all-sub-projects
+          --policy-path=$PWD/.snyk

.snyk

@@ -1,14 +1,10 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.14.1
+version: v1.25.0
 # ignores vulnerabilities until expiry date; change duration by modifying expiry date
 ignore:
-  SNYK-JAVA-COMH2DATABASE-31685:
-    - '*':
-        reason: No path to create alias
-        expires: 2022-02-22T00:00:00.000Z
   SNYK-JAVA-ORGJETBRAINSKOTLIN-2393744:
     - '*':
         reason: Not using Kotlin Files interface
-        expires: 2022-12-13T08:35:54.696Z
-        created: 2022-03-14T08:35:54.706Z
+        expires: 2023-14-30T10:58:31.820Z
+        created: 2022-10-31T10:58:31.828Z
 patch: {}

README.md

@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    api("org.radarbase:radar-jersey:0.9.0")
+    api("org.radarbase:radar-jersey:0.9.1")
 }
 ```
 
@@ -126,8 +126,8 @@ To enable logging with radar-jersey, please set the following configurations. Fo
 dependencies {
     // To enable logging either use log4j
     val log4j2Version: String by project
-    runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:$log4j2Version")
-    runtimeOnly("org.apache.logging.log4j:log4j-api:$log4j2Version")
+    runtimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl:$log4j2Version")
+    runtimeOnly("org.apache.logging.log4j:log4j-core:$log4j2Version")
     runtimeOnly("org.apache.logging.log4j:log4j-jul:$log4j2Version")
 }
 ```

build.gradle.kts

@@ -7,13 +7,13 @@ plugins {
     `maven-publish`
     signing
     id("org.jetbrains.dokka") apply false
-    id("com.github.ben-manes.versions") version "0.42.0"
+    id("com.github.ben-manes.versions") version "0.43.0"
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 }
 
 allprojects {
     group = "org.radarbase"
-    version = "0.9.0"
+    version = "0.9.1"
 }
 
 subprojects {
@@ -56,8 +56,8 @@ subprojects {
 
         val log4j2Version: String by project
         val testRuntimeOnly by configurations
-        testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:$log4j2Version")
-        testRuntimeOnly("org.apache.logging.log4j:log4j-api:$log4j2Version")
+        testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl:$log4j2Version")
+        testRuntimeOnly("org.apache.logging.log4j:log4j-core:$log4j2Version")
         testRuntimeOnly("org.apache.logging.log4j:log4j-jul:$log4j2Version")
     }
 
@@ -82,8 +82,8 @@ subprojects {
     tasks.withType<KotlinCompile> {
         kotlinOptions {
             jvmTarget = "11"
-            apiVersion = "1.6"
-            languageVersion = "1.6"
+            apiVersion = "1.7"
+            languageVersion = "1.7"
         }
     }
 
@@ -183,7 +183,7 @@ subprojects {
 val stableVersionRegex = "[0-9,.v-]+(-r)?".toRegex()
 
 fun isNonStable(version: String): Boolean {
-    val stableKeyword = listOf("RELEASE", "FINAL", "GA")
+    val stableKeyword = listOf("RELEASE", "FINAL", "GA", "-CE")
         .any { version.toUpperCase().contains(it) }
     return !stableKeyword && !stableVersionRegex.matches(version)
 }
@@ -212,5 +212,5 @@ nexusPublishing {
 }
 
 tasks.wrapper {
-    gradleVersion = "7.4.2"
+    gradleVersion = "7.5.1"
 }

gradle.properties

@@ -3,36 +3,36 @@ org.gradle.jvmargs=-Xmx2000m
 org.gradle.vfs.watch=true
 kotlin.code.style=official
 
-kotlinVersion=1.7.10
-dokkaVersion=1.7.0
-jsoupVersion=1.15.2
+kotlinVersion=1.7.20
+dokkaVersion=1.7.20
+jsoupVersion=1.15.3
 
-jerseyVersion=3.0.5
+jerseyVersion=3.0.8
 grizzlyVersion=4.0.0
 okhttpVersion=4.10.0
-junitVersion=5.8.2
+junitVersion=5.9.1
 hamcrestVersion=2.2
 mockitoKotlinVersion=4.0.0
 
 hk2Version=3.0.3
 managementPortalVersion=0.8.1
-javaJwtVersion=4.0.0
+javaJwtVersion=4.2.1
 jakartaWsRsVersion=3.1.0
 jakartaAnnotationVersion=2.1.1
-jacksonVersion=2.13.3
-slf4jVersion=1.7.36
-log4j2Version=2.18.0
+jacksonVersion=2.13.4.20221013
+slf4jVersion=2.0.3
+log4j2Version=2.19.0
 jakartaXmlBindVersion=4.0.0
-jakartaJaxbCoreVersion=4.0.0
-jakartaJaxbRuntimeVersion=4.0.0
+jakartaJaxbCoreVersion=4.0.1
+jakartaJaxbRuntimeVersion=4.0.1
 jakartaValidationVersion=3.0.2
-hibernateValidatorVersion=7.0.4.Final
+hibernateValidatorVersion=8.0.0.Final
 glassfishJakartaElVersion=4.0.2
 jakartaActivation=2.1.0
-swaggerVersion=2.2.1
+swaggerVersion=2.2.4
 mustacheVersion=0.9.10
 
-hibernateVersion=6.1.1.Final
-liquibaseVersion=4.13.0
-postgresVersion=42.4.0
+hibernateVersion=6.1.5.Final
+liquibaseVersion=4.17.1
+postgresVersion=42.5.0
 h2Version=2.1.214

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

radar-jersey/src/main/resources/log4j2.xml

@@ -18,7 +18,7 @@
         <Logger name="org.radarbase.jersey.auth.Auth" level="INFO" additivity="false">
             <AppenderRef ref="AUTH"/>
         </Logger>
-        <Root level="INFO">
+        <Root level="${env:LOG4J_LOG_LEVEL:-INFO}">
             <AppenderRef ref="STDOUT"/>
         </Root>
     </Loggers>