diff options
Diffstat (limited to 'datafile-app-server')
| -rw-r--r-- | datafile-app-server/pom.xml | 21 | ||||
| -rw-r--r-- | datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/HttpClientResponseHelper.java | 13 |
2 files changed, 20 insertions, 14 deletions
diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml index 14620ed1..decf0732 100644 --- a/datafile-app-server/pom.xml +++ b/datafile-app-server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.dcaegen2.collectors</groupId> <artifactId>datafile</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <groupId>org.onap.dcaegen2.collectors.datafile</groupId> @@ -37,8 +37,9 @@ <properties> <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> - <docker-client.version>8.7.1</docker-client.version> - <tomcat-embed-core.version>9.0.56</tomcat-embed-core.version> + + <!--Skip missing changelog--> + <onap-gerrit-review>-changelog-missing</onap-gerrit-review> </properties> <dependencies> @@ -100,14 +101,8 @@ <artifactId>spring-webmvc</artifactId> </dependency> <dependency> - <groupId>com.spotify</groupId> - <artifactId>docker-client</artifactId> - <version>${docker-client.version}</version> - </dependency> - <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> - <version>${tomcat-embed-core.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -121,6 +116,10 @@ <groupId>org.apache.httpcomponents.core5</groupId> <artifactId>httpcore5</artifactId> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> <!-- Actuator dependencies --> <dependency> @@ -209,10 +208,6 @@ <groupId>org.springdoc</groupId> <artifactId>springdoc-openapi-data-rest</artifactId> </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </dependency> </dependencies> <build> diff --git a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/HttpClientResponseHelper.java b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/HttpClientResponseHelper.java index 22067d0b..c04b1a75 100644 --- a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/HttpClientResponseHelper.java +++ b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/http/HttpClientResponseHelper.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START====================================================================== - * Copyright (C) 2020-2021 Nokia. All rights reserved. + * Copyright (C) 2020-2022 Nokia. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at @@ -27,6 +27,7 @@ import org.apache.http.ProtocolVersion; import org.apache.http.StatusLine; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.params.HttpParams; +import reactor.core.publisher.Mono; import reactor.netty.http.client.HttpClientResponse; import reactor.util.context.Context; import reactor.util.context.ContextView; @@ -122,6 +123,11 @@ public class HttpClientResponseHelper { public HttpResponseStatus status() { return HttpResponseStatus.OK; } + + @Override + public Mono<HttpHeaders> trailerHeaders() { + return null; + } }; public static final HttpClientResponse RESPONSE_ANY_NO_OK = new HttpClientResponse() { @@ -193,6 +199,11 @@ public class HttpClientResponseHelper { @Override public HttpResponseStatus status() { return HttpResponseStatus.NOT_IMPLEMENTED; } + + @Override + public Mono<HttpHeaders> trailerHeaders() { + return null; + } }; public static final CloseableHttpResponse APACHE_RESPONSE_OK = new CloseableHttpResponse() { |