Karaf 4 for appc-oam
Change-Id: Id729265145dc4996a2a3ccb2457d66b7a8f2d6bd
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1139
diff --git a/appc-oam/appc-oam-bundle/pom.xml b/appc-oam/appc-oam-bundle/pom.xml
index f2bf910..5a91f44 100644
--- a/appc-oam/appc-oam-bundle/pom.xml
+++ b/appc-oam/appc-oam-bundle/pom.xml
@@ -26,11 +26,13 @@
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-oam</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-oam-bundle</artifactId>
<name>APPC OAM - Bundle</name>
<packaging>bundle</packaging>
@@ -167,7 +169,7 @@
<dependencies>
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-common</artifactId>
+ <artifactId>appc-common-bundle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/appc-oam/appc-oam-features/.gitignore b/appc-oam/appc-oam-features/.gitignore
new file mode 100644
index 0000000..eacf31a
--- /dev/null
+++ b/appc-oam/appc-oam-features/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-oam/appc-oam-features/features-appc-oam/.gitignore b/appc-oam/appc-oam-features/features-appc-oam/.gitignore
new file mode 100644
index 0000000..eacf31a
--- /dev/null
+++ b/appc-oam/appc-oam-features/features-appc-oam/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-oam/appc-oam-features/features-appc-oam/pom.xml b/appc-oam/appc-oam-features/features-appc-oam/pom.xml
new file mode 100644
index 0000000..202dad5
--- /dev/null
+++ b/appc-oam/appc-oam-features/features-appc-oam/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-oam</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name></name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>onap-appc-oam</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/appc-oam/appc-oam-features/onap-appc-oam/.gitignore b/appc-oam/appc-oam-features/onap-appc-oam/.gitignore
new file mode 100644
index 0000000..eacf31a
--- /dev/null
+++ b/appc-oam/appc-oam-features/onap-appc-oam/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-oam/appc-oam-features/onap-appc-oam/pom.xml b/appc-oam/appc-oam-features/onap-appc-oam/pom.xml
new file mode 100644
index 0000000..78535b3
--- /dev/null
+++ b/appc-oam/appc-oam-features/onap-appc-oam/pom.xml
@@ -0,0 +1,86 @@
+<?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-oam</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-lifecycle-management</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-oam-bundle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.appc</groupId>
+ <artifactId>appc-oam-model</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-oam/appc-oam-features/onap-appc-oam/src/main/feature/feature.xml b/appc-oam/appc-oam-features/onap-appc-oam/src/main/feature/feature.xml
new file mode 100644
index 0000000..d36e84d
--- /dev/null
+++ b/appc-oam/appc-oam-features/onap-appc-oam/src/main/feature/feature.xml
@@ -0,0 +1,26 @@
+<?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=========================================================
+ -->
+<features name="onap-appc-oam" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+ <feature name="onap-appc-oam" version="${project.version}">
+ <configfile finalname="etc/opendaylight/karaf/201-appc-oam.xml">mvn:org.onap.appc/appc-oam-bundle/${project.version}/xml/config</configfile>
+ </feature>
+</features>
\ No newline at end of file
diff --git a/appc-oam/appc-oam-features/pom.xml b/appc-oam/appc-oam-features/pom.xml
index 0f61f03..4b93b74 100644
--- a/appc-oam/appc-oam-features/pom.xml
+++ b/appc-oam/appc-oam-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
+============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
+ 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=========================================================
- -->
+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-oam</artifactId>
+ <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-oam-feature-aggregator</artifactId>
<version>1.4.0-SNAPSHOT</version>
- </parent>
+ <packaging>pom</packaging>
- <name>APPC OAM - Features</name>
- <artifactId>appc-oam-features</artifactId>
- <packaging>jar</packaging>
+ <name></name>
- <dependencies>
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-oam-model</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-oam-bundle</artifactId>
- <classifier>config</classifier>
- <type>xml</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc-oam-bundle</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>features-mdsal</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
-
- <scope>runtime</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>
- <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>
- <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>
-
- </plugins>
- </build>
+ <modules>
+ <module>onap-appc-oam</module>
+ <module>features-appc-oam</module>
+ </modules>
</project>
diff --git a/appc-oam/appc-oam-installer/pom.xml b/appc-oam/appc-oam-installer/pom.xml
index 19856db..4439572 100644
--- a/appc-oam/appc-oam-installer/pom.xml
+++ b/appc-oam/appc-oam-installer/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-oam</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-oam-installer</artifactId>
<name>APPC OAM - Karaf Installer</name>
@@ -36,15 +38,16 @@
<properties>
<application.name>appc-oam</application.name>
<features.boot>appc-oam</features.boot>
- <features.repositories>mvn:org.onap.appc/appc-oam-features/${project.version}/xml/features</features.repositories>
+ <features.repositories>mvn:org.onap.appc/onap-appc-oam/${project.version}/xml/features</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
+ <feature-name>appc-oam</feature-name>
</properties>
<dependencies>
<dependency>
<groupId>org.onap.appc</groupId>
- <artifactId>appc-oam-features</artifactId>
+ <artifactId>onap-appc-oam</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
diff --git a/appc-oam/appc-oam-model/.gitignore b/appc-oam/appc-oam-model/.gitignore
new file mode 100644
index 0000000..eacf31a
--- /dev/null
+++ b/appc-oam/appc-oam-model/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-oam/appc-oam-model/pom.xml b/appc-oam/appc-oam-model/pom.xml
index 065e513..7f0e6c3 100644
--- a/appc-oam/appc-oam-model/pom.xml
+++ b/appc-oam/appc-oam-model/pom.xml
@@ -24,11 +24,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-oam</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-oam-model</artifactId>
<name>APPC OAM - Model</name>
<packaging>bundle</packaging>
diff --git a/appc-oam/pom.xml b/appc-oam/pom.xml
index 531bd85..dc067a0 100644
--- a/appc-oam/pom.xml
+++ b/appc-oam/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>
- <groupId>org.onap.appc</groupId>
- <artifactId>appc</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>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-oam</artifactId>
<packaging>pom</packaging>
<name>APPC OAM</name>