Skip to content

Commit

Permalink
Merge pull request #69 from RADAR-base/release-0.9.2
Browse files Browse the repository at this point in the history
Release 0.9.2
  • Loading branch information
blootsvoets authored Dec 5, 2022
2 parents 787e814 + 140251a commit 84719e6
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 20 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/scheduled_snyk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
runs-on: ubuntu-latest
env:
REPORT_FILE: test.json

steps:
- uses: actions/checkout@v3
- uses: snyk/actions/setup@master
Expand All @@ -30,14 +31,16 @@ jobs:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
run: >
snyk test
--all-sub-projects
--configuration-matching='^runtimeClasspath$'
--fail-on=upgradable
--json-file-output=${{ env.REPORT_FILE }}
--org=radar-base
--all-sub-projects
--policy-path=$PWD/.snyk
- name: Report new vulnerabilities
uses: thehyve/report-vulnerability@master
if: success() || failure()
with:
report-file: ${{ env.REPORT_FILE }}
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snyk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
pull_request:
branches:
- master

jobs:
security:
runs-on: ubuntu-latest
Expand All @@ -25,8 +26,7 @@ jobs:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
run: >
snyk test
--all-sub-projects
--configuration-matching='^runtimeClasspath$'
--fail-on=upgradable
--org=radar-base
--all-sub-projects
--policy-path=$PWD/.snyk
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repositories {
}
dependencies {
api("org.radarbase:radar-jersey:0.9.1")
api("org.radarbase:radar-jersey:0.9.2")
}
```

Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ plugins {
`maven-publish`
signing
id("org.jetbrains.dokka") apply false
id("com.github.ben-manes.versions") version "0.43.0"
id("com.github.ben-manes.versions") version "0.44.0"
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
}

allprojects {
group = "org.radarbase"
version = "0.9.1"
version = "0.9.2"
}

subprojects {
Expand Down Expand Up @@ -212,5 +212,5 @@ nexusPublishing {
}

tasks.wrapper {
gradleVersion = "7.5.1"
gradleVersion = "7.6"
}
16 changes: 8 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@ org.gradle.jvmargs=-Xmx2000m
org.gradle.vfs.watch=true
kotlin.code.style=official

kotlinVersion=1.7.20
kotlinVersion=1.7.22
dokkaVersion=1.7.20
jsoupVersion=1.15.3

jerseyVersion=3.0.8
jerseyVersion=3.1.0
grizzlyVersion=4.0.0
okhttpVersion=4.10.0
junitVersion=5.9.1
hamcrestVersion=2.2
mockitoKotlinVersion=4.0.0
mockitoKotlinVersion=4.1.0

hk2Version=3.0.3
managementPortalVersion=0.8.1
javaJwtVersion=4.2.1
jakartaWsRsVersion=3.1.0
jakartaAnnotationVersion=2.1.1
jacksonVersion=2.13.4.20221013
slf4jVersion=2.0.3
jacksonVersion=2.14.1
slf4jVersion=2.0.5
log4j2Version=2.19.0
jakartaXmlBindVersion=4.0.0
jakartaJaxbCoreVersion=4.0.1
Expand All @@ -29,10 +29,10 @@ jakartaValidationVersion=3.0.2
hibernateValidatorVersion=8.0.0.Final
glassfishJakartaElVersion=4.0.2
jakartaActivation=2.1.0
swaggerVersion=2.2.4
swaggerVersion=2.2.7
mustacheVersion=0.9.10

hibernateVersion=6.1.5.Final
liquibaseVersion=4.17.1
postgresVersion=42.5.0
liquibaseVersion=4.17.2
postgresVersion=42.5.1
h2Version=2.1.214
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down

0 comments on commit 84719e6

Please sign in to comment.