diff options
| -rw-r--r-- | aai-resources/pom.xml | 20 | ||||
| -rw-r--r-- | aai-resources/src/main/java/org/onap/aai/ResourcesApp.java | 2 | ||||
| -rw-r--r-- | aai-resources/src/main/resources/etc/appprops/aaiconfig.properties | 2 |
3 files changed, 3 insertions, 21 deletions
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index a909183..38ab635 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -44,9 +44,8 @@ <namespace>com.att.ajsc</namespace> <start-class>org.onap.aai.ResourcesApp</start-class> - <aai-schema.version>1.2.3</aai-schema.version> - <aai.core.version>1.2.3</aai.core.version> - <aai.client.loadbalancer.version>1.2.3</aai.client.loadbalancer.version> + <aai-schema.version>1.2.4</aai-schema.version> + <aai.core.version>1.2.4</aai.core.version> <hbase.version>1.0.2</hbase.version> @@ -627,21 +626,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.onap.aai.aai-common</groupId> - <artifactId>aai-client-loadbalancer</artifactId> - <version>${aai.client.loadbalancer.version}</version> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey.contribs</groupId> - <artifactId>jersey-apache-client4</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> <version>${netty.handler.version}</version> diff --git a/aai-resources/src/main/java/org/onap/aai/ResourcesApp.java b/aai-resources/src/main/java/org/onap/aai/ResourcesApp.java index 82d146b..057ac16 100644 --- a/aai-resources/src/main/java/org/onap/aai/ResourcesApp.java +++ b/aai-resources/src/main/java/org/onap/aai/ResourcesApp.java @@ -35,7 +35,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; -import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.context.annotation.ComponentScan; import org.springframework.core.env.Environment; @@ -60,7 +59,6 @@ import java.util.UUID; DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class }) -@RibbonClient(name = "dmaap", configuration = AAIRibbonConfiguration.class) public class ResourcesApp { private static final EELFLogger logger = EELFManager.getInstance().getLogger(ResourcesApp.class.getName()); diff --git a/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties b/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties index 84072f9..a14e5fe 100644 --- a/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties +++ b/aai-resources/src/main/resources/etc/appprops/aaiconfig.properties @@ -140,7 +140,7 @@ aai.ctagPool.rangeString.vpe=3001-3500 aai.dmaap.workload.enableEventProcessing=true -aai.realtime.clients=RO,SDNC,MSO +aai.realtime.clients=RO,SDNC,MSO,SO aai.server.rebind=g |