diff options
Diffstat (limited to 'ms/sdclistener')
| -rw-r--r-- | ms/sdclistener/application/pom.xml | 30 | ||||
| -rw-r--r-- | ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java | 3 | ||||
| -rwxr-xr-x | ms/sdclistener/distribution/src/main/docker/Dockerfile | 13 | ||||
| -rwxr-xr-x[-rw-r--r--] | ms/sdclistener/distribution/src/main/docker/startService.sh | 0 | ||||
| -rwxr-xr-x | ms/sdclistener/parent/pom.xml | 14 | ||||
| -rw-r--r-- | ms/sdclistener/pom.xml | 3 |
6 files changed, 15 insertions, 48 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 diff --git a/ms/sdclistener/distribution/src/main/docker/Dockerfile b/ms/sdclistener/distribution/src/main/docker/Dockerfile index 41622fae1..b5b74e11e 100755 --- a/ms/sdclistener/distribution/src/main/docker/Dockerfile +++ b/ms/sdclistener/distribution/src/main/docker/Dockerfile @@ -1,19 +1,16 @@ -FROM openjdk:8-jdk-alpine +FROM onap/ccsdk-alpine-j11-image:1.0.1 -RUN addgroup -S -g 1000 onap && adduser -S onap -u 1000 -G onap # add entrypoint COPY startService.sh /startService.sh -RUN chown onap:onap /startService.sh -RUN chmod 751 /startService.sh +RUN chown onap:onap /startService.sh && chmod 755 /startService.sh # add application COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz RUN tar -xzf /source.tar.gz -C /tmp \ && cp -rf /tmp/@project.build.finalName@/opt / \ && rm -rf /source.tar.gz \ - && rm -rf /tmp/@project.build.finalName@ - -RUN mkdir -p /opt/app/onap/cds-sdc-listener -RUN chown onap:onap /opt -R + && rm -rf /tmp/@project.build.finalName@ \ + && mkdir -p /opt/app/onap/cds-sdc-listener \ + && chown onap:onap /opt -R USER onap ENTRYPOINT /startService.sh diff --git a/ms/sdclistener/distribution/src/main/docker/startService.sh b/ms/sdclistener/distribution/src/main/docker/startService.sh index 7ad6171b8..7ad6171b8 100644..100755 --- a/ms/sdclistener/distribution/src/main/docker/startService.sh +++ b/ms/sdclistener/distribution/src/main/docker/startService.sh diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml index ea67d1b95..d6aed85a6 100755 --- a/ms/sdclistener/parent/pom.xml +++ b/ms/sdclistener/parent/pom.xml @@ -42,7 +42,7 @@ <dmaap.client.version>1.1.5</dmaap.client.version> <mockkserver.version>5.5.1</mockkserver.version> <sdc-distribution-client.version>1.4.0</sdc-distribution-client.version> - <jmockit.version>1.19</jmockit.version> + <jmockit.version>1.49</jmockit.version> <reactorcore.version>3.2.6.RELEASE</reactorcore.version> </properties> @@ -170,11 +170,15 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> <configuration> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> + <!-- Sets the VM argument line used when unit tests are run. --> + <argLine>-javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar</argLine> + <!-- Excludes integration tests when unit tests are run. --> + <excludes> + <exclude>**/IT*.java</exclude> + </excludes> </configuration> </plugin> </plugins> diff --git a/ms/sdclistener/pom.xml b/ms/sdclistener/pom.xml index d89eb14a3..bed1056ab 100644 --- a/ms/sdclistener/pom.xml +++ b/ms/sdclistener/pom.xml @@ -43,9 +43,6 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <build.number>${maven.build.timestamp}</build.number> - <java.version>1.8</java.version> - <maven.compiler.target>1.8</maven.compiler.target> - <maven.compiler.source>1.8</maven.compiler.source> <ccsdk.project.version>${project.version}</ccsdk.project.version> </properties> </project> |