Karaf 4 for appc-inbound
Change-Id: I94f8b31e509d0e231e36b8b8d2871ad10bdf02f8
Issue-ID: APPC-1148
Signed-off-by: Patrick Brady <pb071s@att.com>
diff --git a/appc-inbound/appc-design-services/features/features-appc-design-services/.gitignore b/appc-inbound/appc-design-services/features/features-appc-design-services/.gitignore
new file mode 100644
index 0000000..eacf31a
--- /dev/null
+++ b/appc-inbound/appc-design-services/features/features-appc-design-services/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-inbound/appc-design-services/features/features-appc-design-services/pom.xml b/appc-inbound/appc-design-services/features/features-appc-design-services/pom.xml
new file mode 100644
index 0000000..f0c979e
--- /dev/null
+++ b/appc-inbound/appc-design-services/features/features-appc-design-services/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-design-services</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name></name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>onap-appc-design-services</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/appc-inbound/appc-design-services/features/onap-appc-design-services/.gitignore b/appc-inbound/appc-design-services/features/onap-appc-design-services/.gitignore
new file mode 100644
index 0000000..eacf31a
--- /dev/null
+++ b/appc-inbound/appc-design-services/features/onap-appc-design-services/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-inbound/appc-design-services/features/onap-appc-design-services/pom.xml b/appc-inbound/appc-design-services/features/onap-appc-design-services/pom.xml
new file mode 100644
index 0000000..1721d2d
--- /dev/null
+++ b/appc-inbound/appc-design-services/features/onap-appc-design-services/pom.xml
@@ -0,0 +1,96 @@
+<?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-design-services</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name></name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>odl-mdsal-models</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-design-services-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <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>appc-design-services-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-network-inventory-client-provider</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-inbound/appc-design-services/features/pom.xml b/appc-inbound/appc-design-services/features/pom.xml
old mode 100755
new mode 100644
index b94024d..eacaf50
--- a/appc-inbound/appc-design-services/features/pom.xml
+++ b/appc-inbound/appc-design-services/features/pom.xml
@@ -1,105 +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-design-services</artifactId>
- <groupId>org.onap.appc</groupId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
- <artifactId>appc-design-services-features</artifactId>
+ <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
- <dependencies>
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-design-services-model</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-design-services-provider</artifactId>
- </dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-design-services-feature-aggregator</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <!-- dependency for opendaylight-karaf-empty for use by testing -->
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>opendaylight-karaf-empty</artifactId>
- <type>zip</type>
- </dependency>
+ <name></name>
- <dependency>
- <!-- Required for launching the feature tests-->
- <groupId>org.opendaylight.odlparent</groupId>
- <artifactId>features-test</artifactId>
- <scope>test</scope>
- <version>${odl.commons.opendaylight.version}</version>
- </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>
- <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-design-services</module>
+ <module>features-appc-design-services</module>
+ </modules>
</project>
diff --git a/appc-inbound/appc-design-services/installer/pom.xml b/appc-inbound/appc-design-services/installer/pom.xml
index 052cd6d..a5bb0c5 100755
--- a/appc-inbound/appc-design-services/installer/pom.xml
+++ b/appc-inbound/appc-design-services/installer/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>
- <artifactId>appc-design-services</artifactId>
- <groupId>org.onap.appc</groupId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
+ <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-design-services-installer</artifactId>
<name>appc-design-services-installer</name>
<packaging>pom</packaging>
@@ -34,7 +36,7 @@
<properties>
<application.name>appc-design-services</application.name>
<features.boot>appc-design-services</features.boot>
- <features.repositories>mvn:org.onap.appc/appc-design-services-features/${project.version}/xml/features</features.repositories>
+ <features.repositories>mvn:org.onap.appc/onap-appc-design-services/${project.version}/xml/features</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
@@ -42,7 +44,7 @@
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-design-services-features</artifactId>
+ <artifactId>onap-appc-design-services</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
diff --git a/appc-inbound/appc-design-services/model/pom.xml b/appc-inbound/appc-design-services/model/pom.xml
index e8ea065..87fccfa 100755
--- a/appc-inbound/appc-design-services/model/pom.xml
+++ b/appc-inbound/appc-design-services/model/pom.xml
@@ -23,10 +23,12 @@
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-design-services</artifactId>
- <groupId>org.onap.appc</groupId>
+ <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-design-services-model</artifactId>
<packaging>bundle</packaging>
diff --git a/appc-inbound/appc-design-services/pom.xml b/appc-inbound/appc-design-services/pom.xml
index 5e9a0e3..e8a9b7d 100755
--- a/appc-inbound/appc-design-services/pom.xml
+++ b/appc-inbound/appc-design-services/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-inbound</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
<packaging>pom</packaging>
<groupId>org.onap.appc</groupId>
diff --git a/appc-inbound/appc-design-services/provider/pom.xml b/appc-inbound/appc-design-services/provider/pom.xml
index f34319b..7197c06 100755
--- a/appc-inbound/appc-design-services/provider/pom.xml
+++ b/appc-inbound/appc-design-services/provider/pom.xml
@@ -23,11 +23,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>
- <artifactId>appc-design-services</artifactId>
+ <parent>
+ <groupId>org.onap.appc.parent</groupId>
+ <artifactId>binding-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
<groupId>org.onap.appc</groupId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
<artifactId>appc-design-services-provider</artifactId>
<packaging>bundle</packaging>
@@ -59,6 +61,7 @@
<dependency>
<groupId>org.onap.appc</groupId>
<artifactId>appc-design-services-model</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.appc</groupId>
@@ -107,11 +110,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <artifactId>sal-rest-connector</artifactId>
- <groupId>org.opendaylight.netconf</groupId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-broker-impl</artifactId>
<scope>test</scope>