diff options
| -rw-r--r-- | aai-resources/pom.xml | 32 | ||||
| -rw-r--r-- | aai-resources/src/main/resources/application.properties | 5 | ||||
| -rw-r--r-- | aai-resources/src/test/java/org/onap/aai/AAISetup.java | 3 | ||||
| -rw-r--r-- | aai-resources/src/test/resources/application-test.properties | 2 | ||||
| -rw-r--r-- | pom.xml | 6 | ||||
| -rw-r--r-- | version.properties | 2 |
6 files changed, 13 insertions, 37 deletions
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 5270131..4a409c0 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.15.0-SNAPSHOT</version> + <version>1.15.1-SNAPSHOT</version> </parent> <properties> <java.version>11</java.version> @@ -79,8 +79,8 @@ <schema.ingest.file>${project.basedir}/src/main/resources/application.properties</schema.ingest.file> <!-- End of Default ONAP Schema Properties --> - <janusgraph.version>0.6.4</janusgraph.version> - <gremlin.version>3.5.8</gremlin.version> + <!-- <janusgraph.version>0.6.4</janusgraph.version> + <gremlin.version>3.5.8</gremlin.version> --> <javax.servlet.version>4.0.1</javax.servlet.version> <keycloak.version>11.0.2</keycloak.version> @@ -505,17 +505,6 @@ <groupId>com.jayway.jsonpath</groupId> <artifactId>json-path</artifactId> </dependency> - <!-- Do not use activemq-all because they force you to use a specific logging - and they shade it so you can't simply exclude it and when you deploy the - jar, you will notice failure --> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-broker</artifactId> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-client</artifactId> - </dependency> <dependency> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-core</artifactId> @@ -525,10 +514,6 @@ <artifactId>jersey-core</artifactId> </exclusion> <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - </exclusion> - <exclusion> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> </exclusion> @@ -550,17 +535,6 @@ <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-schema-ingest</artifactId> </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jms</artifactId> - <exclusions> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - </exclusion> - </exclusions> - </dependency> <!-- Do not use the jersey-client since jersey client 1.0 version clashes with jersey 2 which we are using --> <!-- Use this to make http requests instead of jersey 1.0 client --> diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties index f4eccca..204197c 100644 --- a/aai-resources/src/main/resources/application.properties +++ b/aai-resources/src/main/resources/application.properties @@ -55,9 +55,6 @@ server.ssl.key-store-type=JKS null.db.serialization.enabled=true -# JMS bind address host port -jms.bind.address=tcp://localhost:61647 - # dmaap is deprecated and now replaced with kafka # dmaap.ribbon.listOfServers=localhost:3904 spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS} @@ -161,3 +158,5 @@ AJSC_HOME=./ # this does the same as the /echo endpoint, # but doesn't show up in micrometer metrics aai.actuator.echo.enabled=false + +aai.notifications.enabled=false diff --git a/aai-resources/src/test/java/org/onap/aai/AAISetup.java b/aai-resources/src/test/java/org/onap/aai/AAISetup.java index 3567187..d672bc7 100644 --- a/aai-resources/src/test/java/org/onap/aai/AAISetup.java +++ b/aai-resources/src/test/java/org/onap/aai/AAISetup.java @@ -32,6 +32,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.extension.ExtendWith; import org.onap.aai.config.ConfigConfiguration; import org.onap.aai.config.IntrospectionConfig; +import org.onap.aai.config.KafkaConfig; import org.onap.aai.config.RestBeanConfig; import org.onap.aai.config.SpringContextAware; import org.onap.aai.config.XmlFormatTransformerConfiguration; @@ -54,7 +55,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @SpringJUnitConfig( classes = {ConfigConfiguration.class, AAIConfigTranslator.class, NodeIngestor.class, EdgeIngestor.class, EdgeSerializer.class, SpringContextAware.class, IntrospectionConfig.class, - XmlFormatTransformerConfiguration.class, RestBeanConfig.class, LoaderFactory.class, NotificationService.class}) + XmlFormatTransformerConfiguration.class, RestBeanConfig.class, LoaderFactory.class, NotificationService.class, KafkaConfig.class}) @TestPropertySource( properties = {"schema.uri.base.path = /aai", "schema.ingest.file = src/test/resources/application-test.properties"}) diff --git a/aai-resources/src/test/resources/application-test.properties b/aai-resources/src/test/resources/application-test.properties index 3fcab50..8057117 100644 --- a/aai-resources/src/test/resources/application-test.properties +++ b/aai-resources/src/test/resources/application-test.properties @@ -82,3 +82,5 @@ management.endpoints.enabled-by-default=true management.endpoints.web.exposure.include=info, health, prometheus management.metrics.web.server.request.autotime.enabled=false scrape.uri.metrics=true + +aai.notifications.enabled=false @@ -26,11 +26,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.0</version> + <version>1.15.1-SNAPSHOT</version> </parent> <groupId>org.onap.aai.resources</groupId> <artifactId>resources</artifactId> - <version>1.15.0-SNAPSHOT</version> + <version>1.15.1-SNAPSHOT</version> <name>aai-resources</name> <packaging>pom</packaging> <modules> @@ -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.0</aai.common.version> + <aai.common.version>1.15.1-SNAPSHOT</aai.common.version> <aai.schema.service.version>1.12.5</aai.schema.service.version> </properties> <build> diff --git a/version.properties b/version.properties index 039d36d..bcf6bda 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major_version=1 minor_version=15 -patch_version=0 +patch_version=1 base_version=${major_version}.${minor_version}.${patch_version} |