From c7d68a48c5d0a41b822b6115e98b845c1b5f039c Mon Sep 17 00:00:00 2001 From: this-Aditya Date: Fri, 8 Mar 2024 14:44:54 +0530 Subject: [PATCH 1/4] Build, gradle and dependencies updated --- build.gradle.kts | 8 ++++---- deprecated-javax/build.gradle.kts | 2 +- gradle.properties | 20 ++++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 398245c..cc20127 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -87,9 +87,9 @@ dependencies { tasks.withType { kotlinOptions { - jvmTarget = "11" - apiVersion = "1.5" - languageVersion = "1.5" + jvmTarget = "17" + apiVersion = "1.8" + languageVersion = "1.8" } } @@ -189,5 +189,5 @@ tasks.withType { } tasks.wrapper { - gradleVersion = "7.1" + gradleVersion = "8.3" } diff --git a/deprecated-javax/build.gradle.kts b/deprecated-javax/build.gradle.kts index 70b8ce1..371c9cc 100644 --- a/deprecated-javax/build.gradle.kts +++ b/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 diff --git a/gradle.properties b/gradle.properties index 8049f71..f6588d4 100644 --- a/gradle.properties +++ b/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.6 radarOauthClientVersion=0.8.0 jacksonVersion=2.14.1 -slf4jVersion=2.0.7 -log4j2Version=2.20.0 +slf4jVersion=2.0.12 +log4j2Version=2.23.0 kafkaVersion=2.8.1 confluentVersion=6.2.0 -junitVersion=5.7.2 -jedisVersion=3.6.1 -grizzlyVersion=3.0.1 +junitVersion=5.10.2 +jedisVersion=5.1.2 +grizzlyVersion=4.0.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a9715..db9a6b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 From 0867918acc6bad2b7ab59b75d2d50b174faa206d Mon Sep 17 00:00:00 2001 From: this-Aditya Date: Fri, 8 Mar 2024 14:47:50 +0530 Subject: [PATCH 2/4] Updated to java 17 in workflows --- .github/workflows/main.yml | 7 ++++--- .github/workflows/release.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b3718c6..fa9227a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,11 +20,12 @@ 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index df99ae0..3a7267a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,10 +13,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/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 From 41ba20b763a85b5b2455bc758f2e45298b4a6370 Mon Sep 17 00:00:00 2001 From: this-Aditya Date: Fri, 8 Mar 2024 17:42:45 +0530 Subject: [PATCH 3/4] Updated dockerfile, kafka and confluent versions --- Dockerfile | 4 ++-- gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f2997bd..5b8016a 100644 --- a/Dockerfile +++ b/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 diff --git a/gradle.properties b/gradle.properties index f6588d4..5b818ad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,8 +10,8 @@ radarOauthClientVersion=0.8.0 jacksonVersion=2.14.1 slf4jVersion=2.0.12 log4j2Version=2.23.0 -kafkaVersion=2.8.1 -confluentVersion=6.2.0 +kafkaVersion=3.6.1 +confluentVersion=7.6.0 junitVersion=5.10.2 jedisVersion=5.1.2 grizzlyVersion=4.0.2 From 678d9c24bccbb5712d4bd783073c4cbbe0cad6e0 Mon Sep 17 00:00:00 2001 From: this-Aditya Date: Fri, 8 Mar 2024 18:17:23 +0530 Subject: [PATCH 4/4] Updated workflows --- .github/workflows/main.yml | 16 ++++++++-------- .github/workflows/release.yml | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fa9227a..44b8025 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: java-version: 17 - name: Cache - uses: actions/cache@v2.0.0 + uses: actions/cache@v3 with: # Cache gradle directories path: | @@ -56,10 +56,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/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 }} @@ -67,20 +67,20 @@ jobs: # 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/**') }} @@ -95,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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3a7267a..acb808b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: 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: | @@ -53,17 +53,17 @@ 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 }} @@ -71,14 +71,14 @@ jobs: # 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