diff options
| -rw-r--r-- | aai-resources/pom.xml | 18 | ||||
| -rw-r--r-- | aai-resources/src/main/java/org/onap/aai/rest/util/EchoResponse.java | 2 | ||||
| -rw-r--r-- | pom.xml | 6 | ||||
| -rw-r--r-- | version.properties | 2 |
4 files changed, 18 insertions, 10 deletions
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 631e7e8..8bc71c7 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.aai.resources</groupId> <artifactId>resources</artifactId> - <version>1.13.0-SNAPSHOT</version> + <version>1.13.1-SNAPSHOT</version> </parent> <properties> <java.version>1.8</java.version> @@ -49,7 +49,7 @@ <!-- Location where assembly of our scripts, resources and main jar will be held - Check the ${project.artifactId}/src/main/assembly/descriptor.xml for more info + Check the ${project.artifactId}/src/main/assembly/descriptor.xml for more info --> <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/ </aai.build.directory> @@ -312,9 +312,9 @@ <artifactId>spring-boot-starter-hateoas</artifactId> </dependency> <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-starter-sleuth</artifactId> - </dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-starter-sleuth</artifactId> + </dependency> <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-sleuth-zipkin</artifactId> @@ -728,6 +728,14 @@ <type>pom</type> <scope>import</scope> </dependency> + <!-- Keeping guava at 19 is necessary here, since the janusgraph-cql driver in version + 2.3 has a dependency on it. Remove this override, once we are using janusgraph > 0.2.3/tinkerpop > 3.2.3 + --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>19.0</version> + </dependency> </dependencies> </dependencyManagement> <build> diff --git a/aai-resources/src/main/java/org/onap/aai/rest/util/EchoResponse.java b/aai-resources/src/main/java/org/onap/aai/rest/util/EchoResponse.java index 8a66809..745fb00 100644 --- a/aai-resources/src/main/java/org/onap/aai/rest/util/EchoResponse.java +++ b/aai-resources/src/main/java/org/onap/aai/rest/util/EchoResponse.java @@ -140,7 +140,7 @@ public class EchoResponse extends RESTAPI { HashMap<AAIException, ArrayList<String>> exceptionList = new HashMap<>(); exceptionList.put(new AAIException("AAI_0002", "OK"), templateVariables); return Response.status(Status.OK) - .entity(ErrorLogHelper.getRESTAPIInfoResponse(headers.getAcceptableMediaTypes(), exceptionList)) + .entity(ErrorLogHelper.getRESTAPIInfoResponse(new ArrayList<>(headers.getAcceptableMediaTypes()), exceptionList)) .build(); } @@ -26,11 +26,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.11.0</version> + <version>1.13.0</version> </parent> <groupId>org.onap.aai.resources</groupId> <artifactId>resources</artifactId> - <version>1.13.0-SNAPSHOT</version> + <version>1.13.1-SNAPSHOT</version> <name>aai-resources</name> <packaging>pom</packaging> <modules> @@ -48,7 +48,7 @@ <staging.path>/content/repositories/staging/</staging.path> <!-- GMaven plugin uses this property to figure out the name of the docker tag --> <aai.project.version>${project.version}</aai.project.version> - <aai.common.version>1.11.0</aai.common.version> + <aai.common.version>1.13.1</aai.common.version> <aai.schema.service.version>1.12.3</aai.schema.service.version> </properties> <build> diff --git a/version.properties b/version.properties index 39cb3bf..0c0fa8e 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major_version=1 minor_version=13 -patch_version=0 +patch_version=1 base_version=${major_version}.${minor_version}.${patch_version} |