aboutsummaryrefslogtreecommitdiffstats
path: root/datarouter-subscriber
diff options
context:
space:
mode:
authorefiacor <fiachra.corcoran@est.tech>2020-04-04 17:51:53 +0100
committerefiacor <fiachra.corcoran@est.tech>2020-04-09 16:35:42 +0100
commit8552e04175c7091d0d748e0c0f4b14a0d9321b40 (patch)
tree4312baf8a99e5294ccbcb8a8a418e4f53e12b67e /datarouter-subscriber
parent3d3b9def088b171329dc47fd7a1c471d25aafc06 (diff)
[DMaaP DR] JKD 11 migration
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Change-Id: Ib9d326f4bdf5c4e208dea5a4a00be0c3be3a3067 Issue-ID: DMAAP-1386
Diffstat (limited to 'datarouter-subscriber')
-rwxr-xr-xdatarouter-subscriber/pom.xml64
-rw-r--r--datarouter-subscriber/src/main/resources/docker/Dockerfile11
-rwxr-xr-xdatarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java2
3 files changed, 70 insertions, 7 deletions
diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index a2e99366..9390050f 100755
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -67,18 +67,74 @@
<dependency>
<groupId>org.sonatype.http-testing-harness</groupId>
<artifactId>junit-runner</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>powermock-reflect</artifactId>
+ <groupId>org.powermock</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>powermock-api-mockito</artifactId>
+ <groupId>org.powermock</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-security</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jsr305</artifactId>
+ <groupId>com.google.code.findbugs</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-support</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4-rule</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/datarouter-subscriber/src/main/resources/docker/Dockerfile b/datarouter-subscriber/src/main/resources/docker/Dockerfile
index 6c3536c2..20a2ca2b 100644
--- a/datarouter-subscriber/src/main/resources/docker/Dockerfile
+++ b/datarouter-subscriber/src/main/resources/docker/Dockerfile
@@ -18,20 +18,25 @@
# limitations under the License.
# ============LICENSE_END====================================================
#
-FROM openjdk:8-jre-alpine
+FROM openjdk:11.0.6-jre-slim
MAINTAINER DMAAP Team
COPY /opt /opt
+RUN apt-get update && \
+ apt-get install -y \
+ curl \
+ vim
+
EXPOSE 8080 8443
WORKDIR /opt
RUN chmod 0700 startup.sh
ENTRYPOINT ["sh", "startup.sh"]
-RUN addgroup -S -g 1001 onap \
- && adduser -S -u 1000 datarouter -G onap \
+RUN groupadd -g 1001 onap \
+ && useradd -u 1000 datarouter -g onap \
&& chown -R datarouter:onap /opt/
USER datarouter \ No newline at end of file
diff --git a/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java b/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java
index 109c63a9..006dee76 100755
--- a/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java
+++ b/datarouter-subscriber/src/test/java/org/onap/dmaap/datarouter/subscriber/SampleSubscriberServletTest.java
@@ -28,6 +28,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.modules.junit4.PowerMockRunner;
import javax.servlet.ServletInputStream;
@@ -40,6 +41,7 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*;
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*", "com.sun.org.apache.xalan.*"})
public class SampleSubscriberServletTest {
private SampleSubscriberServlet sampleSubServlet;