Merge branch 'oura-impl' of https://github.com/RADAR-base/RADAR-REST-Connector into oura-impl

Author: mpgxvii

Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=$BUILDPLATFORM gradle:8.1-jdk11 as builder
+FROM --platform=$BUILDPLATFORM gradle:8.4-jdk11 as builder
 
 RUN mkdir /code
 WORKDIR /code
@@ -32,7 +32,7 @@ COPY ./kafka-connect-fitbit-source/src/ /code/kafka-connect-fitbit-source/src
 
 RUN gradle jar
 
-FROM confluentinc/cp-kafka-connect-base:7.4.0
+FROM confluentinc/cp-kafka-connect-base:7.5.0
 
 MAINTAINER Joris Borgdorff <[email protected]>
 

build.gradle.kts

@@ -16,6 +16,7 @@ description = "Kafka connector for REST API sources"
 
 radarRootProject {
     projectVersion.set(Versions.project)
+    gradleVersion.set(Versions.wrapper)
 }
 
 subprojects {

buildSrc/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.8.10"
+    kotlin("jvm") version "1.9.10"
 }
 
 repositories {

buildSrc/src/main/kotlin/Versions.kt

@@ -1,19 +1,20 @@
 object Versions {
-    const val project = "0.4.1"
+    const val project = "0.4.2-SNAPSHOT"
 
     const val java = 11
-    const val kotlin = "1.6.0"
+    const val kotlin = "1.9.10"
+    const val wrapper = "8.4"
 
-    const val radarCommons = "1.1.0"
-    const val confluent = "7.4.0"
+    const val radarCommons = "1.1.1"
+    const val confluent = "7.5.0"
     const val kafka = "$confluent-ce"
     const val avro = "1.11.0"
 
     // From image
     const val jackson = "2.14.2"
 
     const val log4j2 = "2.20.0"
-    const val slf4j = "2.0.7"
+    const val slf4j = "2.0.9"
 
     const val okhttp = "4.11.0"
 
@@ -23,7 +24,6 @@ object Versions {
     const val radarSchemas = "0.8.5"
 
     const val junit = "5.9.3"
-    const val hamcrest = "2.2"
     const val wiremock = "2.27.2"
     const val mockito = "5.3.1"
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -7,17 +7,5 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         mavenCentral()
-        maven(url = "https://maven.pkg.github.com/radar-base/radar-commons") {
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                    ?: extra.properties["gpr.user"] as? String
-                    ?: extra.properties["public.gpr.user"] as? String
-                password = System.getenv("GITHUB_TOKEN")
-                    ?: extra.properties["gpr.token"] as? String
-                    ?: (extra.properties["public.gpr.token"] as? String)?.let {
-                        java.util.Base64.getDecoder().decode(it).decodeToString()
-                    }
-            }
-        }
     }
 }