diff options
| -rw-r--r-- | aai-traversal/pom.xml | 23 | ||||
| -rw-r--r-- | aai-traversal/src/main/java/org/onap/aai/TraversalApp.java | 2 | ||||
| -rw-r--r-- | aai-traversal/src/main/resources/application.properties | 10 | ||||
| -rw-r--r-- | aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties | 3 | ||||
| -rw-r--r-- | aai-traversal/src/test/java/org/onap/aai/AAISetup.java | 4 | ||||
| -rw-r--r-- | aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java | 3 | ||||
| -rw-r--r-- | aai-traversal/src/test/resources/application-onap-test.properties | 3 | ||||
| -rw-r--r-- | aai-traversal/src/test/resources/application-test.properties | 11 | ||||
| -rw-r--r-- | pom.xml | 6 | ||||
| -rw-r--r-- | version.properties | 2 |
10 files changed, 15 insertions, 52 deletions
diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index 7586d52..5b3158e 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.aai.traversal</groupId> <artifactId>traversal</artifactId> - <version>1.15.0-SNAPSHOT</version> + <version>1.15.1-SNAPSHOT</version> </parent> <groupId>org.onap.aai.traversal</groupId> <artifactId>aai-traversal</artifactId> @@ -107,7 +107,6 @@ <javax.servlet.version>4.0.1</javax.servlet.version> <antlr.version>4.9.3</antlr.version> <keycloak.version>11.0.2</keycloak.version> - <activemq.version>5.16.7</activemq.version> <io.swagger.version>1.6.14</io.swagger.version> <micrometer.version>1.6.6</micrometer.version> @@ -306,11 +305,6 @@ <artifactId>micrometer-jersey2</artifactId> </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>javax.jms-api</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> <version>2.1</version> @@ -454,17 +448,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> @@ -492,10 +475,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jms</artifactId> - </dependency> - <dependency> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-rest</artifactId> </dependency> diff --git a/aai-traversal/src/main/java/org/onap/aai/TraversalApp.java b/aai-traversal/src/main/java/org/onap/aai/TraversalApp.java index db6076b..2e0b43e 100644 --- a/aai-traversal/src/main/java/org/onap/aai/TraversalApp.java +++ b/aai-traversal/src/main/java/org/onap/aai/TraversalApp.java @@ -48,14 +48,12 @@ import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfigurat import org.springframework.context.annotation.ComponentScan; import org.springframework.core.env.Environment; import org.springframework.core.env.Profiles; -import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration; @SpringBootApplication( exclude = { DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class, - JmsAutoConfiguration.class, CassandraDataAutoConfiguration.class, CassandraAutoConfiguration.class }) diff --git a/aai-traversal/src/main/resources/application.properties b/aai-traversal/src/main/resources/application.properties index de08b4e..b4f7c59 100644 --- a/aai-traversal/src/main/resources/application.properties +++ b/aai-traversal/src/main/resources/application.properties @@ -9,7 +9,6 @@ spring.jersey.type=filter spring.main.allow-bean-definition-overriding=true spring.zipkin.baseUrl=http://jaeger-collector.istio-system:9411 -spring.sleuth.messaging.jms.enabled=false spring.sleuth.trace-id128=true spring.sleuth.sampler.probability=1.0 spring.sleuth.propagation.type=w3c,b3 @@ -68,13 +67,10 @@ schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24, schema.source.name=onap # End of Internal Specific Properties -# JMS bind address host port -jms.bind.address=tcp://localhost:61646 - # dmaap is deprecated and now replaced with kafka spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS} spring.kafka.producer.properties.security.protocol=SASL_PLAINTEXT -spring.kafka.producer.properties.sasl.mechanism=SCRAM-SHA-512 +spring.kafka.producer.properties.sasl.mechanism=SCRAM-SHA-512 spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer spring.kafka.producer.properties.sasl.jaas.config = ${JAAS_CONFIG} @@ -147,3 +143,7 @@ scrape.uri.metrics=true # this does the same as the /echo endpoint, # but doesn't show up in micrometer metrics aai.actuator.echo.enabled=false + +BOOTSTRAP_SERVERS=localhost:9092 +JAAS_CONFIG="" +aai.notifications.enabled=false diff --git a/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties b/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties index 79eb709..b9e161e 100644 --- a/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties +++ b/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties @@ -52,8 +52,6 @@ aai.default.api.version=v19 # Used by Model-processing code aai.model.query.resultset.maxcount=50 aai.model.query.timeout.sec=90 - -aai.jms.enable=false #timeout for traversal enabled flag aai.traversal.timeoutenabled=true @@ -76,4 +74,3 @@ aai.dsl.max.nodecount=15 # Threshold for margin of error (in ms) for resources_with_sot format to derive the most recent http method performed aai.resource.formatter.threshold=10 - diff --git a/aai-traversal/src/test/java/org/onap/aai/AAISetup.java b/aai-traversal/src/test/java/org/onap/aai/AAISetup.java index 5e6fccc..01504ea 100644 --- a/aai-traversal/src/test/java/org/onap/aai/AAISetup.java +++ b/aai-traversal/src/test/java/org/onap/aai/AAISetup.java @@ -36,7 +36,6 @@ import org.onap.aai.introspection.LoaderFactory; import org.onap.aai.introspection.MoxyLoader; import org.onap.aai.nodes.NodeIngestor; import org.onap.aai.rest.db.HttpEntry; -import org.onap.aai.rest.dsl.DslQueryProcessor; import org.onap.aai.rest.dsl.V1DslQueryProcessor; import org.onap.aai.rest.dsl.V2DslQueryProcessor; import org.onap.aai.rest.dsl.v1.DslListener; @@ -44,7 +43,6 @@ import org.onap.aai.rest.notification.NotificationService; import org.onap.aai.rest.search.GremlinServerSingleton; import org.onap.aai.serialization.db.EdgeSerializer; import org.onap.aai.setup.AAIConfigTranslator; -import org.onap.aai.setup.SchemaLocationsBean; import org.onap.aai.setup.SchemaVersion; import org.onap.aai.setup.SchemaVersions; import org.springframework.beans.factory.annotation.Autowired; @@ -59,7 +57,7 @@ import org.springframework.test.context.junit4.rules.SpringMethodRule; EdgeSerializer.class, NodeIngestor.class, SpringContextAware.class, IntrospectionConfig.class, RestBeanConfig.class, SearchConfiguration.class, XmlFormatTransformerConfiguration.class, GremlinServerSingleton.class, V1DslQueryProcessor.class, V2DslQueryProcessor.class, DslListener.class, org.onap.aai.rest.dsl.v2.DslListener.class, - LoaderFactory.class, NotificationService.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-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java index 2cbc1cd..d87a476 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java @@ -48,6 +48,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.onap.aai.config.ConfigConfiguration; import org.onap.aai.config.IntrospectionConfig; +import org.onap.aai.config.KafkaConfig; import org.onap.aai.config.SearchConfiguration; import org.onap.aai.config.SpringContextAware; import org.onap.aai.edges.EdgeIngestor; @@ -81,7 +82,7 @@ import org.springframework.test.context.junit4.rules.SpringMethodRule; @ContextConfiguration( classes = {ConfigConfiguration.class, AAIConfigTranslator.class, EdgeIngestor.class, EdgeSerializer.class, NodeIngestor.class, SpringContextAware.class, - SearchConfiguration.class, IntrospectionConfig.class, LoaderFactory.class, NotificationService.class}) + SearchConfiguration.class, IntrospectionConfig.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-traversal/src/test/resources/application-onap-test.properties b/aai-traversal/src/test/resources/application-onap-test.properties index 862e7e2..809b9c3 100644 --- a/aai-traversal/src/test/resources/application-onap-test.properties +++ b/aai-traversal/src/test/resources/application-onap-test.properties @@ -37,9 +37,6 @@ server.ssl.trust-store-password=password(1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6 server.ssl.client-auth=want server.ssl.key-store-type=JKS -# JMS bind address host port -jms.bind.address=tcp://localhost:61646 - # 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-traversal/src/test/resources/application-test.properties b/aai-traversal/src/test/resources/application-test.properties index b4a9352..f018cb6 100644 --- a/aai-traversal/src/test/resources/application-test.properties +++ b/aai-traversal/src/test/resources/application-test.properties @@ -39,15 +39,6 @@ server.basic.auth.location=${server.local.startpath}/etc/auth/realm.properties server.port=8446 security.require-ssl=false server.ssl.enabled=false -#server.ssl.enabled-protocols=TLSv1.1,TLSv1.2 -#server.ssl.key-store=${server.local.startpath}/etc/auth/aai_keystore -#server.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0) -#server.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0) -#server.ssl.client-auth=want -#server.ssl.key-store-type=JKS - -# JMS bind address host port -jms.bind.address=tcp://localhost:61646 # Schema related attributes for the oxm and edges # Any additional schema related attributes should start with prefix schema @@ -89,3 +80,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.traversal</groupId> <artifactId>traversal</artifactId> - <version>1.15.0-SNAPSHOT</version> + <version>1.15.1-SNAPSHOT</version> <name>aai-traversal</name> <packaging>pom</packaging> <modules> @@ -42,7 +42,7 @@ Nexus Proxy Properties and Snapshot Locations Ideally this can be overwritten at runtime per internal environment specific values at runtime --> - <aai.common.version>1.15.0</aai.common.version> + <aai.common.version>1.15.1-SNAPSHOT</aai.common.version> <nexusproxy>https://nexus.onap.org</nexusproxy> <site.path>/content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version}</site.path> <release.path>/content/repositories/releases/</release.path> 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} |