diff options
Diffstat (limited to 'appc-adapters/appc-dmaap-adapter')
14 files changed, 337 insertions, 208 deletions
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties new file mode 100644 index 000000000..6dddbc0e4 --- /dev/null +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties @@ -0,0 +1,34 @@ +#consumer.properties file created on the fly for topic:JunitTopicOne on:1534178988019 +#Mon Aug 13 09:49:48 PDT 2018 +AFT_DME2_EP_CONN_TIMEOUT=15000 +MethodType=GET +password=secret +routeOffer=MR1 +DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties +Longitude=-100.000000 +username=key +Version=1.0 +group=junit-client +timeout=1000 +SubContextPath=/ +authDate=2016-02-18T13\:57\:37-0800 +filter= +authKey=01234567890abcde\:01234567890abcdefghijklmn +Environment=TEST +host=192.168.1.1 +Protocol=http +Partner=BOT_R +contenttype=application/json +id=junit-consumer-one +Latitude=50.000000 +ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events +AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler +AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler +topic=JunitTopicOne +TransportType=HTTPNOAUTH +AFT_ENVIRONMENT=AFTUAT +limit=5 +AFT_DME2_EP_READ_TIMEOUT_MS=50000 +sessionstickinessrequired=NO +AFT_DME2_REQ_TRACE_ON=true +AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties new file mode 100644 index 000000000..f80f762aa --- /dev/null +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties @@ -0,0 +1,30 @@ +#consumer.properties file created on the fly for topic:JunitTopicOne on:1534178854566 +#Mon Aug 13 09:47:34 PDT 2018 +AFT_DME2_EP_CONN_TIMEOUT=15000 +MethodType=GET +routeOffer=MR1 +DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties +Longitude=-100.000000 +Version=1.0 +group=junit-client +timeout=15000 +SubContextPath=/ +filter=none +Environment=TEST +host=192.168.10.10 +Protocol=http +Partner=BOT_R +contenttype=application/json +Latitude=50.000000 +id=junit-consumer-two +ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events +AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler +AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler +topic=JunitTopicOne +TransportType=HTTPAAF +AFT_ENVIRONMENT=AFTUAT +limit=1000 +AFT_DME2_EP_READ_TIMEOUT_MS=50000 +sessionstickinessrequired=NO +AFT_DME2_REQ_TRACE_ON=true +AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties new file mode 100644 index 000000000..910e713d5 --- /dev/null +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties @@ -0,0 +1,35 @@ +#producer.properties file created on the fly for topic:JunitTopicOne on:1534178854558 +#Mon Aug 13 09:47:34 PDT 2018 +AFT_DME2_EP_CONN_TIMEOUT=15000 +MethodType=POST +password=admin +DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties +Longitude=-100.000000 +username=admin +partition=2 +Version=1.0 +maxBatchSize=100 +group=junit-client +SubContextPath=/ +authDate=2016-07-20T11\:30\:56-0700 +filter=none +authKey=01234567890abcde\:01234567890abcdefghijklmn +Environment=TEST +host=192.168.10.10 +Protocol=http +Partner=BOT_R +contenttype=application/json +id=junit-producer-one +Latitude=50.000000 +ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events +AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler +AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler +topic=JunitTopicOne +TransportType=HTTPNOAUTH +AFT_ENVIRONMENT=AFTUAT +AFT_DME2_EP_READ_TIMEOUT_MS=50000 +sessionstickinessrequired=NO +AFT_DME2_REQ_TRACE_ON=true +AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 +MessageSentThreadOccurance=50 +maxAgeMs=250 diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOnepreferredRoute.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOnepreferredRoute.properties new file mode 100644 index 000000000..301a75845 --- /dev/null +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOnepreferredRoute.properties @@ -0,0 +1,3 @@ +#preferredRoute.properties file created on the fly for topic:JunitTopicOne on:1534173919002 +#Mon Aug 13 08:25:19 PDT 2018 +preferredRouteKey=JunitTopicOne_MR1 diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml index 2542f9e2e..dba4e1c3c 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml @@ -22,11 +22,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.appc</groupId> - <artifactId>appc-dmaap-adapter</artifactId> + <groupId>org.onap.appc.parent</groupId> + <artifactId>binding-parent</artifactId> <version>1.4.0-SNAPSHOT</version> + <relativePath /> </parent> - + <groupId>org.onap.appc</groupId> <artifactId>appc-dmaap-adapter-bundle</artifactId> <packaging>bundle</packaging> <name>DMaaP Adapter - bundle</name> @@ -44,7 +45,7 @@ </dependency> <dependency> <groupId>org.onap.appc</groupId> - <artifactId>appc-common</artifactId> + <artifactId>appc-common-bundle</artifactId> <version>${project.version}</version> </dependency> @@ -57,6 +58,7 @@ <dependency> <groupId>equinoxSDK381</groupId> <artifactId>org.eclipse.osgi</artifactId> + <version>${equinox.osgi.version}</version> </dependency> <dependency> @@ -149,8 +151,9 @@ <dependency> <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> <artifactId>dmaapClient</artifactId> - <version>${dmaap.client.version}</version> - </dependency> + <version>${dmaap.client.version}</version> + <classifier>jar-with-dependencies</classifier> + </dependency> <dependency> <groupId>org.json</groupId> @@ -175,8 +178,8 @@ <!--<Bundle-SymbolicName>org.onap.appc.adapter.messaging.dmaap</Bundle-SymbolicName>--> <Bundle-Activator>org.onap.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator</Bundle-Activator> <Export-Package>org.onap.appc.adapter.messaging.*</Export-Package> - <Import-Package>!org.slf4j.event,org.onap.appc.adapter.message.*,org.onap.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets,org.w3c.*</Import-Package> - <Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|appc-message-adapter-api|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-*</Embed-Dependency> + <Import-Package>com.att.eelf.configuration,*;resolution:=optional</Import-Package> + <Embed-Dependency>dmaapClient,eelf-core</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> <Bundle-Blueprint>OSGI-INF/blueprint/blueprint.xml</Bundle-Blueprint> </instructions> diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties index 0e12fe24a..8dea0a61d 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties @@ -25,7 +25,7 @@ org.onap.appc.bootstrap.file=test.properties org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},. # Properties commented out below are provided in appc.properties -#poolMembers=<DMAAP_IP>:3904 +poolMembers=10.0.0.1 #event.pool.members=<DMAAP_IP>:3904 topic.read=APPC-CL diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/features-appc-dmaap-adapter/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/features-appc-dmaap-adapter/pom.xml new file mode 100644 index 000000000..0f29d14e6 --- /dev/null +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/features-appc-dmaap-adapter/pom.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +ONAP : APPC +================================================================================ +Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +============================================================================= +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +============LICENSE_END========================================================= +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.appc.parent</groupId> + <artifactId>feature-repo-parent</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath /> + </parent> + + <groupId>org.onap.appc</groupId> + <artifactId>features-appc-dmaap-adapter</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name></name> + + <dependencies> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>onap-appc-dmaap-adapter</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + + </dependencies> +</project> diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml new file mode 100644 index 000000000..075be7944 --- /dev/null +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +ONAP : APPC +================================================================================ +Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +============================================================================= +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +============LICENSE_END========================================================= +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.appc.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath /> + </parent> + + <groupId>org.onap.appc</groupId> + <artifactId>onap-appc-dmaap-adapter</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>feature</packaging> + + <name></name> + + <dependencies> + <dependency> + <groupId>org.opendaylight.controller</groupId> + <artifactId>odl-mdsal-broker</artifactId> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-dmaap-adapter-bundle</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-message-adapter-factory</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.appc</groupId> + <artifactId>appc-message-adapter-api</artifactId> + <version>${project.version}</version> + </dependency> +<!-- <dependency> --> +<!-- <groupId>org.glassfish.jersey.core</groupId> --> +<!-- <artifactId>jersey-server</artifactId> --> +<!-- <version>2.22.1</version> --> +<!-- </dependency> --> +<!-- <dependency> --> +<!-- <groupId>com.fasterxml.jackson.jaxrs</groupId> --> +<!-- <artifactId>jackson-jaxrs-base</artifactId> --> +<!-- <version>2.5.4</version> --> +<!-- </dependency> --> +<!-- <dependency> --> +<!-- <groupId>com.fasterxml.jackson.jaxrs</groupId> --> +<!-- <artifactId>jackson-jaxrs-json-provider</artifactId> --> +<!-- <version>2.5.4</version> --> +<!-- </dependency> --> +<!-- <dependency> --> +<!-- <groupId>org.apache.httpcomponents</groupId> --> +<!-- <artifactId>httpclient-osgi</artifactId> --> +<!-- <version>4.5.3</version> --> +<!-- </dependency> --> +<!-- <dependency> --> +<!-- <groupId>org.apache.httpcomponents</groupId> --> +<!-- <artifactId>httpcore-osgi</artifactId> --> +<!-- <version>4.4</version> --> +<!-- </dependency> --> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <includeTransitiveDependency>false</includeTransitiveDependency> + <excludedArtifactIds> + <excludedArtifactId>slf4j-api</excludedArtifactId> + <excludedArtifactId>tomcat-jdbc</excludedArtifactId> + <excludedArtifactId>tomcat-juli</excludedArtifactId> + <excludedArtifactId>httpcore</excludedArtifactId> + <excludedArtifactId>httpclient</excludedArtifactId> + <excludedArtifactId>org.eclipse.osgi</excludedArtifactId> + + </excludedArtifactIds> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml index a2c898145..1cd6b44cc 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml @@ -1,148 +1,42 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ============LICENSE_START======================================================= - ONAP : APPC - ================================================================================ - Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. - Copyright (C) 2017 Amdocs - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ============LICENSE_END========================================================= - --> +============LICENSE_START======================================================= +ONAP : APPC +================================================================================ +Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +============================================================================= +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +============LICENSE_END========================================================= +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>appc-dmaap-adapter</artifactId> - <groupId>org.onap.appc</groupId> - <version>1.4.0-SNAPSHOT</version> - </parent> - <artifactId>appc-dmaap-adapter-features</artifactId> - <name>DMaaP Adapter - Features</name> - - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-dmaap-adapter-bundle</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.onap.appc</groupId> - <artifactId>appc-message-adapter-factory</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.opendaylight.mdsal</groupId> - <artifactId>features-mdsal</artifactId> - <classifier>features</classifier> - <type>xml</type> - <scope>runtime</scope> - </dependency> - - <!-- dependency for opendaylight-karaf-empty for use by testing --> -<!-- <dependency> --> -<!-- <groupId>org.opendaylight.controller</groupId> --> -<!-- <artifactId>opendaylight-karaf-empty</artifactId> --> -<!-- <type>zip</type> --> -<!-- </dependency> --> - -<!-- <dependency> --> - <!-- Required for launching the feature tests --> -<!-- <groupId>org.opendaylight.yangtools</groupId> --> -<!-- <artifactId>features-test</artifactId> --> -<!-- <scope>test</scope> --> -<!-- </dependency> --> - - <dependency> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>features-yangtools</artifactId> - <classifier>features</classifier> - <type>xml</type> - <scope>runtime</scope> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <filtering>true</filtering> - <directory>src/main/resources</directory> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>filter</id> - <goals> - <goal>resources</goal> - </goals> - <phase>generate-resources</phase> - </execution> - </executions> - </plugin> - <!-- launches the feature test, which validates that your karaf feature - can be installed inside of a karaf container. It doesn't validate that your - functionality works correctly, just that you have all of the dependent bundles - defined correctly. --> - <!-- <plugin> --> - <!-- <groupId>org.apache.maven.plugins</groupId> --> - <!-- <artifactId>maven-surefire-plugin</artifactId> --> - <!-- <version>2.16</version> --> - <!-- <configuration> --> - <!-- <systemPropertyVariables> --> - <!-- <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId> --> - <!-- <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId> --> - <!-- <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version> --> - <!-- </systemPropertyVariables> --> - <!-- <dependenciesToScan> --> - <!-- <dependency>org.opendaylight.yangtools:features-test</dependency> --> - <!-- </dependenciesToScan> --> - <!-- </configuration> --> - <!-- </plugin> --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <goals> - <goal>attach-artifact</goal> - </goals> - <phase>package</phase> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/classes/${features.file}</file> - <type>xml</type> - <classifier>features</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.appc.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.4.0-SNAPSHOT</version> + <relativePath /> + </parent> + + <groupId>org.onap.appc</groupId> + <artifactId>appc-dmaap-adapter-feature-aggregator</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name></name> + + <modules> + <module>onap-appc-dmaap-adapter</module> + <module>features-appc-dmaap-adapter</module> + </modules> </project> diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml deleted file mode 100644 index e23713930..000000000 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ============LICENSE_START======================================================= - ONAP : APPC - ================================================================================ - Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. - ================================================================================ - Copyright (C) 2017 Amdocs - ============================================================================= - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - ============LICENSE_END========================================================= - --> - - -<features name="appc-dmaap-adapter-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - -<!-- <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.version}/xml/features</repository> --> - <!--<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>--> - - <feature name='appc-dmaap-adapter' description="appc-dmaap-adapter" version='${project.version}'> - <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> -<!-- <feature >odl-mdsal-broker</feature> --> - <feature >odl-mdsal-broker</feature> -<!-- <feature version="${sdnctl.sli.version}">ccsdk-sli</feature> --> - <bundle>mvn:org.onap.appc/appc-dmaap-adapter-bundle/${project.version}</bundle> - <bundle>mvn:org.onap.appc/appc-message-adapter-factory/${project.version}</bundle> - <bundle>mvn:org.onap.appc/appc-message-adapter-api/${project.version}</bundle> - - </feature> - -</features> diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml index 387aaa4e2..f404a6499 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml @@ -22,10 +22,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>appc-dmaap-adapter</artifactId> - <groupId>org.onap.appc</groupId> + <artifactId>odlparent-lite</artifactId> + <groupId>org.onap.appc.parent</groupId> <version>1.4.0-SNAPSHOT</version> + <relativePath /> </parent> + <groupId>org.onap.appc</groupId> <artifactId>appc-dmaap-adapter-installer</artifactId> <name>dMaaP Adapter - Karaf Installer</name> <packaging>pom</packaging> @@ -33,14 +35,14 @@ <properties> <application.name>appc-dmaap-adapter</application.name> <features.boot>appc-dmaap-adapter</features.boot> - <features.repositories>mvn:org.onap.appc/appc-dmaap-adapter-features/${project.version}/xml/features</features.repositories> + <features.repositories>mvn:org.onap.appc/onap-appc-dmaap-adapter/${project.version}/xml/features</features.repositories> <include.transitive.dependencies>false</include.transitive.dependencies> </properties> <dependencies> <dependency> <groupId>org.onap.appc</groupId> - <artifactId>appc-dmaap-adapter-features</artifactId> + <artifactId>onap-appc-dmaap-adapter</artifactId> <version>${project.version}</version> <classifier>features</classifier> <type>xml</type> @@ -127,6 +129,14 @@ <copyPom>false</copyPom> <excludeGroupIds>org.opendaylight</excludeGroupIds> <scope>provided</scope> + <artifactItems> + <artifactItem> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>2.5.4</version> + <type>jar</type> + </artifactItem> + </artifactItems> </configuration> </execution> </executions> diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml index afe6a2d71..d3f0765a0 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml @@ -22,11 +22,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.appc</groupId> - <artifactId>appc-dmaap-adapter</artifactId> + <groupId>org.onap.appc.parent</groupId> + <artifactId>binding-parent</artifactId> <version>1.4.0-SNAPSHOT</version> + <relativePath /> </parent> + <groupId>org.onap.appc</groupId> <artifactId>appc-message-adapter-api</artifactId> <packaging>bundle</packaging> <name>appc-message-adapter-api</name> @@ -52,6 +54,7 @@ <dependency> <groupId>equinoxSDK381</groupId> <artifactId>org.eclipse.osgi</artifactId> + <version>${equinox.osgi.version}</version> </dependency> <dependency> diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml index 0b8e4e782..09bfe6b45 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml @@ -22,11 +22,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.appc</groupId> - <artifactId>appc-dmaap-adapter</artifactId> + <groupId>org.onap.appc.parent</groupId> + <artifactId>binding-parent</artifactId> <version>1.4.0-SNAPSHOT</version> + <relativePath /> </parent> + <groupId>org.onap.appc</groupId> <artifactId>appc-message-adapter-factory</artifactId> <packaging>bundle</packaging> <name>appc-message-adapter-factory</name> @@ -61,6 +63,7 @@ <dependency> <groupId>equinoxSDK381</groupId> <artifactId>org.eclipse.osgi</artifactId> + <version>${equinox.osgi.version}</version> </dependency> <dependency> diff --git a/appc-adapters/appc-dmaap-adapter/pom.xml b/appc-adapters/appc-dmaap-adapter/pom.xml index b3cab9beb..425e65c35 100644 --- a/appc-adapters/appc-dmaap-adapter/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/pom.xml @@ -22,11 +22,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.appc</groupId> - <artifactId>appc-adapters</artifactId> + <groupId>org.onap.appc.parent</groupId> + <artifactId>odlparent-lite</artifactId> <version>1.4.0-SNAPSHOT</version> + <relativePath /> </parent> - + <groupId>org.onap.appc</groupId> <artifactId>appc-dmaap-adapter</artifactId> <name>DMaaP Adapter</name> <description>Adapter to read and write messages on the DMaaP Service</description> |