Merge pull request #527 from RADAR-base/release-2.2.1

Release 2.2.1

Author: blootsvoets

README.md

@@ -70,7 +70,7 @@ When upgrading to version 0.6.0 from version 0.5.x or earlier, please follow the
 This package is available as docker image [`radarbase/radar-output-restructure`](https://hub.docker.com/r/radarbase/radar-output-restructure). The entrypoint of the image is the current application. So in all the commands listed in usage, replace `radar-output-restructure` with for example:
 
 ```shell
-docker run --rm -t --network s3 -v "$PWD/output:/output" radarbase/radar-output-restructure:2.2.0 -o /output /myTopic
+docker run --rm -t --network s3 -v "$PWD/output:/output" radarbase/radar-output-restructure:2.2.1 -o /output /myTopic
 ```
 
 ## Command line usage
@@ -182,7 +182,7 @@ This package requires at least Java JDK 8. Build the distribution with
 and install the package into `/usr/local` with for example
 ```shell
 sudo mkdir -p /usr/local
-sudo tar -xzf build/distributions/radar-output-restructure-2.2.0.tar.gz -C /usr/local --strip-components=1
+sudo tar -xzf build/distributions/radar-output-restructure-2.2.1.tar.gz -C /usr/local --strip-components=1
 ```
 
 Now the `radar-output-restructure` command should be available.

build.gradle.kts

@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "org.radarbase"
-version = "2.2.0"
+version = "2.2.1"
 
 repositories {
     mavenCentral()
@@ -314,5 +314,5 @@ ktlint {
 }
 
 tasks.wrapper {
-    gradleVersion = "7.4.2"
+    gradleVersion = "7.5.1"
 }

gradle.properties

@@ -1,28 +1,28 @@
 kotlin.code.style=official
 
-kotlinVersion=1.6.21
-dokkaVersion=1.6.21
-dockerComposeVersion=0.16.4
+kotlinVersion=1.7.10
+dokkaVersion=1.7.10
+dockerComposeVersion=0.16.8
 dependencyUpdateVersion=0.42.0
 nexusPublishVersion=1.1.0
-jsoupVersion=1.15.1
+jsoupVersion=1.15.2
 
-coroutinesVersion=1.6.1
-avroVersion=1.11.0
+coroutinesVersion=1.6.4
+avroVersion=1.11.1
 snappyVersion=1.1.8.4
 jacksonVersion=2.13.3
 jCommanderVersion=1.82
 almworksVersion=1.1.2
-minioVersion=8.4.1
+minioVersion=8.4.3
 guavaVersion=31.1-jre
 opencsvVersion=5.6
-okhttpVersion=4.9.3
+okhttpVersion=4.10.0
 jedisVersion=4.2.3
 slf4jVersion=1.7.36
-log4jVersion=2.17.2
-azureStorageVersion=12.16.1
-nettyVersion=4.1.77.Final
+log4jVersion=2.18.0
+azureStorageVersion=12.19.0
+nettyVersion=4.1.79.Final
 
-junitVersion=5.8.2
+junitVersion=5.9.0
 mockitoKotlinVersion=4.0.0
 radarSchemasVersion=0.7.9

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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