Merge pull request #518 from RADAR-base/release-2.0.2

Release 2.0.2

Author: blootsvoets

.snyk

@@ -0,0 +1,10 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.22.1
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JAVA-IONETTY-1042268:
+    - '*':
+        reason: Cannot resolve for Azure
+        expires: 2023-01-02T13:02:10.075Z
+        created: 2022-01-03T13:02:10.078Z
+patch: {}

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.0.0 -o /output /myTopic
+docker run --rm -t --network s3 -v "$PWD/output:/output" radarbase/radar-output-restructure:2.0.2 -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.0.0.tar.gz -C /usr/local --strip-components=1
+sudo tar -xzf build/distributions/radar-output-restructure-2.0.2.tar.gz -C /usr/local --strip-components=1
 ```
 
 Now the `radar-output-restructure` command should be available.

build.gradle.kts

@@ -15,7 +15,7 @@ plugins {
 }
 
 group = "org.radarbase"
-version = "2.0.1"
+version = "2.0.2"
 
 repositories {
     mavenCentral()
@@ -52,7 +52,7 @@ dependencies {
     implementation(kotlin("reflect"))
 
     val jacksonVersion: String by project
-    implementation("com.fasterxml.jackson:jackson-bom:$jacksonVersion")
+    api(platform("com.fasterxml.jackson:jackson-bom:$jacksonVersion"))
     implementation("com.fasterxml.jackson.core:jackson-databind")
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-csv")
@@ -78,7 +78,10 @@ dependencies {
     }
 
     val azureStorageVersion: String by project
-    implementation("com.azure:azure-storage-blob:$azureStorageVersion")
+    implementation("com.azure:azure-storage-blob:$azureStorageVersion") {
+        val nettyVersion: String by project
+        implementation(platform("io.netty:netty-bom:$nettyVersion"))
+    }
     val opencsvVersion: String by project
     implementation("com.opencsv:opencsv:$opencsvVersion")
 
@@ -101,6 +104,12 @@ dependencies {
 
     val dokkaVersion: String by project
     dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:$dokkaVersion")
+
+    val jsoupVersion: String by project
+    dokkaPlugin("org.jsoup:jsoup:$jsoupVersion")
+    dokkaRuntime("org.jsoup:jsoup:$jsoupVersion")
+    dokkaPlugin(platform("com.fasterxml.jackson:jackson-bom:$jacksonVersion"))
+    dokkaRuntime(platform("com.fasterxml.jackson:jackson-bom:$jacksonVersion"))
 }
 
 application {
@@ -290,5 +299,5 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
 }
 
 tasks.wrapper {
-    gradleVersion = "7.3.1"
+    gradleVersion = "7.3.3"
 }

gradle.properties

@@ -1,25 +1,27 @@
 kotlin.code.style=official
 
 kotlinVersion=1.6.10
-dokkaVersion=1.6.0
+dokkaVersion=1.6.10
 dockerComposeVersion=0.14.11
-dependencyUpdateVersion=0.39.0
+dependencyUpdateVersion=0.40.0
 nexusPublishVersion=1.1.0
+jsoupVersion=1.14.3
 
 avroVersion=1.11.0
 snappyVersion=1.1.8.4
-jacksonVersion=2.13.0
+jacksonVersion=2.13.1
 jCommanderVersion=1.81
 almworksVersion=1.1.2
 minioVersion=8.3.4
 guavaVersion=31.0.1-jre
 opencsvVersion=5.5.2
 okhttpVersion=4.9.3
-jedisVersion=3.7.1
+jedisVersion=4.0.1
 slf4jVersion=1.7.32
-log4jVersion=2.16.0
+log4jVersion=2.17.1
 azureStorageVersion=12.14.2
+nettyVersion=4.1.72.Final
 
 junitVersion=5.8.2
 mockitoKotlinVersion=4.0.0
-radarSchemasVersion=0.7.4
+radarSchemasVersion=0.7.5

gradle/wrapper/gradle-wrapper.properties

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