Skip to content

Commit

Permalink
Merge pull request #86 from RADAR-base/release-0.9.3
Browse files Browse the repository at this point in the history
release 0.9.3
  • Loading branch information
Bdegraaf1234 committed Mar 22, 2024
2 parents 84719e6 + 32f6cb6 commit a01e996
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 28 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled_snyk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/snyk.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
name: Snyk test
on:
pull_request:
branches:
- master
branches: [ master, dev, v0.9 ]

jobs:
security:
Expand All @@ -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
Expand All @@ -30,3 +29,4 @@ jobs:
--configuration-matching='^runtimeClasspath$'
--org=radar-base
--policy-path=$PWD/.snyk
--severity-threshold=high
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.2")
api("org.radarbase:radar-jersey:0.9.3")
}
```

Expand Down
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {

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

subprojects {
Expand Down Expand Up @@ -76,14 +76,14 @@ subprojects {
}

tasks.withType<JavaCompile> {
options.release.set(11)
options.release.set(17)
}

tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "11"
apiVersion = "1.7"
languageVersion = "1.7"
jvmTarget = "17"
apiVersion = "1.9"
languageVersion = "1.9"
}
}

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

tasks.wrapper {
gradleVersion = "7.6"
gradleVersion = "8.3"
}
22 changes: 11 additions & 11 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
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.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
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

0 comments on commit a01e996

Please sign in to comment.