summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extra/docker/clamp/docker-compose.yml4
-rw-r--r--pom.xml30
-rw-r--r--src/main/resources/boot-message.txt24
-rw-r--r--src/test/java/org/onap/clamp/clds/it/config/SdcControllersConfigurationItCase.java2
-rw-r--r--src/test/java/org/onap/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java2
-rw-r--r--src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java2
-rw-r--r--src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java2
-rw-r--r--src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java2
8 files changed, 34 insertions, 34 deletions
diff --git a/extra/docker/clamp/docker-compose.yml b/extra/docker/clamp/docker-compose.yml
index 81cac25cb..3a06212ae 100644
--- a/extra/docker/clamp/docker-compose.yml
+++ b/extra/docker/clamp/docker-compose.yml
@@ -8,7 +8,7 @@ services:
ports:
- "2443:2443"
db:
- image: mariadb:10.4.7
+ image: mariadb:10.5.4
volumes:
- "/var/lib/mysql"
- "../mariadb/conf1:/etc/mysql/conf.d:ro"
@@ -26,7 +26,7 @@ services:
env_file:
- clamp.env
ports:
- - "8443:8443"
+ - "10443:8443"
third-party-proxy:
image: python:2-slim
diff --git a/pom.xml b/pom.xml
index cf1068cae..46d9068a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,8 +76,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<eelf.core.version>1.0.0</eelf.core.version>
- <camel.version>2.25.0</camel.version>
- <springboot.version>2.2.6.RELEASE</springboot.version>
+ <camel.version>2.25.2</camel.version>
+ <springboot.version>2.2.9.RELEASE</springboot.version>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -327,10 +327,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -437,10 +433,6 @@
<version>2.2</version>
</dependency>
<dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -510,6 +502,12 @@
<groupId>org.onap.sdc.sdc-tosca</groupId>
<artifactId>sdc-tosca</artifactId>
<version>1.5.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
@@ -552,6 +550,12 @@
<artifactId>docker-java-core</artifactId>
<version>3.2.1</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
@@ -938,7 +942,7 @@
<apiVersion>1.35</apiVersion>
<images>
<image>
- <name>docker.io/mariadb:10.3.12</name>
+ <name>docker.io/mariadb:10.5.4</name>
<alias>mariadb</alias>
<run>
<env>
@@ -952,8 +956,8 @@
</bind>
</volumes>
<wait>
- <log>socket: '/var/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution</log>
- <time>600000</time>
+ <log>socket: '/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution</log>
+ <time>300000</time>
<exec>
<preStop>/docker-entrypoint-initdb.d/dump/backup-data-only.sh</preStop>
</exec>
diff --git a/src/main/resources/boot-message.txt b/src/main/resources/boot-message.txt
index a1c646f53..ef1478b93 100644
--- a/src/main/resources/boot-message.txt
+++ b/src/main/resources/boot-message.txt
@@ -1,16 +1,12 @@
- ___ ____ ____ ____ _____ ____ ____ ____ __ _ _____ __ __ ____ ______
- / \ | \ / T| \ | || \ / T| \ | l/ ]| || T T| \| T
-Y Y| _ YY o || o ) | __j| D )Y o || _ Y| ' / | __j| | || D ) |
-| O || | || || _/ | l_ | / | || | || \ | l_ | | || /l_j l_j
-| || | || _ || | | _] | \ | _ || | || Y| _] | : || \ | |
-l !| | || | || | | T | . Y| | || | || . || T l || . Y | |
- \___/ l__j__jl__j__jl__j l__j l__j\_jl__j__jl__j__jl__j\_jl__j \__,_jl__j\_j l__j
- __ _ ____ ___ ___ ____
- / ]| T / T| T T| \
- / / | | Y o || _ _ || o )
- / / | l___ | || \_/ || _/
- / \_ | T| _ || | || |
- \ || || | || | || |
- \____jl_____jl__j__jl___j___jl__j
+ ____ ____ ____ ____ _________ ____ ____ ____ ____ ____ ____
+||O |||N |||A |||P ||| |||G |||u |||i |||l |||i |||n ||
+||__|||__|||__|||__|||_______|||__|||__|||__|||__|||__|||__||
+|/__\|/__\|/__\|/__\|/_______\|/__\|/__\|/__\|/__\|/__\|/__\|
+ _________ ____ ____ ____ ____ ____
+ || |||C |||L |||A |||M |||P ||
+ ||_______|||__|||__|||__|||__|||__||
+ |/_______\|/__\|/__\|/__\|/__\|/__\|
+
+
:: Starting :: \ No newline at end of file
diff --git a/src/test/java/org/onap/clamp/clds/it/config/SdcControllersConfigurationItCase.java b/src/test/java/org/onap/clamp/clds/it/config/SdcControllersConfigurationItCase.java
index 7ef734533..0c08a2e36 100644
--- a/src/test/java/org/onap/clamp/clds/it/config/SdcControllersConfigurationItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/config/SdcControllersConfigurationItCase.java
@@ -45,7 +45,7 @@ import org.springframework.test.util.ReflectionTestUtils;
*/
@RunWith(SpringRunner.class)
@SpringBootTest
-@ActiveProfiles(profiles = "clamp-default,clamp-default-user,clamp-sdc-controller")
+@ActiveProfiles({"clamp-default","clamp-default-user","clamp-sdc-controller"})
public class SdcControllersConfigurationItCase {
@Autowired
diff --git a/src/test/java/org/onap/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java b/src/test/java/org/onap/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
index 2cbabbe8c..a8c3e58d4 100644
--- a/src/test/java/org/onap/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
@@ -58,7 +58,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
-@ActiveProfiles(profiles = "clamp-default,clamp-default-user,clamp-sdc-controller")
+@ActiveProfiles({"clamp-default","clamp-default-user","clamp-sdc-controller"})
public class SdcSingleControllerItCase {
private static final String CSAR_ARTIFACT_NAME = "testArtifact.csar";
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
index ea11f8004..7f0e57602 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
@@ -46,7 +46,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = Application.class)
-@ActiveProfiles(profiles = "clamp-default,clamp-default-user,default-dictionary-elements")
+@ActiveProfiles({"clamp-default","clamp-default-user","default-dictionary-elements"})
public class ToscaConverterWithDictionarySupportItCase {
@Autowired
diff --git a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
index ffb9244d6..1c33d5e05 100644
--- a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
+++ b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
@@ -74,7 +74,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class)
-@ActiveProfiles(profiles = "clamp-default,clamp-default-user,clamp-sdc-controller,legacy-operational-policy")
+@ActiveProfiles({"clamp-default","clamp-default-user","clamp-sdc-controller","legacy-operational-policy"})
public class CsarInstallerItCase {
private static final String CSAR_ARTIFACT_NAME_CDS = "example/sdc/service_Vloadbalancerms_cds.csar";
diff --git a/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java b/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
index 03b2e506d..51b93767f 100644
--- a/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
+++ b/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
@@ -45,7 +45,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class)
-@ActiveProfiles(profiles = "clamp-default,clamp-policy-controller")
+@ActiveProfiles({"clamp-default","clamp-policy-controller"})
public class PolicyEngineControllerTestItCase {
@Autowired