summaryrefslogtreecommitdiffstats
path: root/ms/sdclistener/application
diff options
context:
space:
mode:
authorOleg Mitsura <oleg.mitsura@amdocs.com>2020-08-20 09:47:26 -0400
committerKAPIL SINGAL <ks220y@att.com>2020-09-10 13:01:55 +0000
commit8c23129be8bef8f2113be25eca424f87eb05c889 (patch)
treeae86fc0896bc9d58e88a1dc180af992a496850ed /ms/sdclistener/application
parent5f8b54ef2a71ba2df65398c3a53cbb29ee3fcf61 (diff)
JDK11 upgrade
Issue-ID: CCSDK-1870 commit2: update surefire plugin to 3.0.0-M5. Need at least M3 for JDK11. S Still TODO: what to do about the spring-boot-parent. it may need a bump as well. commit3: update parent with surefire 3.0.0-M5 commit4: another surefire version update + failsafe version update. commit5: uncomment surefire def'n in parent pom. It may need to be redefined... commit6: update to parent 2.0.1-SNAPSHOT commits... rebasing/minorfixes commit14: disabling HealthCheckApplicationTests test commit19: Kapil bugfixes: Jsonfiles "isForce" replaces (incorrect) "force"; bumps kafka scala version to 2_13 commit20: fixe back kafka scala version to 2_11 commit25: reverted + applied patches for 2_13 (due to springboot parent update) + 'application' pom to use forCount=1 and reuseForks=false and reverted scanUatEmpoweredBlueprints modification in BluepritnsAcceptanceTest commit30: rebase commit31: SDCListener tests fixes. JMockit updated from 1.19 to 1.49. Since 1.42, need to do these changes https://jmockit.github.io/tutorial/Introduction.html#runningTests commit32: Dockerfiles cleanup. adduser/group params are different from Alpine. commit33: Dockerfile for SDClistener typo commit34: Addressed Dan's comments. commit35: Image was changed to 1.0.1 (which will be built soon), and the updated base image will already have 'onap' user and group, hence the adduser/group wouldn't be needed. commit36: rebase commit37: bumped up BP proc maven-surefire-plugin Xmx Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: I3d864d500150e7d81bb2ce73333f2db67c004e93
Diffstat (limited to 'ms/sdclistener/application')
-rw-r--r--ms/sdclistener/application/pom.xml30
-rw-r--r--ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java3
2 files changed, 1 insertions, 32 deletions
diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml
index a44816af8..6f5fac107 100644
--- a/ms/sdclistener/application/pom.xml
+++ b/ms/sdclistener/application/pom.xml
@@ -75,6 +75,7 @@
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
+ <version>${jmockit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -127,33 +128,4 @@
<artifactId>logback-classic</artifactId>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>default-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <argLine>-Djdk.attach.allowAttachSelf=true ${surefireArgLine}</argLine>
- <excludes>
- <exclude>**/IT*.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <argLine>${surefireArgLine}</argLine>
- <excludes>
- <exclude>**/IT*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java
index e08b6134c..d27d1c491 100644
--- a/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java
+++ b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java
@@ -22,9 +22,7 @@ import mockit.Mock;
import mockit.MockUp;
import mockit.Tested;
import mockit.VerificationsInOrder;
-import mockit.integration.junit4.JMockit;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.onap.ccsdk.cds.sdclistener.client.SdcListenerClient;
import org.onap.ccsdk.cds.sdclistener.dto.SdcListenerDto;
import org.onap.ccsdk.cds.sdclistener.exceptions.SdcListenerException;
@@ -34,7 +32,6 @@ import org.onap.sdc.impl.DistributionClientFactory;
import org.onap.sdc.impl.DistributionClientResultImpl;
import org.onap.sdc.utils.DistributionActionResultEnum;
-@RunWith(JMockit.class)
public class SdcListenerClientTest {
@Tested