Merge pull request #69 from RADAR-base/release-0.3.2

release-0.3.2

.github/workflows/codeql.yml

@@ -0,0 +1,96 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "master", "dev" ]
+  pull_request:
+    branches: [ "master", "dev" ]
+  schedule:
+    - cron: '29 9 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: 'ubuntu-latest'
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: java-kotlin
+          build-mode: autobuild
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 17
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/main.yml

@@ -20,14 +20,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@v4
 
-            - uses: actions/setup-java@v1
+            - uses: actions/setup-java@v4
               with:
-                  java-version: 11
+                  distribution: temurin
+                  java-version: 17
 
             - name: Cache
-              uses: actions/cache@v2.0.0
+              uses: actions/cache@v3
               with:
                   # Cache gradle directories
                   path: |
@@ -55,31 +56,31 @@ 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@v4
 
             - name: Login to Docker Hub
-              uses: docker/login-action@v1
+              uses: docker/login-action@v3
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
             # Add Docker labels and tags
             - name: Docker meta
               id: docker_meta
-              uses: crazy-max/ghaction-docker-meta@v2
+              uses: docker/metadata-action@v4
               with:
                   images: ${{ env.DOCKER_IMAGE }}
 
             # Setup docker build environment
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@v1
+              uses: docker/setup-qemu-action@v2
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v1
+              uses: docker/setup-buildx-action@v2
 
             - name: Cache Docker layers
               id: cache-buildx
-              uses: actions/cache@v2
+              uses: actions/cache@v3
               with:
                   path: /tmp/.buildx-cache
                   key: ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile', '**/*.gradle.kts', 'gradle.properties', 'src/main/**') }}
@@ -94,7 +95,7 @@ jobs:
                     echo "::set-output name=cache-to::type=local,dest=/tmp/.buildx-cache-new,mode=max"
                   fi
             - name: Build docker
-              uses: docker/build-push-action@v2
+              uses: docker/build-push-action@v3
               with:
                   cache-from: type=local,src=/tmp/.buildx-cache
                   cache-to: ${{ steps.cache-parameters.outputs.cache-to }}

.github/workflows/release.yml

@@ -13,13 +13,14 @@ 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@v1
+            - uses: actions/checkout@v4
+            - uses: actions/setup-java@v4
               with:
-                  java-version: 11
+                  distribution: temurin
+                  java-version: 17
 
             - name: Cache
-              uses: actions/cache@v2.0.0
+              uses: actions/cache@v3
               with:
                   # A list of files, directories, and wildcard patterns to cache and restore
                   path: |
@@ -52,32 +53,32 @@ jobs:
 
         # Steps represent a sequence of tasks that will be executed as part of the job
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
 
             # Setup docker build environment
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@v1
+              uses: docker/setup-qemu-action@v2
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v1
+              uses: docker/setup-buildx-action@v2
 
             - name: Login to DockerHub
-              uses: docker/login-action@v1
+              uses: docker/login-action@v3
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
             # Add Docker labels and tags
             - name: Docker meta
               id: docker_meta
-              uses: crazy-max/ghaction-docker-meta@v2
+              uses: docker/metadata-action@v4
               with:
                   images: ${{ env.DOCKER_IMAGE }}
                   tags: |
                       type=semver,pattern={{version}}
                       type=semver,pattern={{major}}.{{minor}}
             - name: Build docker
-              uses: docker/build-push-action@v2
+              uses: docker/build-push-action@v3
               with:
                   # Allow running the image on the architectures supported by openjdk:17-jre-slim
                   platforms: linux/amd64,linux/arm64

.github/workflows/scheduled-snyk.yaml

@@ -0,0 +1,28 @@
+name: Snyk scheduled test
+on:
+  schedule:
+    - cron: '0 2 1 * *'
+  push:
+    branches:
+      - master
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    env:
+      REPORT_FILE: test.json
+    steps:
+      - uses: actions/checkout@v3
+      - uses: snyk/actions/gradle-jdk17@master
+        name: Run Snyk to check for vulnerabilities
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+        with: --all-projects --configuration-matching='^runtimeClasspath$' --fail-on=upgradable --json-file-output=${{ env.REPORT_FILE }}--org=radar-base --policy-path=$PWD/.snyk
+
+      - name: Report new vulnerabilities
+        uses: thehyve/report-vulnerability@master
+        if: success() || failure()
+        with:
+          report-file: ${{ env.REPORT_FILE }}
+        env:
+          TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/snyk.yaml

@@ -0,0 +1,14 @@
+name: Snyk test
+on:
+  pull_request:
+    branches: [ master, dev ]
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: snyk/actions/gradle-jdk17@master
+        name: Run Snyk to check for vulnerabilities
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+        with: --all-projects --configuration-matching='^runtimeClasspath$' --org=radar-base --policy-path=$PWD/.snyk

.snyk

@@ -0,0 +1,5 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.25.0
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+patch: {}

Dockerfile

@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gradle:7.0.2-jdk11 as builder
+FROM --platform=$BUILDPLATFORM gradle:8.3-jdk17 as builder
 
 RUN mkdir /code
 WORKDIR /code
@@ -29,7 +29,7 @@ RUN gradle distTar --no-watch-fs \
     && tar xzf *.tar.gz \
     && rm *.tar.gz radar-push-endpoint-*/lib/radar-push-endpoint-*.jar
 
-FROM openjdk:11-jre-slim
+FROM eclipse-temurin:17-jre
 
 MAINTAINER @yatharthranjan
 

build.gradle.kts

@@ -15,7 +15,7 @@ description = "RADAR Push API Gateway to handle secured data flow to backend."
 
 allprojects {
     group = "org.radarbase"
-    version = "0.3.1"
+    version = "0.3.2"
 
     repositories {
         mavenCentral()
@@ -87,9 +87,9 @@ dependencies {
 
 tasks.withType<KotlinCompile> {
     kotlinOptions {
-        jvmTarget = "11"
-        apiVersion = "1.5"
-        languageVersion = "1.5"
+        jvmTarget = "17"
+        apiVersion = "1.8"
+        languageVersion = "1.8"
     }
 }
 
@@ -189,5 +189,5 @@ tasks.withType<DependencyUpdatesTask> {
 }
 
 tasks.wrapper {
-    gradleVersion = "7.1"
+    gradleVersion = "8.3"
 }

deprecated-javax/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
     implementation("io.confluent:kafka-schema-registry-client:$confluentVersion") {
         isTransitive = false
     }
-    implementation("org.glassfish.jersey.core:jersey-common:2.31")
+    implementation("org.glassfish.jersey.core:jersey-common:3.1.5")
     implementation("io.swagger:swagger-annotations:1.6.2")
     implementation("io.confluent:common-utils:$confluentVersion") {
         isTransitive = false

gradle.properties

@@ -1,17 +1,17 @@
 org.gradle.jvmargs=-Xmx3072m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 dockerComposeStopContainers=true
 
-kotlinVersion=1.6.10
-okhttp3Version=4.9.3
-radarJerseyVersion=0.9.1
-radarCommonsVersion=0.13.2
-radarSchemasVersion=0.8.3
+kotlinVersion=1.9.22
+okhttp3Version=4.12.0
+radarJerseyVersion=0.10.0
+radarCommonsVersion=0.15.0
+radarSchemasVersion=0.8.11
 radarOauthClientVersion=0.8.0
 jacksonVersion=2.14.1
-slf4jVersion=2.0.7
-log4j2Version=2.20.0
-kafkaVersion=2.8.1
-confluentVersion=6.2.0
-junitVersion=5.7.2
-jedisVersion=3.6.1
-grizzlyVersion=3.0.1
+slf4jVersion=2.0.12
+log4j2Version=2.23.0
+kafkaVersion=3.6.1
+confluentVersion=7.6.0
+junitVersion=5.10.2
+jedisVersion=5.1.2
+grizzlyVersion=4.0.2

gradle/wrapper/gradle-wrapper.properties

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