summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xepsdk-app-onap/pom.xml17
-rwxr-xr-xvid-app-common/pom.xml11
-rw-r--r--vid-ext-services-simulator/pom.xml2
3 files changed, 26 insertions, 4 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index d706df669..f052b8565 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -142,6 +142,12 @@
<container.classpath>classpath:</container.classpath>
</systemPropertyVariables>
<useSystemClassLoader>false</useSystemClassLoader>
+ <properties>
+ <property>
+ <name>usedefaultlisteners</name>
+ <value>false</value>
+ </property>
+ </properties>
</configuration>
</plugin>
@@ -333,6 +339,11 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-kotlin</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
<!-- jackson-dataformat-* are to override elasticsearch-2.2.0 deps hell -->
<!-- (elasticsearch is an epsdk-app-common-2.4.0 dep) -->
<dependency>
@@ -449,5 +460,11 @@
<version>${springframework.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+
</dependencies>
</project>
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 1749039d6..b2c5c9dce 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -46,7 +46,7 @@
<sitePath>content/sites/site/org/onap/vid/${project.version}</sitePath>
<aspectj.version>1.8.9</aspectj.version>
- <kotlin.version>1.3.11</kotlin.version>
+ <kotlin.version>1.3.30</kotlin.version>
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
<eirslett.version>1.6</eirslett.version>
@@ -56,6 +56,9 @@
<!-- override using -Drelease_version=foo -Dpatch_version=bar -->
<release_version>${env.RELEASE_VERSION}</release_version>
<patch_version/>
+
+ <reportportal.argline>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar -Drp.enable=true -Drp.mode=DEFAULT -Drp.tags="CICD;BE_UNIT;BUILD_${env.BUILD_NUMBER}"</reportportal.argline>
+
</properties>
@@ -298,6 +301,10 @@
<name>junit</name>
<value>false</value>
</property>
+ <property>
+ <name>usedefaultlisteners</name>
+ <value>false</value>
+ </property>
</properties>
<threadCount>1</threadCount>
</configuration>
@@ -802,7 +809,7 @@
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
<artifactId>json-unit</artifactId>
- <version>1.23.0</version>
+ <version>2.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index 59f886826..4e966754c 100644
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -12,7 +12,6 @@
<properties>
<encoding>UTF-8</encoding>
- <epsdk.version>1.3.0</epsdk.version>
<springframework.version>5.1.6.RELEASE</springframework.version>
<hibernate.version>5.3.4.Final</hibernate.version>
<jackson.version>2.9.8</jackson.version>
@@ -42,7 +41,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <epsdk.version>1.1.0-SNAPSHOT</epsdk.version>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>content/repositories/releases/</releaseNexusPath>