summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--csit/plans/healthcheck/setup.sh6
-rwxr-xr-xdependencies/pom.xml16
-rw-r--r--odlsli/odlsli-alpine/pom.xml2
-rw-r--r--pom.xml4
4 files changed, 23 insertions, 5 deletions
diff --git a/csit/plans/healthcheck/setup.sh b/csit/plans/healthcheck/setup.sh
index 327aba21..5e4b7a78 100644
--- a/csit/plans/healthcheck/setup.sh
+++ b/csit/plans/healthcheck/setup.sh
@@ -55,7 +55,7 @@ chmod +x docker-compose
# WAIT 5 minutes maximum and check karaf.log for readiness every 10 seconds
-TIME_OUT=300
+TIME_OUT=360
INTERVAL=10
TIME=0
while [ "$TIME" -lt "$TIME_OUT" ]; do
@@ -74,9 +74,13 @@ done
if [ "$TIME" -ge "$TIME_OUT" ]; then
echo TIME OUT: karaf session not started in $TIME_OUT seconds, setup failed
+ echo "karaf.log follows:"
+ docker exec ccsdk_odlsli_container cat /opt/opendaylight/data/log/karaf.log
exit 1;
fi
+echo "*TRACE* bundle list : $(docker exec -i ccsdk_odlsli_container /opt/opendaylight/current/bin/client bundle:list)"
+
num_bundles=$(docker exec -i ccsdk_odlsli_container /opt/opendaylight/current/bin/client bundle:list | tail -1 | cut -d' ' -f1)
if [ "$num_bundles" -ge 333 ]; then
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 01778ffc..d3919e58 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -95,6 +95,11 @@
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.1</version>
+ </dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
@@ -131,6 +136,10 @@
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
<artifactId>jersey-guava</artifactId>
@@ -151,6 +160,11 @@
<groupId>org.glassfish.jersey.security</groupId>
<artifactId>oauth1-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20201115</version>
+ </dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
@@ -202,7 +216,7 @@
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
- <version>2.11.0</version>
+ <version>2.16</version>
</dependency>
</dependencies>
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 900fb09b..7cbc2389 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -18,7 +18,7 @@
</organization>
<properties>
- <base.image.name>onap/ccsdk-odl-sulfur-alpine-image</base.image.name>
+ <base.image.name>onap/ccsdk-odl-chlorine-alpine-image</base.image.name>
<image.name>onap/ccsdk-odlsli-alpine-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
diff --git a/pom.xml b/pom.xml
index f9fd01c4..b5325d91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>oparent</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
@@ -31,7 +31,7 @@
<properties>
<application.name>distribution</application.name>
- <ccsdk.sli.version>1.6.1</ccsdk.sli.version>
+ <ccsdk.sli.version>1.6.2</ccsdk.sli.version>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.distribution.version>${project.version}</ccsdk.distribution.version>