summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2018-07-30 14:35:31 -0700
committerPatrick Brady <pb071s@att.com>2018-08-13 10:54:14 -0700
commit7f383f98c874d5918fa6e55597f30432b13a658d (patch)
treeea30979921816f4c43efb1e2ad2fddc79bbb84a0
parent9d7412db1c2cfb9c05a8d381dc7c71829291d81b (diff)
Karaf 4 for first few features
appc-metric appc-dmaap-adapter appc-chef-adapter appc-netconf-adapter appc-rest-adapter Change-Id: I1d5a8e39cac7be74b05a0782f0971f8d08c8162d Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-1029
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml14
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-adapter/pom.xml48
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml87
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml146
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml40
-rw-r--r--appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml14
-rw-r--r--appc-adapters/appc-chef-adapter/pom.xml7
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties34
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties30
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties35
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOnepreferredRoute.properties3
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml19
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/resources/org/onap/appc/default.properties2
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/features-appc-dmaap-adapter/pom.xml48
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml109
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml182
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml44
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml18
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml7
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml7
-rw-r--r--appc-adapters/appc-dmaap-adapter/pom.xml7
-rw-r--r--appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml11
-rw-r--r--appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/features-appc-netconf-adapter/pom.xml48
-rw-r--r--appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/onap-appc-netconf-adapter/pom.xml88
-rw-r--r--appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml166
-rw-r--r--appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml12
-rw-r--r--appc-adapters/appc-netconf-adapter/pom.xml13
-rw-r--r--appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml26
-rw-r--r--appc-adapters/appc-rest-adapter/appc-rest-adapter-features/features-appc-rest-adapter/pom.xml48
-rw-r--r--appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml139
-rw-r--r--appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml170
-rw-r--r--appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml116
-rw-r--r--appc-adapters/appc-rest-adapter/pom.xml6
-rw-r--r--appc-metric/appc-metric-bundle/pom.xml17
-rw-r--r--appc-metric/appc-metric-features/features-appc-metric/.gitignore1
-rw-r--r--appc-metric/appc-metric-features/features-appc-metric/pom.xml48
-rw-r--r--appc-metric/appc-metric-features/onap-appc-metric/.gitignore1
-rw-r--r--appc-metric/appc-metric-features/onap-appc-metric/pom.xml74
-rw-r--r--appc-metric/appc-metric-features/pom.xml171
-rw-r--r--appc-metric/appc-metric-installer/pom.xml10
-rw-r--r--appc-metric/pom.xml11
41 files changed, 1247 insertions, 830 deletions
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
index c6469dee3..502cdc2df 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
@@ -26,12 +26,15 @@
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-chef-adapter</artifactId>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
+ <relativePath />
</parent>
<artifactId>appc-chef-adapter-bundle</artifactId>
+ <groupId>org.onap.appc</groupId>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>APPC Chef Adapter - Bundle</name>
@@ -78,7 +81,7 @@
</dependency>
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-common</artifactId>
+ <artifactId>appc-common-bundle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -91,12 +94,14 @@
<groupId>com.att.cdp</groupId>
<artifactId>cdp-pal-common</artifactId>
<scope>compile</scope>
+ <version>${cdp.pal.version}</version>
</dependency>
<dependency>
<groupId>com.att.cdp</groupId>
<artifactId>cdp-pal-openstack</artifactId>
<scope>compile</scope>
+ <version>${cdp.pal.version}</version>
</dependency>
<dependency>
@@ -158,6 +163,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
</dependency>
<dependency>
@@ -189,6 +195,7 @@
<dependency>
<groupId>equinoxSDK381</groupId>
<artifactId>org.eclipse.osgi</artifactId>
+ <version>${equinox.osgi.version}</version>
</dependency>
<dependency>
@@ -204,6 +211,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
+ <version>${mariadb.client.version}</version>
</dependency>
<dependency>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-adapter/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-adapter/pom.xml
new file mode 100644
index 000000000..5bbdf69cc
--- /dev/null
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-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-chef-adapter</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name></name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>onap-appc-chef-adapter</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml
new file mode 100644
index 000000000..5d21bb171
--- /dev/null
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml
@@ -0,0 +1,87 @@
+<?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-chef-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>onap-appc-core</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>ccsdk-sli</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-chef-adapter-bundle</artifactId>
+ <version>${project.version}</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-chef-adapter/appc-chef-adapter-features/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml
index d9031f7fa..86536b08a 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml
@@ -1,124 +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=========================================================
- -->
-<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">
+============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-chef-adapter</artifactId>
- <groupId>org.onap.appc</groupId>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
<version>1.4.0-SNAPSHOT</version>
+ <relativePath />
</parent>
- <artifactId>appc-chef-adapter-features</artifactId>
- <name>APPC Chef Adaptor - Features</name>
- <packaging>jar</packaging>
-
- <properties>
- <licenseDir>${project.parent.parent.parent.basedir}</licenseDir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-chef-adapter-bundle</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>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-chef-adapter-feature-aggregator</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>features-yangtools</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
+ <name></name>
- <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>
- <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>
+ <modules>
+ <module>onap-appc-chef-adapter</module>
+ <module>features-appc-chef-adapter</module>
+ </modules>
</project>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml
deleted file mode 100644
index e3854494f..000000000
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/src/main/resources/features.xml
+++ /dev/null
@@ -1,40 +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-chef-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.features.version}/xml/features</repository>-->
-
- <feature name='appc-chef-adapter' description="appc-chef-adapter" version='${project.version}'>
- <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
- <feature >odl-mdsal-broker</feature>
- <feature>ccsdk-sli</feature>
- <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
- <bundle>mvn:org.onap.appc/appc-chef-adapter-bundle/${project.version}</bundle>
- </feature>
-
-</features>
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml
index 4752b044f..ea2d00c36 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml
@@ -26,18 +26,21 @@
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-chef-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>
<artifactId>appc-chef-adapter-installer</artifactId>
+ <groupId>org.onap.appc</groupId>
+ <version>1.4.0-SNAPSHOT</version>
<name>APPC Chef Adapter - Karaf Installer</name>
<packaging>pom</packaging>
<properties>
<application.name>appc-chef-adapter</application.name>
<features.boot>appc-chef-adapter</features.boot>
<features.repositories>
- mvn:org.onap.appc/appc-chef-adapter-features/${project.version}/xml/features
+ mvn:org.onap.appc/onap-appc-chef-adapter/${project.version}/xml/features
</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
<licenseDir>${project.parent.parent.parent.basedir}</licenseDir>
@@ -45,8 +48,9 @@
<dependencies>
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-chef-adapter-features</artifactId>
+ <artifactId>onap-appc-chef-adapter</artifactId>
<classifier>features</classifier>
+ <version>${project.version}</version>
<type>xml</type>
<exclusions>
<exclusion>
@@ -150,4 +154,4 @@
</plugin>
</plugins>
</build>
-</project> \ No newline at end of file
+</project>
diff --git a/appc-adapters/appc-chef-adapter/pom.xml b/appc-adapters/appc-chef-adapter/pom.xml
index 7a72ff45e..8deba7b15 100644
--- a/appc-adapters/appc-chef-adapter/pom.xml
+++ b/appc-adapters/appc-chef-adapter/pom.xml
@@ -26,12 +26,15 @@
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>
<artifactId>appc-chef-adapter</artifactId>
+ <groupId>org.onap.appc</groupId>
+ <version>1.4.0-SNAPSHOT</version>
<name>APPC Chef Adaptor</name>
<description>
Abstraction to connect to and utilize the services of cloud providers such as OpenStack or VMWare.
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>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
index 0b5785f61..f87d7d139 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
@@ -22,12 +22,15 @@
<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-netconf-adapter</artifactId>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
+ <relativePath />
</parent>
<artifactId>appc-netconf-adapter-bundle</artifactId>
+ <groupId>org.onap.appc</groupId>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>NETCONF Adapter - bundle</name>
<properties>
@@ -39,7 +42,7 @@
<dependencies>
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-common</artifactId>
+ <artifactId>appc-common-bundle</artifactId>
<version>${project.version}</version>
</dependency>
@@ -53,12 +56,14 @@
<groupId>com.att.cdp</groupId>
<artifactId>cdp-pal-common</artifactId>
<scope>compile</scope>
+ <version>${cdp.pal.version}</version>
</dependency>
<dependency>
<groupId>com.att.cdp</groupId>
<artifactId>cdp-pal-openstack</artifactId>
<scope>compile</scope>
+ <version>${cdp.pal.version}</version>
</dependency>
<dependency>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/features-appc-netconf-adapter/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/features-appc-netconf-adapter/pom.xml
new file mode 100644
index 000000000..89a4df742
--- /dev/null
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/features-appc-netconf-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-netconf-adapter</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name></name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>onap-appc-netconf-adapter</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/onap-appc-netconf-adapter/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/onap-appc-netconf-adapter/pom.xml
new file mode 100644
index 000000000..094669389
--- /dev/null
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/onap-appc-netconf-adapter/pom.xml
@@ -0,0 +1,88 @@
+<?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-netconf-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>onap-appc-core</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>ccsdk-dblib</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <version>${ccsdk.sli.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-netconf-adapter-bundle</artifactId>
+ <version>${project.version}</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-netconf-adapter/appc-netconf-adapter-features/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml
index 78125c283..b64a0d812 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml
@@ -1,142 +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-netconf-adapter</artifactId>
- <groupId>org.onap.appc</groupId>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
<version>1.4.0-SNAPSHOT</version>
+ <relativePath />
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>appc-netconf-adapter-features</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-netconf-adapter-bundle</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>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-netconf-adapter-feature-aggregator</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <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>
+ <name></name>
-</project> \ No newline at end of file
+ <modules>
+ <module>onap-appc-netconf-adapter</module>
+ <module>features-appc-netconf-adapter</module>
+ </modules>
+</project>
diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml
index c6448523f..58f1a625e 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml
@@ -22,26 +22,30 @@
<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-netconf-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>
<artifactId>appc-netconf-adapter-installer</artifactId>
+ <groupId>org.onap.appc</groupId>
+ <version>1.4.0-SNAPSHOT</version>
<name>NETCONF Adapter - Karaf Installer</name>
<packaging>pom</packaging>
<properties>
<application.name>appc-netconf-adapter</application.name>
<features.boot>appc-netconf-adapter</features.boot>
- <features.repositories>mvn:org.onap.appc/appc-netconf-adapter-features/${project.version}/xml/features</features.repositories>
+ <features.repositories>mvn:org.onap.appc/onap-appc-netconf-adapter/${project.version}/xml/features</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
<dependencies>
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-netconf-adapter-features</artifactId>
+ <artifactId>onap-appc-netconf-adapter</artifactId>
<classifier>features</classifier>
+ <version>${project.version}</version>
<type>xml</type>
<exclusions>
<exclusion>
diff --git a/appc-adapters/appc-netconf-adapter/pom.xml b/appc-adapters/appc-netconf-adapter/pom.xml
index 372df2c87..41191b46d 100644
--- a/appc-adapters/appc-netconf-adapter/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/pom.xml
@@ -21,20 +21,19 @@
-->
<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">
<parent>
- <artifactId>appc-adapters</artifactId>
- <groupId>org.onap.appc</groupId>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
<version>1.4.0-SNAPSHOT</version>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>appc-netconf-adapter</artifactId>
+ <groupId>org.onap.appc</groupId>
+ <version>1.4.0-SNAPSHOT</version>
<name>NETCONF adapter</name>
<packaging>pom</packaging>
- <properties>
- <feature.netconf.connector.version>1.0.1-Beryllium-SR1</feature.netconf.connector.version>
- </properties>
-
<reporting>
<plugins>
<plugin>
@@ -144,4 +143,4 @@
</modules>
-</project> \ No newline at end of file
+</project>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
index 3cdbd88f6..c55ec33c6 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/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-rest-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-rest-adapter-bundle</artifactId>
<packaging>bundle</packaging>
<name>rest Adapter - bundle</name>
@@ -52,16 +54,9 @@
</dependency>
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-common</artifactId>
+ <artifactId>appc-common-bundle</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-common</artifactId>
- <version>${project.version}</version>
- <classifier>jar-with-dependencies</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
@@ -78,12 +73,14 @@
<groupId>com.att.cdp</groupId>
<artifactId>cdp-pal-common</artifactId>
<scope>compile</scope>
+ <version>${cdp.pal.version}</version>
</dependency>
<dependency>
<groupId>com.att.cdp</groupId>
<artifactId>cdp-pal-openstack</artifactId>
<scope>compile</scope>
+ <version>${cdp.pal.version}</version>
</dependency>
<dependency>
@@ -126,11 +123,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>1.9.13</version>
- </dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -187,6 +179,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
+ <version>${mariadb.client.version}</version>
</dependency>
<dependency>
@@ -216,8 +209,7 @@
<Bundle-SymbolicName>appc-rest-adapter</Bundle-SymbolicName>
<Bundle-Activator>org.onap.appc.adapter.rest.RestActivator</Bundle-Activator>
<Export-Package>org.onap.appc.adapter.rest</Export-Package>
- <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*</Import-Package>
- <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|jaxp-api</Embed-Dependency>
+ <Import-Package>*</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/features-appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/features-appc-rest-adapter/pom.xml
new file mode 100644
index 000000000..7eac784af
--- /dev/null
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/features-appc-rest-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-rest-adapter</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name></name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>onap-appc-rest-adapter</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml
new file mode 100644
index 000000000..08590d7d8
--- /dev/null
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml
@@ -0,0 +1,139 @@
+<?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-rest-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.ccsdk.sli.core</groupId>
+ <artifactId>ccsdk-sli</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>onap-appc-core</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-rest-adapter-bundle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+ <artifactId>jersey-guava</artifactId>
+ <version>2.25.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ <version>2.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.8.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>2.25.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ning</groupId>
+ <artifactId>async-http-client</artifactId>
+ <version>1.9.39</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.grizzly</groupId>
+ <artifactId>grizzly-http-servlet</artifactId>
+ <version>2.3.28</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.grizzly</groupId>
+ <artifactId>grizzly-http</artifactId>
+ <version>2.3.28</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <includeTransitiveDependency>true</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>
+ <excludedArtifactId>appc-common</excludedArtifactId>
+
+ </excludedArtifactIds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml
index 1f063ef97..0a1f1c1f9 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml
@@ -1,142 +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-rest-adapter</artifactId>
- <groupId>org.onap.appc</groupId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
- <artifactId>appc-rest-adapter-features</artifactId>
- <name>Rest Adaptor - Features</name>
-
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-rest-adapter-bundle</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>compile</scope>
- </dependency>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
- <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> -->
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-rest-adapter-feature-aggregator</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>features-yangtools</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
+ <name></name>
- <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>
-</project> \ No newline at end of file
+ <modules>
+ <module>onap-appc-rest-adapter</module>
+ <module>features-appc-rest-adapter</module>
+ </modules>
+</project>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml
index 11051b8d3..21d701df8 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-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-rest-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-rest-adapter-installer</artifactId>
<name>rest Adapter - Karaf Installer</name>
<packaging>pom</packaging>
@@ -33,15 +35,16 @@
<properties>
<application.name>appc-rest-adapter</application.name>
<features.boot>appc-rest-adapter</features.boot>
- <features.repositories>mvn:org.onap.appc/appc-rest-adapter-features/${project.version}/xml/features</features.repositories>
+ <features.repositories>mvn:org.onap.appc/onap-appc-rest-adapter/${project.version}/xml/features</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
<dependencies>
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-rest-adapter-features</artifactId>
+ <artifactId>onap-appc-rest-adapter</artifactId>
<classifier>features</classifier>
+ <version>${project.version}</version>
<type>xml</type>
<exclusions>
<exclusion>
@@ -145,6 +148,111 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <transitive>false</transitive>
+ <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <useRepositoryLayout>true</useRepositoryLayout>
+ <addParentPoms>false</addParentPoms>
+ <copyPom>false</copyPom>
+ <excludeGroupIds>org.opendaylight</excludeGroupIds>
+ <scope>provided</scope>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.8.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/assembly/system/com/fasterxml/jackson/core/jackson-databind/2.8.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.8.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/assembly/system/com/fasterxml/jackson/core/jackson-core/2.8.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.8.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/assembly/system/com/fasterxml/jackson/core/jackson-annotations/2.8.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ <version>2.8.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/assembly/system/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.8.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.8.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/assembly/system/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.8.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>2.25.1</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/assembly/system/org/glassfish/jersey/core/jersey-server/2.25.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.ning</groupId>
+ <artifactId>async-http-client</artifactId>
+ <version>1.9.39</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/assembly/system/com/ning/async-http-client/1.9.39</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.10.5.Final</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/assembly/system/io/netty/netty/3.10.5.Final</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.glassfish.grizzly</groupId>
+ <artifactId>grizzly-http-servlet</artifactId>
+ <version>2.3.28</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/assembly/system/org/glassfish/grizzly/grizzly-http-servlet/2.3.28</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.glassfish.grizzly</groupId>
+ <artifactId>grizzly-http-server</artifactId>
+ <version>2.3.28</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/assembly/system/org/glassfish/grizzly/grizzly-http-server/2.3.28</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.glassfish.grizzly</groupId>
+ <artifactId>grizzly-http</artifactId>
+ <version>2.3.28</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/assembly/system/org/glassfish/grizzly/grizzly-http/2.3.28</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/appc-adapters/appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/pom.xml
index 0e25f7883..595d1d4ad 100644
--- a/appc-adapters/appc-rest-adapter/pom.xml
+++ b/appc-adapters/appc-rest-adapter/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/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-rest-adapter</artifactId>
<name>rest Adaptor</name>
<description>Abstraction to connect to and utilize the services of cloud providers such as OpenStack or VMWare.</description>
diff --git a/appc-metric/appc-metric-bundle/pom.xml b/appc-metric/appc-metric-bundle/pom.xml
index da92c7d85..97bd7d013 100644
--- a/appc-metric/appc-metric-bundle/pom.xml
+++ b/appc-metric/appc-metric-bundle/pom.xml
@@ -21,11 +21,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-metric</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <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-metric-bundle</artifactId>
<packaging>bundle</packaging>
@@ -41,9 +42,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-common</artifactId>
- <version>${project.version}</version>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-common-bundle</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/appc-metric/appc-metric-features/features-appc-metric/.gitignore b/appc-metric/appc-metric-features/features-appc-metric/.gitignore
new file mode 100644
index 000000000..eacf31a67
--- /dev/null
+++ b/appc-metric/appc-metric-features/features-appc-metric/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-metric/appc-metric-features/features-appc-metric/pom.xml b/appc-metric/appc-metric-features/features-appc-metric/pom.xml
new file mode 100644
index 000000000..103f489d6
--- /dev/null
+++ b/appc-metric/appc-metric-features/features-appc-metric/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-metric</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name></name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>onap-appc-metric</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/appc-metric/appc-metric-features/onap-appc-metric/.gitignore b/appc-metric/appc-metric-features/onap-appc-metric/.gitignore
new file mode 100644
index 000000000..eacf31a67
--- /dev/null
+++ b/appc-metric/appc-metric-features/onap-appc-metric/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-metric/appc-metric-features/onap-appc-metric/pom.xml b/appc-metric/appc-metric-features/onap-appc-metric/pom.xml
new file mode 100644
index 000000000..4b986eb0c
--- /dev/null
+++ b/appc-metric/appc-metric-features/onap-appc-metric/pom.xml
@@ -0,0 +1,74 @@
+<?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-metric</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name></name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-metric-bundle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>onap-appc-core</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <excludedArtifactIds>
+ <excludedArtifactId>slf4j-api</excludedArtifactId>
+ <excludedArtifactId>tomcat-jdbc</excludedArtifactId>
+ <excludedArtifactId>tomcat-juli</excludedArtifactId>
+ <excludedArtifactId>org.eclipse.osgi</excludedArtifactId>
+ <excludedArtifactId>httpcore</excludedArtifactId>
+ <excludedArtifactId>httpclient</excludedArtifactId>
+ <excludedArtifactId>appc-common</excludedArtifactId>
+ </excludedArtifactIds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/appc-metric/appc-metric-features/pom.xml b/appc-metric/appc-metric-features/pom.xml
index 0e703b96a..e96757ca4 100644
--- a/appc-metric/appc-metric-features/pom.xml
+++ b/appc-metric/appc-metric-features/pom.xml
@@ -1,145 +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-metric</artifactId>
- <groupId>org.onap.appc</groupId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
- <name>appc-metric-features</name>
- <artifactId>appc-metric-features</artifactId>
-
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-metric-bundle</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>features-mdsal</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
-
- <scope>runtime</scope>
- </dependency>-->
-
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
- <!-- 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>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>features-yangtools</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-metric-feature-aggregator</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <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>
- <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. -->
- <!-- Skipping ODL feature test -->
- <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>
- <classpathDependencyExcludes>
- <!-- The dependencies which bring in AbstractDataBrokerTest class
- brings in a second PaxExam container which results in the feature tests failing
- with a message similar to: "ERROR o.ops4j.pax.exam.spi.PaxExamRuntime - Ambiguous
- TestContainer ..." This excludes the container we don't want to use. -->
- <classpathDependencyExcludes>org.ops4j.pax.exam:pax-exam-container-native</classpathDependencyExcludes>
- </classpathDependencyExcludes>
- <skipTests>true</skipTests>
- </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>
+ <name></name>
- </plugins>
- </build>
+ <modules>
+ <module>onap-appc-metric</module>
+ <module>features-appc-metric</module>
+ </modules>
</project>
diff --git a/appc-metric/appc-metric-installer/pom.xml b/appc-metric/appc-metric-installer/pom.xml
index de7c2faa6..d54d83235 100644
--- a/appc-metric/appc-metric-installer/pom.xml
+++ b/appc-metric/appc-metric-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-metric</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-metric-installer</artifactId>
<name>APPC Metric - Karaf Installer</name>
<packaging>pom</packaging>
@@ -33,7 +35,7 @@
<properties>
<application.name>appc-metric</application.name>
<features.boot>appc-metric</features.boot>
- <features.repositories>mvn:org.onap.appc/appc-metric-features/${project.version}/xml/features</features.repositories>
+ <features.repositories>mvn:org.onap.appc/onap-appc-metric/${project.version}/xml/features</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
@@ -41,7 +43,7 @@
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-metric-features</artifactId>
+ <artifactId>onap-appc-metric</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
diff --git a/appc-metric/pom.xml b/appc-metric/pom.xml
index 69165f673..244f19fe7 100644
--- a/appc-metric/pom.xml
+++ b/appc-metric/pom.xml
@@ -21,11 +21,14 @@
<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</artifactId>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
<version>1.4.0-SNAPSHOT</version>
+ <relativePath />
</parent>
- <artifactId>appc-metric</artifactId>
+
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-metric-aggregator</artifactId>
<packaging>pom</packaging>
<name>APPC Metric</name>
<description>APPC Metric</description>
@@ -39,4 +42,4 @@
<module>appc-metric-installer</module>
</modules>
-</project> \ No newline at end of file
+</project>