Merge pull request #101 from RADAR-base/release-0.4.1

Release 0.4.1

Author: blootsvoets

.editorconfig

@@ -13,6 +13,5 @@ indent_size = 2
 ij_continuation_indent_size = 4
 max_line_length=100
 
-[{*.gradle, *.py}]
+[*.{gradle,py,kt,kts}]
 indent_size = 4
-ij_continuation_indent_size = 8

.env

@@ -0,0 +1 @@
+CONFLUENT_VERSION=7.4.0

.github/workflows/main.yml

@@ -20,25 +20,16 @@ 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@v3
 
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
+          distribution: temurin
           java-version: 11
 
-      - 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 }}-gradle-${{ hashFiles('gradlew', '**/*.gradle', 'gradle.properties', 'gradle/**') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
-      # Compile the code
       - name: Compile code
         run: ./gradlew assemble
 
@@ -53,25 +44,26 @@ 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@v3
 
       - name: Docker build parameters
         id: docker_params
         run: |
-          echo "::set-output name=has_docker_login::${{ secrets.DOCKERHUB_USERNAME != ''  && secrets.DOCKERHUB_TOKEN != '' }}"
-          if [ "${{ github.event_name == 'pull_request' }}" = "true" ]; then
-            echo "::set-output name=push::false"
-            echo "::set-output name=load::true"
-            echo "::set-output name=platforms::linux/amd64"
+          HAS_DOCKER_LOGIN=${{ secrets.DOCKERHUB_USERNAME != ''  && secrets.DOCKERHUB_TOKEN != '' }}
+          echo "has_docker_login=$HAS_DOCKER_LOGIN" >> $GITHUB_OUTPUT
+          if [ "${{ github.event_name == 'pull_request' }}" = "true" ] || [ "$HAS_DOCKER_LOGIN" = "false" ]; then
+            echo "push=false" >> $GITHUB_OUTPUT
+            echo "load=true" >> $GITHUB_OUTPUT
+            echo "platforms=linux/amd64" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=push::true"
-            echo "::set-output name=load::false"
-            echo "::set-output name=platforms::linux/amd64,linux/arm64"
+            echo "push=true" >> $GITHUB_OUTPUT
+            echo "load=false" >> $GITHUB_OUTPUT
+            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
           fi
 
       - name: Cache Docker layers
         id: cache_buildx
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ steps.docker_params.outputs.push }}-${{ hashFiles('**/Dockerfile', '**/*.gradle', 'gradle.properties', '.dockerignore', '*/src/main/**', 'docker/**') }}
@@ -81,24 +73,24 @@ jobs:
 
       - name: Login to Docker Hub
         if: steps.docker_params.outputs.has_docker_login == 'true'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         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 parameters
         id: cache-parameters
@@ -110,8 +102,9 @@ jobs:
           fi
 
       - name: Build docker
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
+          context: .
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: ${{ steps.cache-parameters.outputs.cache-to }}
           platforms: ${{ steps.docker_params.outputs.platforms }}
@@ -134,8 +127,11 @@ jobs:
       - name: Inspect docker image
         run: |
           docker image inspect ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }}
-          docker run --rm ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }} curl --help
+          docker run --rm ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }} curl --version
+
 
+      # https://github.com/docker/build-push-action/issues/252
+      # https://github.com/moby/buildkit/issues/1896
       - name: Move docker build cache
         if: steps.cache_buildx.outputs.cache-hit != 'true'
         run: |

.github/workflows/release.yml

@@ -16,13 +16,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@v3
+      - uses: actions/setup-java@v3
         with:
+          distribution: temurin
           java-version: 11
 
       - name: Gradle cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           # Cache gradle directories
           path: |
@@ -51,33 +52,34 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # 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@v2
         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:
+          context: .
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.docker_meta.outputs.tags }}

Dockerfile

@@ -12,17 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gradle:7.2-jdk11 as builder
+FROM --platform=$BUILDPLATFORM gradle:8.1-jdk11 as builder
 
 RUN mkdir /code
 WORKDIR /code
 
 ENV GRADLE_USER_HOME=/code/.gradlecache \
-  GRADLE_OPTS="-Dorg.gradle.vfs.watch=false"
+  GRADLE_OPTS="-Dorg.gradle.vfs.watch=false -Djdk.lang.Process.launchMechanism=vfork"
 
-COPY ./build.gradle ./settings.gradle ./gradle.properties /code/
-COPY kafka-connect-rest-source/build.gradle /code/kafka-connect-rest-source/
-COPY kafka-connect-fitbit-source/build.gradle /code/kafka-connect-fitbit-source/
+COPY buildSrc /code/buildSrc
+COPY ./build.gradle.kts ./settings.gradle.kts ./gradle.properties /code/
+COPY kafka-connect-rest-source/build.gradle.kts /code/kafka-connect-rest-source/
+COPY kafka-connect-fitbit-source/build.gradle.kts /code/kafka-connect-fitbit-source/
 
 RUN gradle downloadDependencies copyDependencies
 
@@ -31,13 +32,14 @@ COPY ./kafka-connect-fitbit-source/src/ /code/kafka-connect-fitbit-source/src
 
 RUN gradle jar
 
-FROM confluentinc/cp-kafka-connect-base:6.2.0-3-ubi8
+FROM confluentinc/cp-kafka-connect-base:7.4.0
 
 MAINTAINER Joris Borgdorff <[email protected]>
 
 LABEL description="Kafka REST API Source connector"
 
-ENV CONNECT_PLUGIN_PATH=/usr/share/java/kafka-connect/plugins
+ENV CONNECT_PLUGIN_PATH="/usr/share/java/kafka-connect/plugins" \
+  WAIT_FOR_KAFKA="1"
 
 # To isolate the classpath from the plugin path as recommended
 COPY --from=builder /code/kafka-connect-rest-source/build/third-party/*.jar ${CONNECT_PLUGIN_PATH}/kafka-connect-rest-source/
@@ -48,7 +50,7 @@ COPY --from=builder /code/kafka-connect-rest-source/build/libs/*.jar ${CONNECT_P
 COPY --from=builder /code/kafka-connect-fitbit-source/build/libs/*.jar ${CONNECT_PLUGIN_PATH}/kafka-connect-fitbit-source/
 
 # Load topics validator
-COPY ./docker/kafka-wait /usr/bin/kafka-wait
+COPY  --chown=appuser:appuser ./docker/kafka-wait /usr/bin/kafka-wait
 
 # Load modified launcher
-COPY ./docker/launch /etc/confluent/docker/launch
+COPY  --chown=appuser:appuser ./docker/launch /etc/confluent/docker/launch

build.gradle

@@ -0,0 +1,25 @@
+import org.radarbase.gradle.plugin.radarKotlin
+
+plugins {
+    id("org.radarbase.radar-root-project") version Versions.radarCommons
+    id("org.radarbase.radar-dependency-management") version Versions.radarCommons
+    id("org.radarbase.radar-kotlin") version Versions.radarCommons apply false
+}
+
+description = "Kafka connector for REST API sources"
+
+radarRootProject {
+    projectVersion.set(Versions.project)
+}
+
+subprojects {
+    apply(plugin = "org.radarbase.radar-kotlin")
+
+    radarKotlin {
+        javaVersion.set(Versions.java)
+        kotlinVersion.set(Versions.kotlin)
+        slf4jVersion.set(Versions.slf4j)
+        log4j2Version.set(Versions.log4j2)
+        junitVersion.set(Versions.junit)
+    }
+}

build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+    kotlin("jvm") version "1.8.10"
+}
+
+repositories {
+    mavenCentral()
+}

buildSrc/build.gradle.kts

@@ -0,0 +1,28 @@
+object Versions {
+    const val project = "0.4.1"
+
+    const val java = 11
+    const val kotlin = "1.8.21"
+
+    const val radarCommons = "1.0.0"
+    const val confluent = "7.4.0"
+    const val kafka = "$confluent-ce"
+
+    // From image
+    const val jackson = "2.14.2"
+
+    const val log4j2 = "2.20.0"
+    const val slf4j = "2.0.7"
+
+    const val okhttp = "4.11.0"
+
+    const val managementPortal = "2.0.0"
+
+    const val firebaseAdmin = "9.1.0"
+    const val radarSchemas = "0.8.3"
+
+    const val junit = "5.9.3"
+    const val hamcrest = "2.2"
+    const val wiremock = "2.27.2"
+    const val mockito = "5.3.1"
+}