From 3732f6d6347225bdc66318e90c144af5d7a015f1 Mon Sep 17 00:00:00 2001 From: trisberg Date: Fri, 26 Sep 2025 10:51:01 -0400 Subject: [PATCH 1/4] add new batch 3.x samples for task and batch Signed-off-by: trisberg --- .github/workflows/ci-task-3.yml | 67 ++++ timestamp-batch-3/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.properties | 3 + timestamp-batch-3/README.adoc | 43 +++ .../build-timestamp-batch-image.sh | 6 + timestamp-batch-3/mvnw | 295 ++++++++++++++++++ timestamp-batch-3/mvnw.cmd | 189 +++++++++++ timestamp-batch-3/pom.xml | 113 +++++++ .../java/io/spring/BatchJobApplication.java | 58 ++++ .../TimestampBatchTaskConfiguration.java | 113 +++++++ .../TimestampBatchTaskProperties.java | 41 +++ .../spring-configuration-metadata.properties | 1 + .../src/main/resources/application.properties | 1 + .../io/spring/TimestampBatchTaskTests.java | 64 ++++ .../src/test/resources/application.properties | 2 + timestamp-task-3/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.properties | 3 + timestamp-task-3/README.adoc | 43 +++ timestamp-task-3/build-timestamp-image.sh | 6 + timestamp-task-3/mvnw | 295 ++++++++++++++++++ timestamp-task-3/mvnw.cmd | 189 +++++++++++ timestamp-task-3/pom.xml | 100 ++++++ .../io/spring/timestamp/TaskApplication.java | 68 ++++ .../timestamp/TimestampTaskProperties.java | 41 +++ .../spring-configuration-metadata.properties | 1 + .../src/main/resources/application.properties | 1 + .../timestamp/TaskApplicationTests.java | 71 +++++ .../TimestampTaskPropertiesTests.java | 77 +++++ .../src/test/resources/application.properties | 2 + 29 files changed, 1959 insertions(+) create mode 100644 .github/workflows/ci-task-3.yml create mode 100644 timestamp-batch-3/.gitignore create mode 100644 timestamp-batch-3/.mvn/wrapper/maven-wrapper.properties create mode 100644 timestamp-batch-3/README.adoc create mode 100755 timestamp-batch-3/build-timestamp-batch-image.sh create mode 100755 timestamp-batch-3/mvnw create mode 100644 timestamp-batch-3/mvnw.cmd create mode 100644 timestamp-batch-3/pom.xml create mode 100644 timestamp-batch-3/src/main/java/io/spring/BatchJobApplication.java create mode 100644 timestamp-batch-3/src/main/java/io/spring/configuration/TimestampBatchTaskConfiguration.java create mode 100644 timestamp-batch-3/src/main/java/io/spring/configuration/TimestampBatchTaskProperties.java create mode 100644 timestamp-batch-3/src/main/resources/META-INF/spring-configuration-metadata.properties create mode 100644 timestamp-batch-3/src/main/resources/application.properties create mode 100644 timestamp-batch-3/src/test/java/io/spring/TimestampBatchTaskTests.java create mode 100644 timestamp-batch-3/src/test/resources/application.properties create mode 100644 timestamp-task-3/.gitignore create mode 100644 timestamp-task-3/.mvn/wrapper/maven-wrapper.properties create mode 100644 timestamp-task-3/README.adoc create mode 100755 timestamp-task-3/build-timestamp-image.sh create mode 100755 timestamp-task-3/mvnw create mode 100644 timestamp-task-3/mvnw.cmd create mode 100644 timestamp-task-3/pom.xml create mode 100644 timestamp-task-3/src/main/java/io/spring/timestamp/TaskApplication.java create mode 100644 timestamp-task-3/src/main/java/io/spring/timestamp/TimestampTaskProperties.java create mode 100644 timestamp-task-3/src/main/resources/META-INF/spring-configuration-metadata.properties create mode 100644 timestamp-task-3/src/main/resources/application.properties create mode 100644 timestamp-task-3/src/test/java/io/spring/timestamp/TaskApplicationTests.java create mode 100644 timestamp-task-3/src/test/java/io/spring/timestamp/TimestampTaskPropertiesTests.java create mode 100644 timestamp-task-3/src/test/resources/application.properties diff --git a/.github/workflows/ci-task-3.yml b/.github/workflows/ci-task-3.yml new file mode 100644 index 00000000..4853e45a --- /dev/null +++ b/.github/workflows/ci-task-3.yml @@ -0,0 +1,67 @@ +name: CI-TASK-3 + +on: + # Called by UI + workflow_dispatch: + +jobs: + + timestamp-task-3: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Get the build version + id: buildversion + run: | + cd timestamp-task-3 + VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) + echo "BUILD_VERSION=$VERSION" >> $GITHUB_OUTPUT + echo "BUILD_VERSION=$VERSION" + cd .. + - uses: ./.github/actions/build-sample-app + with: + app-dir: 'timestamp-task-3' + mvn-build-commands: '-B clean install spring-boot:build-image' + artifactory-publish: ${{ inputs.maven-build-only != true }} + jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} + artifactory-repo-deploy-releases: 'libs-milestone-local' + docker-push: ${{ inputs.maven-build-only != true }} + docker-username: ${{ secrets.DOCKERHUB_USERNAME }} + docker-password: ${{ secrets.DOCKERHUB_TOKEN }} + java-version: '17' + docker-images: springcloudtask/timestamp-task:${{steps.buildversion.outputs.BUILD_VERSION}} + + timestamp-batch-3: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Get the build version + id: buildversion + run: | + cd timestamp-batch-3 + VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) + echo "BUILD_VERSION=$VERSION" >> $GITHUB_OUTPUT + echo "BUILD_VERSION=$VERSION" + cd .. + - uses: ./.github/actions/build-sample-app + with: + app-dir: 'timestamp-batch-3' + mvn-build-commands: '-B clean install spring-boot:build-image' + artifactory-publish: ${{ inputs.maven-build-only != true }} + jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} + artifactory-repo-deploy-releases: 'libs-milestone-local' + docker-push: ${{ inputs.maven-build-only != true }} + docker-username: ${{ secrets.DOCKERHUB_USERNAME }} + docker-password: ${{ secrets.DOCKERHUB_TOKEN }} + java-version: '17' + docker-images: springcloudtask/timestamp-batch-task:${{steps.buildversion.outputs.BUILD_VERSION}} + + completed: + runs-on: ubuntu-latest + needs: + - timestamp-task-3 + - timestamp-batch-3 + steps: + - name: 'Completed' + shell: bash + run: echo "::info ::completed" diff --git a/timestamp-batch-3/.gitignore b/timestamp-batch-3/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/timestamp-batch-3/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/timestamp-batch-3/.mvn/wrapper/maven-wrapper.properties b/timestamp-batch-3/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..c0bcafe9 --- /dev/null +++ b/timestamp-batch-3/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/timestamp-batch-3/README.adoc b/timestamp-batch-3/README.adoc new file mode 100644 index 00000000..ee606ec0 --- /dev/null +++ b/timestamp-batch-3/README.adoc @@ -0,0 +1,43 @@ += Spring Batch Job Task + +This is a Spring Cloud Task application that executes two simple Spring Batch Jobs. + +== Requirements + +* Java 17 or Above + +== Classes + +* BatchJobApplication - the Spring Boot Main Application + +== Build + +=== Build and test +[source,shell,indent=2] +---- +./mvnw clean install +---- + +=== Build Docker container + +[source,shell,indent=2] +---- +./mvnw spring-boot:build-image -Dspring-boot.build-image.imageName=spring/timestamp-batch-task:latest +---- + +== Run + +=== Command line +[source,shell,indent=2] +---- +java -jar target/timestamp-batch-task-3.0.0.jar +---- + +=== Docker +[source,shell,indent=2] +---- +docker run spring/timestamp-batch-task:latest +---- + +=== Properties +* *timestamp.format* - The timestamp format, "yyyy-MM-dd HH:mm:ss.SSS" by default. diff --git a/timestamp-batch-3/build-timestamp-batch-image.sh b/timestamp-batch-3/build-timestamp-batch-image.sh new file mode 100755 index 00000000..05db7032 --- /dev/null +++ b/timestamp-batch-3/build-timestamp-batch-image.sh @@ -0,0 +1,6 @@ +#!/bin/bash +if [ "$TIMESTAMP_BATCH_TASK_VERSION" = "" ]; then + TIMESTAMP_BATCH_TASK_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) +fi +./mvnw -o clean install -DskipTests +./mvnw -o spring-boot:build-image -DskipTests -Dspring-boot.build-image.imageName=springcloud/timestamp-batch-task:$TIMESTAMP_BATCH_TASK_VERSION diff --git a/timestamp-batch-3/mvnw b/timestamp-batch-3/mvnw new file mode 100755 index 00000000..bd8896bf --- /dev/null +++ b/timestamp-batch-3/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/timestamp-batch-3/mvnw.cmd b/timestamp-batch-3/mvnw.cmd new file mode 100644 index 00000000..92450f93 --- /dev/null +++ b/timestamp-batch-3/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/timestamp-batch-3/pom.xml b/timestamp-batch-3/pom.xml new file mode 100644 index 00000000..eaff6c5d --- /dev/null +++ b/timestamp-batch-3/pom.xml @@ -0,0 +1,113 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.5.6 + + + io.spring + timestamp-batch-task + 3.2.0 + timestamp-batch-task + Simple Timestamp sample. + + + 17 + 2025.0.0 + + + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.cloud + spring-cloud-starter-task + + + org.springframework.boot + spring-boot-starter-batch + + + org.springframework.boot + spring-boot-starter-actuator + + + org.postgresql + postgresql + runtime + + + org.mariadb.jdbc + mariadb-java-client + [3.1.2,) + + + com.h2database + h2 + [2.2,) + + + org.postgresql + postgresql + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-configuration-processor + true + + + io.micrometer + micrometer-core + + + io.micrometer + micrometer-observation + + + io.micrometer + micrometer-registry-prometheus + + + org.assertj + assertj-core + test + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + springcloudtask/${project.artifactId}:${project.version} + + + + + + + diff --git a/timestamp-batch-3/src/main/java/io/spring/BatchJobApplication.java b/timestamp-batch-3/src/main/java/io/spring/BatchJobApplication.java new file mode 100644 index 00000000..ff7fe109 --- /dev/null +++ b/timestamp-batch-3/src/main/java/io/spring/BatchJobApplication.java @@ -0,0 +1,58 @@ +/* + * Copyright 2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.spring; + +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.launch.JobLauncher; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.task.configuration.EnableTask; +import org.springframework.context.annotation.Bean; + +@EnableTask +@SpringBootApplication +public class BatchJobApplication { + + public static void main(String[] args) { + SpringApplication.run(BatchJobApplication.class, args); + } + + @Bean + public TimestampTask timestampTask(JobLauncher jobLauncher, Job job1, Job job2) { + return new TimestampTask(jobLauncher, job1, job2); + } + + public static class TimestampTask implements CommandLineRunner { + private final JobLauncher launcher; + private final Job job1; + private final Job job2; + + public TimestampTask(JobLauncher launcher, Job job1, Job job2) { + this.launcher = launcher; + this.job1 = job1; + this.job2 = job2; + } + + @Override + public void run(String... strings) throws Exception { + launcher.run(job1, new JobParameters()); + launcher.run(job2, new JobParameters()); + } + } +} diff --git a/timestamp-batch-3/src/main/java/io/spring/configuration/TimestampBatchTaskConfiguration.java b/timestamp-batch-3/src/main/java/io/spring/configuration/TimestampBatchTaskConfiguration.java new file mode 100644 index 00000000..11c60adf --- /dev/null +++ b/timestamp-batch-3/src/main/java/io/spring/configuration/TimestampBatchTaskConfiguration.java @@ -0,0 +1,113 @@ +/* + * Copyright 2021-2022 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.spring.configuration; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.configuration.support.DefaultBatchConfiguration; +import org.springframework.batch.core.job.builder.JobBuilder; +import org.springframework.batch.core.repository.JobRepository; +import org.springframework.batch.core.step.builder.StepBuilder; +import org.springframework.batch.core.step.tasklet.Tasklet; +import org.springframework.batch.repeat.RepeatStatus; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; +import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; +import org.springframework.transaction.PlatformTransactionManager; + +import javax.sql.DataSource; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Configuration +@EnableConfigurationProperties({ TimestampBatchTaskProperties.class }) +public class TimestampBatchTaskConfiguration extends DefaultBatchConfiguration { + + private static final Logger logger = LoggerFactory.getLogger(TimestampBatchTaskProperties.class); + + + @Value("${spring.batch.jdbc.table-prefix:BATCH_}") + private String tablePrefix; + + @Autowired + private TimestampBatchTaskProperties config; + + @Bean + @ConditionalOnProperty(name = "spring.datasource.driver-class-name", matchIfMissing = true, havingValue="matchonlyifmissing") + public DataSource dataSource() { + return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2) + .addScript("/org/springframework/batch/core/schema-h2.sql") + .generateUniqueName(true).build(); + } + + protected String getTablePrefix() { + return tablePrefix; + } + + /** + * Override default transaction isolation level 'ISOLATION_REPEATABLE_READ' which Oracle does not + * support. + */ + @Bean + public Step job1step1(JobRepository jobRepository, PlatformTransactionManager springCloudTaskTransactionManager) { + return new StepBuilder("job1step1", jobRepository) + .tasklet(getTasklet("Job1 was run with date %s"), springCloudTaskTransactionManager).build(); + } + + private Tasklet getTasklet(String format) { + return (contribution, chunkContext) -> { + DateFormat dateFormat = new SimpleDateFormat(config.getFormat()); + contribution.getStepExecution().getExecutionContext().put("ctx1", "exec1"); + contribution.getStepExecution().getJobExecution().getExecutionContext().put("job-ctx1", "exec-job1"); + logger.info("{}:{}", contribution.getStepExecution().getStepName(), contribution.getStepExecution().getExecutionContext()); + logger.info("{}:{}", contribution.getStepExecution().getJobExecution().getJobInstance().getJobName(), contribution.getStepExecution().getJobExecution().getExecutionContext()); + logger.info(String.format(format, dateFormat.format(new Date()))); + return RepeatStatus.FINISHED; + }; + } + + @Bean + public Job job1(JobRepository jobRepository, Step job1step1) { + return new JobBuilder("job1", jobRepository) + .start(job1step1) + .build(); + } + @Bean + public Step job2step1(JobRepository jobRepository, + PlatformTransactionManager springCloudTaskTransactionManager + ) { + return new StepBuilder("job2step1", jobRepository) + .tasklet(getTasklet("Job2 was run with date %s"), springCloudTaskTransactionManager) + .build(); + } + @Bean + public Job job2(JobRepository jobRepository, Step job2step1) { + return new JobBuilder("job2", jobRepository) + .start(job2step1) + .build(); + } + +} + diff --git a/timestamp-batch-3/src/main/java/io/spring/configuration/TimestampBatchTaskProperties.java b/timestamp-batch-3/src/main/java/io/spring/configuration/TimestampBatchTaskProperties.java new file mode 100644 index 00000000..d1f2c001 --- /dev/null +++ b/timestamp-batch-3/src/main/java/io/spring/configuration/TimestampBatchTaskProperties.java @@ -0,0 +1,41 @@ +/* + * Copyright 2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.spring.configuration; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.util.Assert; + +/** + * @author Glenn Renfro + */ +@ConfigurationProperties("timestamp") +public class TimestampBatchTaskProperties { + + /** + * The timestamp format, "yyyy-MM-dd HH:mm:ss.SSS" by default. + */ + private String format = "yyyy-MM-dd HH:mm:ss.SSS"; + + public String getFormat() { + Assert.hasText(format, "format must not be empty nor null"); + return format; + } + + public void setFormat(String format) { + this.format = format; + } +} diff --git a/timestamp-batch-3/src/main/resources/META-INF/spring-configuration-metadata.properties b/timestamp-batch-3/src/main/resources/META-INF/spring-configuration-metadata.properties new file mode 100644 index 00000000..92184d3f --- /dev/null +++ b/timestamp-batch-3/src/main/resources/META-INF/spring-configuration-metadata.properties @@ -0,0 +1 @@ +configuration-properties.classes=io.spring.configuration.TimestampBatchTaskProperties diff --git a/timestamp-batch-3/src/main/resources/application.properties b/timestamp-batch-3/src/main/resources/application.properties new file mode 100644 index 00000000..cd507fc5 --- /dev/null +++ b/timestamp-batch-3/src/main/resources/application.properties @@ -0,0 +1 @@ +logging.level.org.springframework.cloud.task=debug \ No newline at end of file diff --git a/timestamp-batch-3/src/test/java/io/spring/TimestampBatchTaskTests.java b/timestamp-batch-3/src/test/java/io/spring/TimestampBatchTaskTests.java new file mode 100644 index 00000000..2011722d --- /dev/null +++ b/timestamp-batch-3/src/test/java/io/spring/TimestampBatchTaskTests.java @@ -0,0 +1,64 @@ +/* + * Copyright 2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.spring; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.system.CapturedOutput; +import org.springframework.boot.test.system.OutputCaptureExtension; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Verifies that the Task Application outputs the correct Batch and Task log entries. + * + * @author Glenn Renfro + */ +@ExtendWith(OutputCaptureExtension.class) +@SpringBootTest(properties = "--timestamp.format=yyyy.......") +public class TimestampBatchTaskTests { + + @Test + public void testTimeStampApp(CapturedOutput capturedOutput) throws Exception { + final String TEST_DATE_DOTS = "......."; + final String CREATE_TASK_MESSAGE = "Creating: TaskExecution{executionId="; + final String UPDATE_TASK_MESSAGE = "Updating: TaskExecution with executionId=1 with the following"; + final String JOB1_MESSAGE = "Job1 was run with date "; + final String JOB2_MESSAGE = "Job2 was run with date "; + + String output = capturedOutput.toString(); + + assertThat(output).contains(TEST_DATE_DOTS); + assertThat(output).contains(CREATE_TASK_MESSAGE); + assertThat(output).contains(UPDATE_TASK_MESSAGE); + + assertThat(output).contains(JOB1_MESSAGE); + assertThat(output).contains(JOB2_MESSAGE); + } + + @SpringBootApplication + public static class TestTimestampBatchTaskApplication { + public static void main(String[] args) { + SpringApplication.run(TestTimestampBatchTaskApplication.class, args); + } + } + +} diff --git a/timestamp-batch-3/src/test/resources/application.properties b/timestamp-batch-3/src/test/resources/application.properties new file mode 100644 index 00000000..c5f7aa3f --- /dev/null +++ b/timestamp-batch-3/src/test/resources/application.properties @@ -0,0 +1,2 @@ +logging.level.org.springframework.cloud.task=DEBUG +spring.application.name=Demo Timestamp Task diff --git a/timestamp-task-3/.gitignore b/timestamp-task-3/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/timestamp-task-3/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/timestamp-task-3/.mvn/wrapper/maven-wrapper.properties b/timestamp-task-3/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..c0bcafe9 --- /dev/null +++ b/timestamp-task-3/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/timestamp-task-3/README.adoc b/timestamp-task-3/README.adoc new file mode 100644 index 00000000..a941c89c --- /dev/null +++ b/timestamp-task-3/README.adoc @@ -0,0 +1,43 @@ += Timestamp Task + +This is a Spring Cloud Task application that logs a timestamp. + +== Requirements + +* Java 8 or Above + +== Classes + +* TaskApplication - the Spring Boot Main Application + +== Build + +=== Build and test +[source,shell,indent=2] +---- +./mvnw clean install +---- + +=== Build Docker container + +[source,shell,indent=2] +---- +./mvnw spring-boot:build-image -Dspring-boot.build-image.imageName=spring/timestamp-task:latest +---- + +== Run + +=== Command line +[source,shell,indent=2] +---- +java -jar target/timestamp-task-2.0.0.jar +---- + +=== Docker +[source,shell,indent=2] +---- +docker run spring/timestamp-task:latest +---- + +=== Properties +* *timestamp.format* - The timestamp format, "yyyy-MM-dd HH:mm:ss.SSS" by default. diff --git a/timestamp-task-3/build-timestamp-image.sh b/timestamp-task-3/build-timestamp-image.sh new file mode 100755 index 00000000..606ddb11 --- /dev/null +++ b/timestamp-task-3/build-timestamp-image.sh @@ -0,0 +1,6 @@ +#!/bin/bash +if [ "$TIMESTAMP_TASK_VERSION" = "" ]; then + TIMESTAMP_TASK_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) +fi +./mvnw -o clean install -DskipTests +./mvnw -o spring-boot:build-image -DskipTests -Dspring-boot.build-image.imageName=springcloud/timestamp-task:$TIMESTAMP_TASK_VERSION diff --git a/timestamp-task-3/mvnw b/timestamp-task-3/mvnw new file mode 100755 index 00000000..bd8896bf --- /dev/null +++ b/timestamp-task-3/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/timestamp-task-3/mvnw.cmd b/timestamp-task-3/mvnw.cmd new file mode 100644 index 00000000..92450f93 --- /dev/null +++ b/timestamp-task-3/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/timestamp-task-3/pom.xml b/timestamp-task-3/pom.xml new file mode 100644 index 00000000..cee507b6 --- /dev/null +++ b/timestamp-task-3/pom.xml @@ -0,0 +1,100 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.5.6 + + + io.spring + timestamp-task + 3.2.0 + timestamp-task + Simple Timestamp sample. + + + 17 + 2025.0.0 + + + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.cloud + spring-cloud-starter-task + + + org.springframework.boot + spring-boot-starter-actuator + + + org.postgresql + postgresql + runtime + + + org.mariadb.jdbc + mariadb-java-client + [3.1.2,) + + + com.h2database + h2 + [2.2,) + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-configuration-processor + true + + + io.micrometer + micrometer-core + + + io.micrometer + micrometer-observation + + + io.micrometer + micrometer-registry-prometheus + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + springcloudtask/${project.artifactId}:${project.version} + + + + + + + diff --git a/timestamp-task-3/src/main/java/io/spring/timestamp/TaskApplication.java b/timestamp-task-3/src/main/java/io/spring/timestamp/TaskApplication.java new file mode 100644 index 00000000..ea9b14b1 --- /dev/null +++ b/timestamp-task-3/src/main/java/io/spring/timestamp/TaskApplication.java @@ -0,0 +1,68 @@ +/* + * Copyright 2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.spring.timestamp; + + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.task.configuration.EnableTask; +import org.springframework.context.annotation.Bean; + +/** + * Spring Boot Application that has tasks enabled. + */ +@EnableTask +@SpringBootApplication +@EnableConfigurationProperties({TimestampTaskProperties.class}) +public class TaskApplication { + + private static final Log logger = LogFactory.getLog(TaskApplication.class); + + public static void main(String[] args) { + SpringApplication.run(TaskApplication.class, args); + } + + @Bean + public TimestampTask timeStampTask() { + return new TimestampTask(); + } + + /** + * A commandline runner that prints a timestamp. + */ + public static class TimestampTask implements CommandLineRunner { + + @Autowired + private TimestampTaskProperties config; + + @Override + public void run(String... strings) throws Exception { + DateFormat dateFormat = new SimpleDateFormat(this.config.getFormat()); + logger.info(dateFormat.format(new Date())); + } + } +} diff --git a/timestamp-task-3/src/main/java/io/spring/timestamp/TimestampTaskProperties.java b/timestamp-task-3/src/main/java/io/spring/timestamp/TimestampTaskProperties.java new file mode 100644 index 00000000..470bd3e7 --- /dev/null +++ b/timestamp-task-3/src/main/java/io/spring/timestamp/TimestampTaskProperties.java @@ -0,0 +1,41 @@ +/* + * Copyright 2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.spring.timestamp; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.util.Assert; + +/** + * @author Glenn Renfro + */ +@ConfigurationProperties(prefix = "timestamp") +public class TimestampTaskProperties { + + /** + * The timestamp format, "yyyy-MM-dd HH:mm:ss.SSS" by default. + */ + private String format = "yyyy-MM-dd HH:mm:ss.SSS"; + + public String getFormat() { + Assert.hasText(this.format, "format must not be empty nor null"); + return this.format; + } + + public void setFormat(String format) { + this.format = format; + } +} diff --git a/timestamp-task-3/src/main/resources/META-INF/spring-configuration-metadata.properties b/timestamp-task-3/src/main/resources/META-INF/spring-configuration-metadata.properties new file mode 100644 index 00000000..72bb7276 --- /dev/null +++ b/timestamp-task-3/src/main/resources/META-INF/spring-configuration-metadata.properties @@ -0,0 +1 @@ +configuration-properties.classes=io.spring.timestamp.TimestampTaskProperties diff --git a/timestamp-task-3/src/main/resources/application.properties b/timestamp-task-3/src/main/resources/application.properties new file mode 100644 index 00000000..398a1dcf --- /dev/null +++ b/timestamp-task-3/src/main/resources/application.properties @@ -0,0 +1 @@ +logging.level.org.springframework.cloud.task=debug diff --git a/timestamp-task-3/src/test/java/io/spring/timestamp/TaskApplicationTests.java b/timestamp-task-3/src/test/java/io/spring/timestamp/TaskApplicationTests.java new file mode 100644 index 00000000..d712e37b --- /dev/null +++ b/timestamp-task-3/src/test/java/io/spring/timestamp/TaskApplicationTests.java @@ -0,0 +1,71 @@ +/* + * Copyright 2021-2025 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.spring.timestamp; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.test.system.CapturedOutput; +import org.springframework.boot.test.system.OutputCaptureExtension; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Verifies that the Task Application outputs the correct task log entries. + * + * @author Glenn Renfro + * @author Thomas Risberg + */ +@ExtendWith(OutputCaptureExtension.class) +public class TaskApplicationTests { + + + @Test + public void testTimeStampApp(CapturedOutput capturedOutput) throws Exception { + final String TEST_DATE_DOTS = "......."; + final String CREATE_TASK_MESSAGE = "Creating: TaskExecution{executionId="; + final String UPDATE_TASK_MESSAGE = "Updating: TaskExecution with executionId="; + final String EXIT_CODE_MESSAGE = "with the following {exitCode=0"; + String[] args = {"--timestamp.format=yyyy" + TEST_DATE_DOTS}; + + SpringApplication.run(TaskApplication.class, args); + + String output = capturedOutput.toString(); + assertThat(output.contains(TEST_DATE_DOTS)) + .as("Unable to find the timestamp: " + output).isTrue(); + assertThat(output.contains(CREATE_TASK_MESSAGE)) + .as("Test results do not show create task message: " + output).isTrue(); + assertThat(output.contains(UPDATE_TASK_MESSAGE)) + .as("Test results do not show success message: " + output).isTrue(); + assertThat(output.contains(EXIT_CODE_MESSAGE)) + .as("Test results have incorrect exit code: " + output).isTrue(); + + String taskTitle = "'Demo Timestamp Task'"; + Pattern pattern = Pattern.compile(taskTitle); + Matcher matcher = pattern.matcher(output); + int count = 0; + while (matcher.find()) { + count++; + } + assertThat(count).as("The number of task titles did not match expected: ") + .isEqualTo(1); + } +} diff --git a/timestamp-task-3/src/test/java/io/spring/timestamp/TimestampTaskPropertiesTests.java b/timestamp-task-3/src/test/java/io/spring/timestamp/TimestampTaskPropertiesTests.java new file mode 100644 index 00000000..a7a6ba35 --- /dev/null +++ b/timestamp-task-3/src/test/java/io/spring/timestamp/TimestampTaskPropertiesTests.java @@ -0,0 +1,77 @@ +/* + * Copyright 2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.spring.timestamp; + + +import org.junit.jupiter.api.Test; + +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.test.util.TestPropertyValues; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.context.annotation.Configuration; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + +/** + * @author Glenn Renfro + */ +public class TimestampTaskPropertiesTests { + + @Test + public void testEmptyFormat() { + AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); + TestPropertyValues testPropertyValues = TestPropertyValues.of("timestamp.format:"); + testPropertyValues.applyTo(context); + context.register(Conf.class); + context.refresh(); + TimestampTaskProperties properties = context + .getBean(TimestampTaskProperties.class); + assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> { + properties.getFormat(); + }); + } + + @Test + public void testFormatDefault() { + AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); + context.register(Conf.class); + context.refresh(); + TimestampTaskProperties properties = context + .getBean(TimestampTaskProperties.class); + assertThat(properties.getFormat()).as("result does not match default format.") + .isEqualTo("yyyy-MM-dd HH:mm:ss.SSS"); + } + + @Test + public void testFormatSet() { + final String FORMAT = "yyyy"; + AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); + context.register(Conf.class); + context.refresh(); + TimestampTaskProperties properties = context + .getBean(TimestampTaskProperties.class); + properties.setFormat(FORMAT); + assertThat(properties.getFormat()).as("result does not match established format.") + .isEqualTo(FORMAT); + } + + @Configuration(proxyBeanMethods = false) + @EnableConfigurationProperties(TimestampTaskProperties.class) + static class Conf { + } +} diff --git a/timestamp-task-3/src/test/resources/application.properties b/timestamp-task-3/src/test/resources/application.properties new file mode 100644 index 00000000..c5f7aa3f --- /dev/null +++ b/timestamp-task-3/src/test/resources/application.properties @@ -0,0 +1,2 @@ +logging.level.org.springframework.cloud.task=DEBUG +spring.application.name=Demo Timestamp Task From 631358508f07369c48f59c828ebf2311bdebf1e1 Mon Sep 17 00:00:00 2001 From: trisberg Date: Fri, 26 Sep 2025 10:57:35 -0400 Subject: [PATCH 2/4] add ci-task-3 to ci-pr Signed-off-by: trisberg --- .github/workflows/ci-pr.yml | 9 +++++++++ .github/workflows/ci-task-3.yml | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index f7ab9468..be9a1cdb 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -13,3 +13,12 @@ jobs: JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} + build-task-3: + name: Call Build Workflow for task-3 + uses: ./.github/workflows/ci-task-3.yml + with: + maven-build-only: true + secrets: + JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} diff --git a/.github/workflows/ci-task-3.yml b/.github/workflows/ci-task-3.yml index 4853e45a..16cec3d8 100644 --- a/.github/workflows/ci-task-3.yml +++ b/.github/workflows/ci-task-3.yml @@ -4,6 +4,25 @@ on: # Called by UI workflow_dispatch: + # Called by the CI PR workflow (invokes main CI but skips publish and push) + workflow_call: + inputs: + maven-build-only: + type: boolean + description: Skip Artifactory publish and Docker push for all apps + required: false + default: false + secrets: + JF_ARTIFACTORY_SPRING: + description: 'encoded JFrog server id configuration' + required: false + DOCKER_USERNAME: + description: 'docker username' + required: false + DOCKER_TOKEN: + description: 'docker password' + required: false + jobs: timestamp-task-3: From 784f21efb905a55a6f04325f0fead95d609f8751 Mon Sep 17 00:00:00 2001 From: trisberg Date: Fri, 26 Sep 2025 12:05:12 -0400 Subject: [PATCH 3/4] bump maven version to 3.8.9 Signed-off-by: trisberg --- .github/actions/build-sample-app/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-sample-app/action.yml b/.github/actions/build-sample-app/action.yml index 18aba560..639cb2c1 100644 --- a/.github/actions/build-sample-app/action.yml +++ b/.github/actions/build-sample-app/action.yml @@ -63,7 +63,7 @@ runs: - uses: jvalkeal/setup-maven@v1 with: - maven-version: 3.8.8 + maven-version: 3.8.9 maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/' - name: Maven build From 046254c8db055dc13a0a057376fefe65ea5c6f9a Mon Sep 17 00:00:00 2001 From: trisberg Date: Fri, 26 Sep 2025 12:07:54 -0400 Subject: [PATCH 4/4] bump maven wrapper version to 3.9.11 Signed-off-by: trisberg --- .../dataflow-server-21x/.mvn/wrapper/maven-wrapper.properties | 2 +- .../dataflow-server-22x/.mvn/wrapper/maven-wrapper.properties | 2 +- .../dataflow-server-25x/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- dataflow-template-example/.mvn/wrapper/maven-wrapper.properties | 2 +- .../batch/batchsamples/.mvn/wrapper/maven-wrapper.properties | 2 +- .../batchsamples/billrun/.mvn/wrapper/maven-wrapper.properties | 2 +- .../billsetuptask/.mvn/wrapper/maven-wrapper.properties | 2 +- .../file-to-jdbc/.mvn/wrapper/maven-wrapper.properties | 2 +- .../kinesisconsumer/.mvn/wrapper/maven-wrapper.properties | 2 +- .../kinesisproducer/.mvn/wrapper/maven-wrapper.properties | 2 +- .../scdf-alert-webhook/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../usage-cost-logger/.mvn/wrapper/maven-wrapper.properties | 2 +- .../usage-cost-processor/.mvn/wrapper/maven-wrapper.properties | 2 +- .../usage-detail-sender/.mvn/wrapper/maven-wrapper.properties | 2 +- function-samples/.mvn/wrapper/maven-wrapper.properties | 2 +- .../http-click-ingest/.mvn/wrapper/maven-wrapper.properties | 2 +- .../http-region-ingest/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../uppercase-processor/.mvn/wrapper/maven-wrapper.properties | 2 +- javadsl/.mvn/wrapper/maven-wrapper.properties | 2 +- kafka-samples/.mvn/wrapper/maven-wrapper.properties | 2 +- kafka-samples/http-ingest/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../kstreams-word-count/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../demo-processor/.mvn/wrapper/maven-wrapper.properties | 2 +- .../stream-apps/demo-sink/.mvn/wrapper/maven-wrapper.properties | 2 +- .../demo-source/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../http-click-ingest/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../http-region-ingest/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../http-click-ingest/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../http-region-ingest/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../http-click-ingest/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../http-region-ingest/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../http-purchase-orders/.mvn/wrapper/maven-wrapper.properties | 2 +- .../ticktock-3/.mvn/wrapper/maven-wrapper.properties | 2 +- .../multi-input-log-kafka/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- multi-io-samples/ticktock/.mvn/wrapper/maven-wrapper.properties | 2 +- .../multi-input-log-kafka/.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../.mvn/wrapper/maven-wrapper.properties | 2 +- .../scdf-app-customer/.mvn/wrapper/maven-wrapper.properties | 2 +- .../scdf-app-kitchen/.mvn/wrapper/maven-wrapper.properties | 2 +- .../scdf-app-waitron/.mvn/wrapper/maven-wrapper.properties | 2 +- .../scdf-app-customer/.mvn/wrapper/maven-wrapper.properties | 2 +- .../scdf-app-kitchen/.mvn/wrapper/maven-wrapper.properties | 2 +- .../scdf-app-waitron/.mvn/wrapper/maven-wrapper.properties | 2 +- scenario-task-3/.mvn/wrapper/maven-wrapper.properties | 2 +- scenario-task/.mvn/wrapper/maven-wrapper.properties | 2 +- security-ldap-uaa-example/.mvn/wrapper/maven-wrapper.properties | 2 +- .../log-sink/.mvn/wrapper/maven-wrapper.properties | 2 +- .../time-source/.mvn/wrapper/maven-wrapper.properties | 2 +- timestamp-batch-2.0.x/.mvn/wrapper/maven-wrapper.properties | 2 +- timestamp-batch-3.0.x/.mvn/wrapper/maven-wrapper.properties | 2 +- timestamp-task-2.0.x/.mvn/wrapper/maven-wrapper.properties | 2 +- timestamp-task-3.0.x/.mvn/wrapper/maven-wrapper.properties | 2 +- transition-sample/.mvn/wrapper/maven-wrapper.properties | 2 +- 86 files changed, 86 insertions(+), 86 deletions(-) diff --git a/custom-dataflow-builds/dataflow-server-21x/.mvn/wrapper/maven-wrapper.properties b/custom-dataflow-builds/dataflow-server-21x/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/custom-dataflow-builds/dataflow-server-21x/.mvn/wrapper/maven-wrapper.properties +++ b/custom-dataflow-builds/dataflow-server-21x/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/custom-dataflow-builds/dataflow-server-22x/.mvn/wrapper/maven-wrapper.properties b/custom-dataflow-builds/dataflow-server-22x/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/custom-dataflow-builds/dataflow-server-22x/.mvn/wrapper/maven-wrapper.properties +++ b/custom-dataflow-builds/dataflow-server-22x/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/custom-dataflow-builds/dataflow-server-25x/.mvn/wrapper/maven-wrapper.properties b/custom-dataflow-builds/dataflow-server-25x/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/custom-dataflow-builds/dataflow-server-25x/.mvn/wrapper/maven-wrapper.properties +++ b/custom-dataflow-builds/dataflow-server-25x/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-migrate-schedules/.mvn/wrapper/maven-wrapper.properties b/dataflow-migrate-schedules/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/dataflow-migrate-schedules/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-migrate-schedules/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-template-example/.mvn/wrapper/maven-wrapper.properties b/dataflow-template-example/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/dataflow-template-example/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-template-example/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-website/batch-developer-guides/batch/batchsamples/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/batch-developer-guides/batch/batchsamples/.mvn/wrapper/maven-wrapper.properties index f74cae6c..f4e19ca8 100644 --- a/dataflow-website/batch-developer-guides/batch/batchsamples/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/batch-developer-guides/batch/batchsamples/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-website/batch-developer-guides/batch/batchsamples/billrun/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/batch-developer-guides/batch/batchsamples/billrun/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/dataflow-website/batch-developer-guides/batch/batchsamples/billrun/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/batch-developer-guides/batch/batchsamples/billrun/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-website/batch-developer-guides/batch/batchsamples/billsetuptask/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/batch-developer-guides/batch/batchsamples/billsetuptask/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/dataflow-website/batch-developer-guides/batch/batchsamples/billsetuptask/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/batch-developer-guides/batch/batchsamples/billsetuptask/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-website/recipes/file-ingest/file-to-jdbc/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/recipes/file-ingest/file-to-jdbc/.mvn/wrapper/maven-wrapper.properties index f74cae6c..f4e19ca8 100644 --- a/dataflow-website/recipes/file-ingest/file-to-jdbc/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/recipes/file-ingest/file-to-jdbc/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-website/recipes/kinesisdemo/kinesisconsumer/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/recipes/kinesisdemo/kinesisconsumer/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/dataflow-website/recipes/kinesisdemo/kinesisconsumer/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/recipes/kinesisdemo/kinesisconsumer/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-website/recipes/kinesisdemo/kinesisproducer/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/recipes/kinesisdemo/kinesisproducer/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/dataflow-website/recipes/kinesisdemo/kinesisproducer/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/recipes/kinesisdemo/kinesisproducer/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-website/recipes/scaling/scdf-alert-webhook/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/recipes/scaling/scdf-alert-webhook/.mvn/wrapper/maven-wrapper.properties index f74cae6c..f4e19ca8 100644 --- a/dataflow-website/recipes/scaling/scdf-alert-webhook/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/recipes/scaling/scdf-alert-webhook/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-logger/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-logger/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-logger/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-logger/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-processor/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-processor/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-processor/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-processor/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/.mvn/wrapper/maven-wrapper.properties +++ b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/function-samples/.mvn/wrapper/maven-wrapper.properties b/function-samples/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/function-samples/.mvn/wrapper/maven-wrapper.properties +++ b/function-samples/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/function-samples/http-click-ingest/.mvn/wrapper/maven-wrapper.properties b/function-samples/http-click-ingest/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/function-samples/http-click-ingest/.mvn/wrapper/maven-wrapper.properties +++ b/function-samples/http-click-ingest/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/function-samples/http-region-ingest/.mvn/wrapper/maven-wrapper.properties b/function-samples/http-region-ingest/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/function-samples/http-region-ingest/.mvn/wrapper/maven-wrapper.properties +++ b/function-samples/http-region-ingest/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/function-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.properties b/function-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/function-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.properties +++ b/function-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/function-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties b/function-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/function-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties +++ b/function-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/function-samples/transform-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties b/function-samples/transform-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/function-samples/transform-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties +++ b/function-samples/transform-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/function-samples/uppercase-processor/.mvn/wrapper/maven-wrapper.properties b/function-samples/uppercase-processor/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/function-samples/uppercase-processor/.mvn/wrapper/maven-wrapper.properties +++ b/function-samples/uppercase-processor/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/javadsl/.mvn/wrapper/maven-wrapper.properties b/javadsl/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/javadsl/.mvn/wrapper/maven-wrapper.properties +++ b/javadsl/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/kafka-samples/.mvn/wrapper/maven-wrapper.properties b/kafka-samples/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/kafka-samples/.mvn/wrapper/maven-wrapper.properties +++ b/kafka-samples/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/kafka-samples/http-ingest/.mvn/wrapper/maven-wrapper.properties b/kafka-samples/http-ingest/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/kafka-samples/http-ingest/.mvn/wrapper/maven-wrapper.properties +++ b/kafka-samples/http-ingest/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/kafka-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.properties b/kafka-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/kafka-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.properties +++ b/kafka-samples/kstreams-join-user-clicks-and-region/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/kafka-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties b/kafka-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/kafka-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties +++ b/kafka-samples/kstreams-log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/kafka-samples/kstreams-word-count/.mvn/wrapper/maven-wrapper.properties b/kafka-samples/kstreams-word-count/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/kafka-samples/kstreams-word-count/.mvn/wrapper/maven-wrapper.properties +++ b/kafka-samples/kstreams-word-count/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/monitoring-samples/spring-cloud-dataflow-prometheus-service-discovery/.mvn/wrapper/maven-wrapper.properties b/monitoring-samples/spring-cloud-dataflow-prometheus-service-discovery/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/monitoring-samples/spring-cloud-dataflow-prometheus-service-discovery/.mvn/wrapper/maven-wrapper.properties +++ b/monitoring-samples/spring-cloud-dataflow-prometheus-service-discovery/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/monitoring-samples/stream-apps/demo-processor/.mvn/wrapper/maven-wrapper.properties b/monitoring-samples/stream-apps/demo-processor/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/monitoring-samples/stream-apps/demo-processor/.mvn/wrapper/maven-wrapper.properties +++ b/monitoring-samples/stream-apps/demo-processor/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/monitoring-samples/stream-apps/demo-sink/.mvn/wrapper/maven-wrapper.properties b/monitoring-samples/stream-apps/demo-sink/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/monitoring-samples/stream-apps/demo-sink/.mvn/wrapper/maven-wrapper.properties +++ b/monitoring-samples/stream-apps/demo-sink/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/monitoring-samples/stream-apps/demo-source/.mvn/wrapper/maven-wrapper.properties b/monitoring-samples/stream-apps/demo-source/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/monitoring-samples/stream-apps/demo-source/.mvn/wrapper/maven-wrapper.properties +++ b/monitoring-samples/stream-apps/demo-source/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/monitoring-samples/task-apps/task-demo-metrics-influxdb/.mvn/wrapper/maven-wrapper.properties b/monitoring-samples/task-apps/task-demo-metrics-influxdb/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-influxdb/.mvn/wrapper/maven-wrapper.properties +++ b/monitoring-samples/task-apps/task-demo-metrics-influxdb/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/monitoring-samples/task-apps/task-demo-metrics-prometheus/.mvn/wrapper/maven-wrapper.properties b/monitoring-samples/task-apps/task-demo-metrics-prometheus/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-prometheus/.mvn/wrapper/maven-wrapper.properties +++ b/monitoring-samples/task-apps/task-demo-metrics-prometheus/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/monitoring-samples/task-apps/task-demo-metrics-wavefront/.mvn/wrapper/maven-wrapper.properties b/monitoring-samples/task-apps/task-demo-metrics-wavefront/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-wavefront/.mvn/wrapper/maven-wrapper.properties +++ b/monitoring-samples/task-apps/task-demo-metrics-wavefront/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/.mvn/wrapper/maven-wrapper.properties index f74cae6c..f4e19ca8 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/.mvn/wrapper/maven-wrapper.properties index f74cae6c..f4e19ca8 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/http-click-ingest/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/http-click-ingest/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/http-click-ingest/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/http-click-ingest/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/http-clicks-and-region-ingest/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/http-clicks-and-region-ingest/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/http-clicks-and-region-ingest/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/http-clicks-and-region-ingest/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/http-region-ingest/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/http-region-ingest/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/http-region-ingest/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/http-region-ingest/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/user-clicks-per-region-processor/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/user-clicks-per-region-processor/.mvn/wrapper/maven-wrapper.properties index f74cae6c..f4e19ca8 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/user-clicks-per-region-processor/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-2.x/user-clicks-per-region-processor/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/http-clicks-and-region-ingest/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region/http-clicks-and-region-ingest/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/http-clicks-and-region-ingest/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/http-clicks-and-region-ingest/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/purchase-orders/http-purchase-orders-3/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/purchase-orders/http-purchase-orders-3/.mvn/wrapper/maven-wrapper.properties index f74cae6c..f4e19ca8 100644 --- a/multi-io-samples/purchase-orders/http-purchase-orders-3/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/purchase-orders/http-purchase-orders-3/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/multi-io-samples/purchase-orders/http-purchase-orders/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/purchase-orders/http-purchase-orders/.mvn/wrapper/maven-wrapper.properties index 5c73b684..6883c0cf 100644 --- a/multi-io-samples/purchase-orders/http-purchase-orders/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/purchase-orders/http-purchase-orders/.mvn/wrapper/maven-wrapper.properties @@ -1,3 +1,3 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/multi-io-samples/ticktock-3/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/ticktock-3/.mvn/wrapper/maven-wrapper.properties index f74cae6c..f4e19ca8 100644 --- a/multi-io-samples/ticktock-3/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/ticktock-3/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/multi-io-samples/ticktock-3/multi-input-log-kafka/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/ticktock-3/multi-input-log-kafka/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/multi-io-samples/ticktock-3/multi-input-log-kafka/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/ticktock-3/multi-input-log-kafka/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/multi-io-samples/ticktock-3/multi-input-log-rabbit/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/ticktock-3/multi-input-log-rabbit/.mvn/wrapper/maven-wrapper.properties index 9a9978a4..de062d54 100644 --- a/multi-io-samples/ticktock-3/multi-input-log-rabbit/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/ticktock-3/multi-input-log-rabbit/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/multi-io-samples/ticktock-3/multi-output-time-kafka/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/ticktock-3/multi-output-time-kafka/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/ticktock-3/multi-output-time-kafka/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/ticktock-3/multi-output-time-kafka/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/ticktock-3/multi-output-time-rabbit/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/ticktock-3/multi-output-time-rabbit/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/ticktock-3/multi-output-time-rabbit/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/ticktock-3/multi-output-time-rabbit/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/ticktock/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/ticktock/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/ticktock/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/ticktock/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/ticktock/multi-input-log-kafka/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/ticktock/multi-input-log-kafka/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/ticktock/multi-input-log-kafka/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/ticktock/multi-input-log-kafka/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/ticktock/multi-input-log-rabbit/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/ticktock/multi-input-log-rabbit/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/ticktock/multi-input-log-rabbit/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/ticktock/multi-input-log-rabbit/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/ticktock/multi-output-time-kafka/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/ticktock/multi-output-time-kafka/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/ticktock/multi-output-time-kafka/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/ticktock/multi-output-time-kafka/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/multi-io-samples/ticktock/multi-output-time-rabbit/.mvn/wrapper/maven-wrapper.properties b/multi-io-samples/ticktock/multi-output-time-rabbit/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/multi-io-samples/ticktock/multi-output-time-rabbit/.mvn/wrapper/maven-wrapper.properties +++ b/multi-io-samples/ticktock/multi-output-time-rabbit/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/restaurant-stream-apps-3/scdf-app-customer/.mvn/wrapper/maven-wrapper.properties b/restaurant-stream-apps-3/scdf-app-customer/.mvn/wrapper/maven-wrapper.properties index f74cae6c..f4e19ca8 100644 --- a/restaurant-stream-apps-3/scdf-app-customer/.mvn/wrapper/maven-wrapper.properties +++ b/restaurant-stream-apps-3/scdf-app-customer/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/restaurant-stream-apps-3/scdf-app-kitchen/.mvn/wrapper/maven-wrapper.properties b/restaurant-stream-apps-3/scdf-app-kitchen/.mvn/wrapper/maven-wrapper.properties index f74cae6c..f4e19ca8 100644 --- a/restaurant-stream-apps-3/scdf-app-kitchen/.mvn/wrapper/maven-wrapper.properties +++ b/restaurant-stream-apps-3/scdf-app-kitchen/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/restaurant-stream-apps-3/scdf-app-waitron/.mvn/wrapper/maven-wrapper.properties b/restaurant-stream-apps-3/scdf-app-waitron/.mvn/wrapper/maven-wrapper.properties index f74cae6c..f4e19ca8 100644 --- a/restaurant-stream-apps-3/scdf-app-waitron/.mvn/wrapper/maven-wrapper.properties +++ b/restaurant-stream-apps-3/scdf-app-waitron/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip diff --git a/restaurant-stream-apps/scdf-app-customer/.mvn/wrapper/maven-wrapper.properties b/restaurant-stream-apps/scdf-app-customer/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/restaurant-stream-apps/scdf-app-customer/.mvn/wrapper/maven-wrapper.properties +++ b/restaurant-stream-apps/scdf-app-customer/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/restaurant-stream-apps/scdf-app-kitchen/.mvn/wrapper/maven-wrapper.properties b/restaurant-stream-apps/scdf-app-kitchen/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/restaurant-stream-apps/scdf-app-kitchen/.mvn/wrapper/maven-wrapper.properties +++ b/restaurant-stream-apps/scdf-app-kitchen/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/restaurant-stream-apps/scdf-app-waitron/.mvn/wrapper/maven-wrapper.properties b/restaurant-stream-apps/scdf-app-waitron/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/restaurant-stream-apps/scdf-app-waitron/.mvn/wrapper/maven-wrapper.properties +++ b/restaurant-stream-apps/scdf-app-waitron/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/scenario-task-3/.mvn/wrapper/maven-wrapper.properties b/scenario-task-3/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/scenario-task-3/.mvn/wrapper/maven-wrapper.properties +++ b/scenario-task-3/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/scenario-task/.mvn/wrapper/maven-wrapper.properties b/scenario-task/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/scenario-task/.mvn/wrapper/maven-wrapper.properties +++ b/scenario-task/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/security-ldap-uaa-example/.mvn/wrapper/maven-wrapper.properties b/security-ldap-uaa-example/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/security-ldap-uaa-example/.mvn/wrapper/maven-wrapper.properties +++ b/security-ldap-uaa-example/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/spring-cloud-stream-function-bindings/log-sink/.mvn/wrapper/maven-wrapper.properties b/spring-cloud-stream-function-bindings/log-sink/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/spring-cloud-stream-function-bindings/log-sink/.mvn/wrapper/maven-wrapper.properties +++ b/spring-cloud-stream-function-bindings/log-sink/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/spring-cloud-stream-function-bindings/time-source/.mvn/wrapper/maven-wrapper.properties b/spring-cloud-stream-function-bindings/time-source/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/spring-cloud-stream-function-bindings/time-source/.mvn/wrapper/maven-wrapper.properties +++ b/spring-cloud-stream-function-bindings/time-source/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/timestamp-batch-2.0.x/.mvn/wrapper/maven-wrapper.properties b/timestamp-batch-2.0.x/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/timestamp-batch-2.0.x/.mvn/wrapper/maven-wrapper.properties +++ b/timestamp-batch-2.0.x/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/timestamp-batch-3.0.x/.mvn/wrapper/maven-wrapper.properties b/timestamp-batch-3.0.x/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/timestamp-batch-3.0.x/.mvn/wrapper/maven-wrapper.properties +++ b/timestamp-batch-3.0.x/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/timestamp-task-2.0.x/.mvn/wrapper/maven-wrapper.properties b/timestamp-task-2.0.x/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/timestamp-task-2.0.x/.mvn/wrapper/maven-wrapper.properties +++ b/timestamp-task-2.0.x/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/timestamp-task-3.0.x/.mvn/wrapper/maven-wrapper.properties b/timestamp-task-3.0.x/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/timestamp-task-3.0.x/.mvn/wrapper/maven-wrapper.properties +++ b/timestamp-task-3.0.x/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file diff --git a/transition-sample/.mvn/wrapper/maven-wrapper.properties b/transition-sample/.mvn/wrapper/maven-wrapper.properties index f77b5d12..ae75c936 100644 --- a/transition-sample/.mvn/wrapper/maven-wrapper.properties +++ b/transition-sample/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.zip \ No newline at end of file +distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip \ No newline at end of file