diff --git a/.claude/settings.local.json b/.claude/settings.local.json new file mode 100644 index 0000000..6c70376 --- /dev/null +++ b/.claude/settings.local.json @@ -0,0 +1,7 @@ +{ + "permissions": { + "allow": [ + "Bash(./gradlew build:*)" + ] + } +} diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0dfe9c6..84fb5d0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,17 +1,22 @@ -##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ -## ~ -## Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ -## ~ -## Maintainers: ~ -## Wim Bast, Tom Brus, Ronald Krijgsheld ~ -## Contributors: ~ -## Arjan Kok, Carel Bast ~ -##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +## (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ +## ~ +## Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ +## ~ +## Maintainers: ~ +## Wim Bast, Tom Brus ~ +## ~ +## Contributors: ~ +## Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +## --------------------------------------------------------------------------------------------------------------------- ~ +## In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +## Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +## but also our friend. "He will live on in many of the lines of code you see below." ~ +##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ version: 2 updates: diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5d0c6ed..d4ce2e8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -4,22 +4,22 @@ on: [ push, workflow_dispatch ] jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, '[no-ci]')" env: ALLREP_TOKEN: "${{secrets.ALLREP_TOKEN}}" TOKEN: "${{secrets.ALLREP_TOKEN}}" CI: "true" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v5 with: - java-version: 17 + java-version: 21 distribution: zulu ################################################################################ - name: "build" - run: ./gradlew --info --scan + run: ./gradlew --info diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..0512041 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 9676474..746e890 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 20af976..5a5792d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,24 +1,29 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ defaultTasks("mvgCorrector", "test", "publish", "mvgTagger") plugins { `java-library` `maven-publish` - id("org.modelingvalue.gradle.mvgplugin") version "1.1.3" + id("org.modelingvalue.gradle.mvgplugin") version "2.3.21" } publishing { publications { diff --git a/gradle.properties b/gradle.properties index 88cc923..03009fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,26 @@ -##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ -## ~ -## Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ -## ~ -## Maintainers: ~ -## Wim Bast, Tom Brus, Ronald Krijgsheld ~ -## Contributors: ~ -## Arjan Kok, Carel Bast ~ -##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +## (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ +## ~ +## Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ +## ~ +## Maintainers: ~ +## Wim Bast, Tom Brus ~ +## ~ +## Contributors: ~ +## Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +## --------------------------------------------------------------------------------------------------------------------- ~ +## In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +## Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +## but also our friend. "He will live on in many of the lines of code you see below." ~ +##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # suppress inspection "UnusedProperty" for whole file group=org.modelingvalue artifact=sync-proxy -version=4.0.0 -version_java=17 +version=6.0.0 +version_java=21 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..b1b8ef5 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..df6a6ad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +networkTimeout=10000 +retries=0 +retryBackOffMs=500 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..b9bb139 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -133,22 +132,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -165,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -193,16 +198,19 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index f127cfd..24c62d5 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -21,11 +23,12 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -42,13 +45,13 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -56,36 +59,24 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/settings.gradle.kts b/settings.gradle.kts index fa352ab..4587402 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,22 +1,23 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ rootProject.name = "sync-proxy" include() - -plugins { - id("com.gradle.enterprise") version ("3.5") -} diff --git a/src/main/java/org/modelingvalue/syncproxy/ClientInfo.java b/src/main/java/org/modelingvalue/syncproxy/ClientInfo.java index e3a2cec..5dfbb87 100644 --- a/src/main/java/org/modelingvalue/syncproxy/ClientInfo.java +++ b/src/main/java/org/modelingvalue/syncproxy/ClientInfo.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.syncproxy; diff --git a/src/main/java/org/modelingvalue/syncproxy/DclareRouter.java b/src/main/java/org/modelingvalue/syncproxy/DclareRouter.java index 5d1b5ac..b66f89e 100644 --- a/src/main/java/org/modelingvalue/syncproxy/DclareRouter.java +++ b/src/main/java/org/modelingvalue/syncproxy/DclareRouter.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.syncproxy; diff --git a/src/main/java/org/modelingvalue/syncproxy/SocketReader.java b/src/main/java/org/modelingvalue/syncproxy/SocketReader.java index dd49512..c935121 100644 --- a/src/main/java/org/modelingvalue/syncproxy/SocketReader.java +++ b/src/main/java/org/modelingvalue/syncproxy/SocketReader.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.syncproxy; diff --git a/src/main/java/org/modelingvalue/syncproxy/WorkDaemon.java b/src/main/java/org/modelingvalue/syncproxy/WorkDaemon.java index a7f6cc9..15b0872 100644 --- a/src/main/java/org/modelingvalue/syncproxy/WorkDaemon.java +++ b/src/main/java/org/modelingvalue/syncproxy/WorkDaemon.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.syncproxy; diff --git a/src/test/java/org/modelingvalue/syncproxy/MainTest.java b/src/test/java/org/modelingvalue/syncproxy/MainTest.java index f413021..3cbdf63 100644 --- a/src/test/java/org/modelingvalue/syncproxy/MainTest.java +++ b/src/test/java/org/modelingvalue/syncproxy/MainTest.java @@ -1,17 +1,22 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ -// ~ -// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ -// ~ -// Maintainers: ~ -// Wim Bast, Tom Brus, Ronald Krijgsheld ~ -// Contributors: ~ -// Arjan Kok, Carel Bast ~ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ +// ~ +// Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ +// ~ +// Maintainers: ~ +// Wim Bast, Tom Brus ~ +// ~ +// Contributors: ~ +// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +// --------------------------------------------------------------------------------------------------------------------- ~ +// In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +// but also our friend. "He will live on in many of the lines of code you see below." ~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ package org.modelingvalue.syncproxy; diff --git a/src/test/resources/simplelogger.properties b/src/test/resources/simplelogger.properties index 7451851..f5b25a5 100644 --- a/src/test/resources/simplelogger.properties +++ b/src/test/resources/simplelogger.properties @@ -1,17 +1,22 @@ -##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~ -## ~ -## Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ -## ~ -## Maintainers: ~ -## Wim Bast, Tom Brus, Ronald Krijgsheld ~ -## Contributors: ~ -## Arjan Kok, Carel Bast ~ -##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +## (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~ +## ~ +## Licensed under the GNU Lesser General Public License v3.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://choosealicense.com/licenses/lgpl-3.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. ~ +## ~ +## Maintainers: ~ +## Wim Bast, Tom Brus ~ +## ~ +## Contributors: ~ +## Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~ +## --------------------------------------------------------------------------------------------------------------------- ~ +## In Memory of Ronald Krijgsheld, 1972 - 2023 ~ +## Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~ +## but also our friend. "He will live on in many of the lines of code you see below." ~ +##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # suppress inspection "UnusedProperty" for whole file org.slf4j.simpleLogger.logFile = System.err