Change logback version to 1.3.0-alpha4

- Change logback version in order to remove checker-framework
dependency.
- Change healthcheck script to sh (bash is unavailable in
container)
- Remove dl.bintray.com repository

Issue-ID: DCAEGEN2-2851
Signed-off-by: Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>
Change-Id: Id947029c719ac3b6fc3456dbd1d36e83964d8729

diff --git a/Changelog.md b/Changelog.md
index 204b60f..e84c717 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.9.0]
     - [DCAEGEN2-2420](https://jira.onap.org/browse/DCAEGEN2-2420) [INT-1864](https://jira.onap.org/browse/INT-1864) - Change openjdk baseOS img to integration-java11
     - [DCAEGEN2-2630] (https://jira.onap.org/browse/DCAEGEN2-2630) - Update SDK version to 1.8.4
+    - [DCAEGEN2-2851](https://jira.onap.org/browse/DCAEGEN2-2851) - Remove checker-framework from HV-VES dependencies
 
 ## [1.8.0] - 31/03/2021
     - [DCAEGEN2-2701](https://jira.onap.org/browse/DCAEGEN2-2701) - Add stndDefined domain and stndDefined routing

diff --git a/pom.xml b/pom.xml
index 0b9ab42..8ab14c6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
         <docker-maven-plugin.version>0.34.1</docker-maven-plugin.version>
         <guava.version>30.1.1-jre</guava.version>
-        <logback-classic.version>1.3.0-alpha5</logback-classic.version>
+        <logback-classic.version>1.3.0-alpha4</logback-classic.version>
         <slf4j-api.version>2.0.0-alpha1</slf4j-api.version>
         <reactor-bom.version>2020.0.5</reactor-bom.version>
         <kafka-clients.version>2.7.0</kafka-clients.version>
@@ -383,24 +383,10 @@
     </profiles>
 
     <pluginRepositories>
-        <pluginRepository>
-            <id>arturbosch-code-analysis</id>
-            <name>arturbosch-code-analysis (for detekt)</name>
-            <url>https://dl.bintray.com/arturbosch/code-analysis/</url>
-            <layout>default</layout>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-                <updatePolicy>never</updatePolicy>
-            </snapshots>
-        </pluginRepository>
         <pluginRepository>
             <id>kotlinx-repository</id>
             <name>kotlinx-repository</name>
-            <url>https://dl.bintray.com/kotlin/kotlinx/</url>
+            <url>https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven</url>
             <releases>
                 <enabled>true</enabled>
                 <updatePolicy>never</updatePolicy>
@@ -416,7 +402,7 @@
         <repository>
             <id>kotlinx-repository</id>
             <name>kotlinx-repository</name>
-            <url>https://dl.bintray.com/kotlin/kotlinx/</url>
+            <url>https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven/</url>
             <releases>
                 <enabled>true</enabled>
                 <updatePolicy>never</updatePolicy>

diff --git a/sources/hv-collector-main/src/main/docker/healthcheck.sh b/sources/hv-collector-main/src/main/docker/healthcheck.sh
index db62eec..b2f54e5 100755 (executable)
--- a/sources/hv-collector-main/src/main/docker/healthcheck.sh
+++ b/sources/hv-collector-main/src/main/docker/healthcheck.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 curl -f http://localhost:${VESHV_HEALTH_CHECK_API_PORT:-6060}/health/ready || exit 1
 nc -vz localhost ${VESHV_LISTEN_PORT:-6061} || exit 2