diff options
| -rw-r--r-- | aai-resources/pom.xml | 16 | ||||
| -rw-r--r-- | aai-resources/src/main/resources/application.properties | 2 | ||||
| -rw-r--r-- | aai-resources/src/test/java/org/onap/aai/rest/ConfigurationTest.java | 1 | ||||
| -rw-r--r-- | pom.xml | 4 |
4 files changed, 12 insertions, 11 deletions
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 677f8a7..ddfc848 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -93,7 +93,7 @@ <skipITs>true</skipITs> <swagger.version>1.6.8</swagger.version> - <spring-cloud.version>2020.0.6</spring-cloud.version> + <spring-cloud.version>2021.0.9</spring-cloud.version> <!-- fix the driver version to match the one defined in janusgraph-cql spring-boot (2.4) is otherwise downgrading it to 4.9.0 --> <!-- see https://github.com/spring-projects/spring-boot/blob/d336a96b7f204a398b8237560c5dfa7095c53460/spring-boot-project/spring-boot-dependencies/build.gradle#L163 --> @@ -360,11 +360,6 @@ <version>${swagger.version}</version> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-configuration2</artifactId> - <version>2.0</version> - </dependency> - <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-jersey2-jaxrs</artifactId> <version>${swagger.version}</version> @@ -423,6 +418,7 @@ <dependency> <groupId>org.codehaus.janino</groupId> <artifactId>janino</artifactId> + <version>3.1.12</version> </dependency> <dependency> <groupId>net.logstash.logback</groupId> @@ -500,7 +496,6 @@ <dependency> <groupId>org.springframework.kafka</groupId> <artifactId>spring-kafka</artifactId> - <version>2.7.14</version> </dependency> <dependency> <groupId>com.jayway.jsonpath</groupId> @@ -708,7 +703,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>25.0-jre</version> + <version>33.3.1-jre</version> </dependency> <!-- cassandra driver --> <dependency> @@ -727,6 +722,11 @@ <version>${datastax.native-protocol.version}</version> </dependency> <!-- /cassandra driver --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + <version>2.11.0</version> + </dependency> </dependencies> </dependencyManagement> <build> diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties index 204197c..b79af16 100644 --- a/aai-resources/src/main/resources/application.properties +++ b/aai-resources/src/main/resources/application.properties @@ -65,6 +65,8 @@ spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.Str spring.kafka.producer.properties.sasl.jaas.config = ${JAAS_CONFIG} spring.kafka.producer.retries=3 +management.info.env.enabled=true + # Schema related attributes for the oxm and edges # Any additional schema related attributes should start with prefix schema schema.configuration.location=N/A diff --git a/aai-resources/src/test/java/org/onap/aai/rest/ConfigurationTest.java b/aai-resources/src/test/java/org/onap/aai/rest/ConfigurationTest.java index b780d90..15c03cf 100644 --- a/aai-resources/src/test/java/org/onap/aai/rest/ConfigurationTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/ConfigurationTest.java @@ -185,7 +185,6 @@ public class ConfigurationTest extends AbstractSpringRestTest { responseBody = (String) responseEntity.getBody(); assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); assertTrue(responseBody.contains("group_id")); - assertTrue(responseBody.contains("aai_uri")); // Set Accept as MediaType.APPLICATION_JSON in order to get access of endpoint // "/actuator/info" and @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.1</version> + <version>1.15.2</version> </parent> <groupId>org.onap.aai.resources</groupId> <artifactId>resources</artifactId> @@ -49,7 +49,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.15.1</aai.common.version> + <aai.common.version>1.15.2</aai.common.version> <aai.schema.service.version>1.12.5</aai.schema.service.version> </properties> <build> |