- fix issues sonar warning

smp-docker/images/build-docker-images.sh

@@ -70,23 +70,23 @@ echo ""
  validateAndPrepareArtefacts() {
    
   # check oracle database
-  if [[ ! -f "${ORACLE_ARTEFACTS}/${ORACLE_DB_FILE}" ]]
+  if [[ ! -f "${ORACLE_ARTEFACTS}/Oracle/OracleDatabase/11.2.0.2/${ORACLE_DB_FILE}" ]]
   then
-    echo "Oracle database artefacts '${ORACLE_ARTEFACTS}/${ORACLE_DB_FILE}' not found."
+    echo "Oracle database artefacts '${ORACLE_ARTEFACTS}/Oracle/OracleDatabase/11.2.0.2/${ORACLE_DB_FILE}' not found."
     exit 1;
   else
     # copy artefact to docker build folder
-    cp "${ORACLE_ARTEFACTS}/${ORACLE_DB_FILE}"  ./oracle/oracle-db-11.2.0.2/
+    cp "${ORACLE_ARTEFACTS}/Oracle/OracleDatabase/11.2.0.2/${ORACLE_DB_FILE}"  ./oracle/oracle-db-11.2.0.2/
   fi
 
   # check server JDK
-  if [[ ! -f "${ORACLE_ARTEFACTS}/${SERVER_JDK_FILE}" ]]
+  if [[ ! -f "${ORACLE_ARTEFACTS}/Oracle/Java/${SERVER_JDK_FILE}" ]]
   then
-    echo "Server JDK artefacts '${ORACLE_ARTEFACTS}/${SERVER_JDK_FILE}' not found."
+    echo "Server JDK artefacts '${ORACLE_ARTEFACTS}/Oracle/Java/${SERVER_JDK_FILE}' not found."
     exit 1;
   else
     # copy artefact to docker build folder
-    cp "${ORACLE_ARTEFACTS}/${SERVER_JDK_FILE}" ./oracle/OracleJava/java-8/
+    cp "${ORACLE_ARTEFACTS}/Oracle/Java/${SERVER_JDK_FILE}" ./oracle/OracleJava/java-8/
   fi
 
  # check weblogic 

smp-docker/images/tomcat-mysql-smp-sml/Dockerfile

@@ -92,7 +92,7 @@ RUN apt-get update \
    && sed -i -e "s/127.0.0.1/0.0.0.0/g" /etc/mysql/mysql.conf.d/mysqld.cnf   \
 # image is also used for code coverage report
     && mkdir /opt/jacoco  \
-    && curl -o /opt/jacoco/jacoco-agent.jar http://central.maven.org/maven2/org/jacoco/org.jacoco.agent/$JACOCO_VERSION/org.jacoco.agent-$JACOCO_VERSION-runtime.jar \
+    && curl -o /opt/jacoco/jacoco-agent.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/$JACOCO_VERSION/org.jacoco.agent-$JACOCO_VERSION-runtime.jar \
     && mkdir /opt/smlconf \
     && mkdir /opt/smlconf/bind 
 # enable native TLS on tomcat  

smp-docker/images/tomcat-mysql-smp-sml/README.md

@@ -18,7 +18,7 @@ url: http://localhost:8080/smp
 Database client connection (for testing and debugging )
 url: jdbc:mysql://localhost:3306/smp
 Username: smp
-Password:  smp
+Password: smp
 
 ## Volume (-v /opt/dockerdata/sml:/data)
 Mysql database files and tomcat configuration (and logs) can be externalized for experimenting with different SMP settings.

smp-docker/images/tomcat-mysql-smp-sml/entrypoint.sh

@@ -25,7 +25,9 @@ fi
 
 init_tomcat() {
   # add java code coverage angent to image
-  JAVA_OPTS="-javaagent:/opt/jacoco/jacoco-agent.jar=output=tcpserver,address=*,port=6901 $JAVA_OPTS"
+  if [[ -e /opt/jacoco/jacoco-agent.jar ]]; then
+    JAVA_OPTS="-javaagent:/opt/jacoco/jacoco-agent.jar=output=tcpserver,address=*,port=6901 $JAVA_OPTS"
+  fi
   # add allow encoded slashes and disable scheme for proxy
   JAVA_OPTS="$JAVA_OPTS -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -Djdk.http.auth.tunneling.disabledSchemes="
   export  JAVA_OPTS