Merge pull request #300 from RADAR-base/release-0.7.8

Release 0.7.8

.github/workflows/main.yml

@@ -26,23 +26,14 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
+          distribution: zulu
           java-version: 17
 
-      - name: Cache
-        uses: actions/cache@v2
-        with:
-          # Cache gradle directories
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          # Key for restoring and saving the cache
-          key: ${{ runner.os }}-java-${{ hashFiles('**/*.gradle', 'java-sdk/gradle.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-java-
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
-      # Compile the code
       - name: Compile code
         run: ./gradlew assemble
 

.github/workflows/publish_snapshots.yml

@@ -25,21 +25,14 @@ jobs:
         id: is-snapshot
         run: grep "version = '.*-SNAPSHOT'" build.gradle
 
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
-          java-version: 11
+          distribution: zulu
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
-      - name: Cache
-        uses: actions/cache@v2
-        with:
-          # Cache gradle directories
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          # Key for restoring and saving the cache
-          key: ${{ runner.os }}-java-${{ hashFiles('**/*.gradle', 'java-sdk/gradle.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-java-
 
       - name: Install gpg secret key
         run: |

.github/workflows/release.yml

@@ -18,23 +18,15 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+
+      - uses: actions/setup-java@v2
         with:
+          distribution: zulu
           java-version: 17
 
-      - name: Gradle cache
-        uses: actions/cache@v2
-        with:
-          # Cache gradle directories
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          # An explicit key for restoring and saving the cache
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', 'java-sdk/gradle.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      # Compile code
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
       - name: Compile code
         run: ./gradlew assemble
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:7.3-jdk17 as builder
+FROM --platform=$BUILDPLATFORM gradle:7.4-jdk17 as builder
 
 RUN mkdir -p /code/java-sdk
 WORKDIR /code/java-sdk

java-sdk/build.gradle

@@ -5,11 +5,11 @@
 plugins {
     id 'com.github.davidmc24.gradle.plugin.avro-base' version '1.3.0'
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
-    id("com.github.ben-manes.versions") version "0.39.0"
+    id("com.github.ben-manes.versions") version "0.42.0"
 }
 
 allprojects {
-    version = '0.7.7'
+    version = '0.7.8'
     group = 'org.radarbase'
 }
 
@@ -26,17 +26,26 @@ subprojects {
     ext {
         avroVersion = '1.11.0'
         argparseVersion = '0.9.0'
-        jacksonVersion = '2.12.5'
-        radarJerseyVersion = "0.8.1"
+        jacksonVersion = '2.13.2'
+        radarJerseyVersion = "0.8.2"
 
         junitVersion = '4.13.2'
         confluentVersion = '7.0.1'
         kafkaVersion = '7.0.1-ce'
         okHttpVersion = '4.9.3'
         radarCommonsVersion = '0.13.2'
-        slf4jVersion = '1.7.32'
+        slf4jVersion = '1.7.36'
         javaxValidationVersion = '2.0.1.Final'
-        logbackVersion = '1.2.3'
+        logbackVersion = '1.2.10'
+    }
+
+    configurations.all {
+        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+            if (details.requested.group == 'com.fasterxml.jackson.module' && details.requested.name == 'jackson-module-kotlin') {
+                details.useVersion jacksonVersion
+                details.because 'Fixes missing kotlin module of latest version'
+            }
+        }
     }
 
     repositories {
@@ -73,5 +82,5 @@ nexusPublishing {
 }
 
 wrapper {
-    gradleVersion '7.3.3'
+    gradleVersion '7.4.1'
 }

java-sdk/gradle/wrapper/gradle-wrapper.properties

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

java-sdk/radar-catalog-server/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     implementation project(':radar-schemas-core')
     implementation group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: argparseVersion
 
-    def log4j2Version = "2.17.1"
+    def log4j2Version = "2.17.2"
     runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:$log4j2Version")
     runtimeOnly("org.apache.logging.log4j:log4j-api:$log4j2Version")
     runtimeOnly("org.apache.logging.log4j:log4j-jul:$log4j2Version")

specifications/passive/carl-cloud-1.0.0.yml

@@ -28,5 +28,5 @@ data:
   - type: FIBAROEVENT
     doc: An event that was registered with a Fibaro Device that captures the previous value of the last event that was registered with the same device - old and the new value - new.
     unit: NON_DIMENSIONAL
-    topic: certh_carl_cloud_fibaro_section
+    topic: certh_carl_cloud_fibaro_event
     value_schema: .passive.carl.FibaroEvent