diff --git a/.gitignore b/.gitignore index c2b74c8c..7edfa81f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ HELP.md .gradle build/ -!gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ @@ -41,6 +40,7 @@ out/ ### Java binaries ### *.jar +!gradle/wrapper/gradle-wrapper.jar ### UME specific connector configs ### ume*.sh diff --git a/deploy/deploy-connectors.sh b/deploy/deploy-connectors.sh old mode 100644 new mode 100755 index 2577f210..cc8b047b --- a/deploy/deploy-connectors.sh +++ b/deploy/deploy-connectors.sh @@ -1,35 +1,9 @@ #!/bin/sh - -#curl -X POST \ -# http://localhost:8083/connectors \ -# -H 'Content-Type: application/json' \ -# -H 'Accept: application/json' \ -# -d '{ -# "name": "onkostar-meldung-connector", -# "config": { -# "tasks.max": "1", -# "connector.class": "io.confluent.connect.jdbc.JdbcSourceConnector", -# "connection.url": "jdbc:oracle:thin:@//oracle2:1521/COGN12", -# "connection.user": "DWH_ROUTINE", -# "connection.password": "devPassword", -# "schema.pattern": "DWH_ROUTINE", -# "topic.prefix": "onkostar.MELDUNG", -# "query": "SELECT * FROM (SELECT * FROM STG_ONKOSTAR_LKR_MELDUNG) o", -# "mode": "incrementing", -# "incrementing.column.name": "ID", -# "validate.non.null": "true", -# "numeric.mapping": "best_fit", -# "transforms": "ValueToKey", -# "transforms.ValueToKey.type": "org.apache.kafka.connect.transforms.ValueToKey", -# "transforms.ValueToKey.fields": "ID" -# } -#}' - curl -X POST \ - http://localhost:8083/connectors \ - -H 'Content-Type: application/json' \ - -H 'Accept: application/json' \ - -d '{ + http://localhost:8083/connectors \ + -H 'Content-Type: application/json' \ + -H 'Accept: application/json' \ + -d '{ "name": "onkostar-meldung-export-connector", "config": { "tasks.max": "1", @@ -49,31 +23,3 @@ curl -X POST \ "transforms.ValueToKey.fields": "ID" } }' - -# Typ -1 entspricht Arbeitsversion und kann daher im Connector herausgefiltert werden - -#curl -X POST \ -# http://localhost:8083/connectors \ -# -H 'Content-Type: application/json' \ -# -H 'Accept: application/json' \ -# -d '{ -# "name": "onkostar-export-connector", -# "config": { -# "tasks.max": "1", -# "connector.class": "io.confluent.connect.jdbc.JdbcSourceConnector", -# "connection.url": "jdbc:oracle:thin:@//oracle2:1521/COGN12", -# "connection.user": "DWH_ROUTINE", -# "connection.password": "devPassword", -# "schema.pattern": "DWH_ROUTINE", -# "topic.prefix": "onkostar.EXPORT", -# "query": "SELECT * FROM (SELECT * FROM STG_ONKOSTAR_LKR_EXPORT) o", -# "mode": "incrementing", -# "incrementing.column.name": "ID", -# "validate.non.null": "true", -# "numeric.mapping": "best_fit", -# "transforms": "ValueToKey", -# "transforms.ValueToKey.type": "org.apache.kafka.connect.transforms.ValueToKey", -# "transforms.ValueToKey.fields": "ID" -# } -#}' - diff --git a/deploy/down.sh b/deploy/down.sh old mode 100644 new mode 100755 diff --git a/deploy/resetTopics.sh b/deploy/resetTopics.sh old mode 100644 new mode 100755 diff --git a/deploy/up.sh b/deploy/up.sh old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..7f93135c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 744c64d1..3fa8f862 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d42..1aa94a42 100755 --- a/gradlew +++ b/gradlew @@ -83,10 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# 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"' +# 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 @@ -133,10 +131,13 @@ 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. @@ -144,7 +145,7 @@ 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 @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | 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 @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# 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. + +# 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, 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" \