Karaf 4 for appc-dg features 13/59913/6
authorPatrick Brady <pb071s@att.com>
Thu, 9 Aug 2018 19:05:53 +0000 (12:05 -0700)
committerPatrick Brady <pb071s@att.com>
Mon, 13 Aug 2018 23:50:30 +0000 (16:50 -0700)
Including appc-dg-util, appc-dg-shared, and appc-ssh-adapter

Change-Id: Ia137a87c560438d23f7858e0f4068717891be076
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1137

36 files changed:
appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/.gitignore [new file with mode: 0644]
appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/pom.xml [new file with mode: 0644]
appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/.gitignore [new file with mode: 0644]
appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/pom.xml [new file with mode: 0644]
appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml
appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml
appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml
appc-adapters/appc-ssh-adapter/pom.xml
appc-dg-util/appc-dg-util-bundle/pom.xml
appc-dg-util/appc-dg-util-features/features-appc-dg-util/.gitignore [new file with mode: 0644]
appc-dg-util/appc-dg-util-features/features-appc-dg-util/pom.xml [new file with mode: 0644]
appc-dg-util/appc-dg-util-features/onap-appc-dg-util/.gitignore [new file with mode: 0644]
appc-dg-util/appc-dg-util-features/onap-appc-dg-util/pom.xml [new file with mode: 0644]
appc-dg-util/appc-dg-util-features/pom.xml
appc-dg-util/appc-dg-util-installer/pom.xml
appc-dg-util/pom.xml
appc-dg/appc-dg-shared/appc-dg-aai/pom.xml
appc-dg/appc-dg-shared/appc-dg-common/pom.xml
appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml
appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml
appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml
appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/.gitignore [new file with mode: 0644]
appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml
appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml
appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml
appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml
appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/.gitignore [new file with mode: 0644]
appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/pom.xml [new file with mode: 0644]
appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/.gitignore [new file with mode: 0644]
appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/pom.xml [new file with mode: 0644]
appc-dg/appc-dg-shared/appc-dg-shared-features/pom.xml
appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml
appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml
appc-dg/appc-dg-shared/pom.xml
appc-sequence-generator/appc-sequence-generator-bundle/pom.xml

index 632d141..fdba33f 100644 (file)
   -->
 <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-ssh-adapter</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-ssh-adapter-api</artifactId>
     <packaging>bundle</packaging>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/.gitignore b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/.gitignore
new file mode 100644 (file)
index 0000000..eacf31a
--- /dev/null
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/pom.xml
new file mode 100644 (file)
index 0000000..8586552
--- /dev/null
@@ -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-ssh-adapter</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-ssh-adapter</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/.gitignore b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/.gitignore
new file mode 100644 (file)
index 0000000..eacf31a
--- /dev/null
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/pom.xml
new file mode 100644 (file)
index 0000000..9967cfb
--- /dev/null
@@ -0,0 +1,94 @@
+<?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-ssh-adapter</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <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-ssh-adapter-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-ssh-adapter-sshd</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sshd</groupId>
+            <artifactId>sshd-core</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sshd</groupId>
+            <artifactId>sshd-sftp</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sshd</groupId>
+            <artifactId>sshd-scp</artifactId>
+            <version>2.0.0</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>
index 3f38bd1..840cb44 100644 (file)
@@ -1,92 +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">
-       <parent>
-               <artifactId>appc-ssh-adapter</artifactId>
-               <groupId>org.onap.appc</groupId>
-               <version>1.4.0-SNAPSHOT</version>
-       </parent>
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <artifactId>appc-ssh-adapter-features</artifactId>
-       <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-ssh-adapter-api</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+    <groupId>org.onap.appc</groupId>
+    <artifactId>appc-ssh-adapter-feature-aggregator</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-               <dependency>
-                       <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-ssh-adapter-sshd</artifactId>
-                       <version>${project.version}</version>
-               </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-ssh-adapter</module>
+        <module>features-appc-ssh-adapter</module>
+    </modules>
 </project>
index 854e2d4..4d00b57 100644 (file)
 <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-ssh-adapter</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-ssh-adapter-sshd</artifactId>
     <packaging>bundle</packaging>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
             <scope>provided</scope>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-sftp</artifactId>
             <scope>provided</scope>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-scp</artifactId>
             <scope>provided</scope>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.att.eelf</groupId>
@@ -64,7 +69,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.appc</groupId>
-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -86,6 +91,7 @@
                         <Import-Package>!org.apache.log,!org.apache.commons.logging,!groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.jasypt.*,*</Import-Package>
                         <Embed-Dependency>!dblib-provider,jasypt,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
+                        <_removeheaders>Import-Service</_removeheaders>
                     </instructions>
                 </configuration>
             </plugin>
index 7d23baf..e2cc202 100644 (file)
   -->
 <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-ssh-adapter</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-ssh-adapter-tests</artifactId>
 
     <dependencies>
@@ -41,4 +43,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
index 87f479a..092d99e 100644 (file)
   ============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">
-       <parent>
-               <artifactId>appc-adapters</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>
        <modelVersion>4.0.0</modelVersion>
 
        <artifactId>appc-ssh-adapter</artifactId>
@@ -36,4 +38,4 @@
                <module>appc-ssh-adapter-sshd</module>
                <module>appc-ssh-adapter-features</module>
        </modules>
-</project>
\ No newline at end of file
+</project>
index 32ecd39..b521f69 100644 (file)
 <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-dg-util</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-dg-util-bundle</artifactId>
     <packaging>bundle</packaging>
     <name>appc-dg-util - bundle</name>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
+            <version>${assertj.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/appc-dg-util/appc-dg-util-features/features-appc-dg-util/.gitignore b/appc-dg-util/appc-dg-util-features/features-appc-dg-util/.gitignore
new file mode 100644 (file)
index 0000000..eacf31a
--- /dev/null
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-dg-util/appc-dg-util-features/features-appc-dg-util/pom.xml b/appc-dg-util/appc-dg-util-features/features-appc-dg-util/pom.xml
new file mode 100644 (file)
index 0000000..5e86410
--- /dev/null
@@ -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-dg-util</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-dg-util</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/appc-dg-util/appc-dg-util-features/onap-appc-dg-util/.gitignore b/appc-dg-util/appc-dg-util-features/onap-appc-dg-util/.gitignore
new file mode 100644 (file)
index 0000000..eacf31a
--- /dev/null
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-dg-util/appc-dg-util-features/onap-appc-dg-util/pom.xml b/appc-dg-util/appc-dg-util-features/onap-appc-dg-util/pom.xml
new file mode 100644 (file)
index 0000000..95acf66
--- /dev/null
@@ -0,0 +1,81 @@
+<?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-dg-util</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <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.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-dg-util-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>
index 22d6105..5b0f7d2 100644 (file)
 <?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-dg-util</artifactId>
-    <groupId>org.onap.appc</groupId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent>
-  <name>appc-dg-util-features</name>
-  <artifactId>appc-dg-util-features</artifactId>
-
-  <packaging>jar</packaging>
-
-  <dependencies>
-     <dependency>
-      <groupId>org.onap.appc</groupId>
-      <artifactId>appc-dg-util-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>
-
+    <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-dg-util-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>
-        <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-dg-util</module>
+        <module>features-appc-dg-util</module>
+    </modules>
 </project>
index 53f3309..719cd6f 100644 (file)
   -->
 <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-dg-util</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>
   <artifactId>appc-dg-util-installer</artifactId>
   <name>APPC DG Util - Karaf Installer</name>
   <packaging>pom</packaging>
@@ -33,7 +34,7 @@
   <properties>
     <application.name>appc-dg-util</application.name>
     <features.boot>appc-dg-util</features.boot>
-    <features.repositories>mvn:org.onap.appc/appc-dg-util-features/${project.version}/xml/features</features.repositories>
+    <features.repositories>mvn:org.onap.appc/onap-appc-dg-util/${project.version}/xml/features</features.repositories>
     <include.transitive.dependencies>false</include.transitive.dependencies>
   </properties>
 
@@ -41,7 +42,7 @@
 
     <dependency>
       <groupId>org.onap.appc</groupId>
-      <artifactId>appc-dg-util-features</artifactId>
+      <artifactId>onap-appc-dg-util</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </plugins>
   </build>
 
+  <groupId>org.onap.appc</groupId>
 </project>
index 9855c3f..1e0333c 100644 (file)
   -->
 <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>
   <artifactId>appc-dg-util</artifactId>
   <packaging>pom</packaging>
   <name>APPC DG util</name>
@@ -40,4 +41,5 @@
                <module>appc-dg-util-installer</module>
        </modules>
   
-</project>
\ No newline at end of file
+       <groupId>org.onap.appc</groupId>
+</project>
index e399aba..731debf 100644 (file)
 <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-dg-shared</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-dg-aai</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>
-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
index f8cae40..0540b9f 100644 (file)
   -->
 <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-dg-shared</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-dg-common</artifactId>
        <packaging>bundle</packaging>
 
        <dependencies>
                <dependency>
                        <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-common</artifactId>
+                       <artifactId>appc-common-bundle</artifactId>
                        <version>${project.version}</version>
                        <!-- TODO: WA for fixing build, clueanup dependency tree -->
                        <exclusions>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson-yaml-version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson-yaml-version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson-yaml-version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${jackson-yaml-version}</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>${snakeyaml.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
 
                                                <!--Embed-Dependency>eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency-->
                                                <Embed-Transitive>true</Embed-Transitive>
+                                               <_removeheaders>Import-Service</_removeheaders>
                                        </instructions>
                                </configuration>
                        </plugin>
index 59863df..4623217 100644 (file)
   -->
 <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>
+    <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-dg-shared</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent>
 
   <artifactId>appc-dg-dependency-model</artifactId>
   <packaging>jar</packaging>
@@ -41,7 +43,7 @@
   <dependencies>
     <dependency>
       <groupId>org.onap.appc</groupId>
-      <artifactId>appc-common</artifactId>
+      <artifactId>appc-common-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <artifactId>appc-dg-domain-model-lib</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+        <groupId>equinoxSDK381</groupId>
+        <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
index fafd68c..179466d 100644 (file)
   -->
 <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-dg-shared</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-dg-domain-model-lib</artifactId>
index 4c42e3e..fc6fe10 100644 (file)
   -->
 <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-dg-shared</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-dg-license-manager</artifactId>
        <packaging>bundle</packaging>
 
@@ -71,6 +73,7 @@
                                                        org.onap.appc.exceptions, com.att.eelf.configuration,
                                                        *;resolution:=optional
                                                </Import-Package>
+                                               <_removeheaders>Import-Service</_removeheaders>
                                        </instructions>
                                </configuration>
                        </plugin>
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/.gitignore b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/.gitignore
new file mode 100644 (file)
index 0000000..eacf31a
--- /dev/null
@@ -0,0 +1 @@
+/target-ide/
index 36c5156..4823299 100644 (file)
          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-dg-mdsal-store</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-dg-mdsal-bundle</artifactId>
     <packaging>bundle</packaging>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>${apache.httpcomponents.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
 
         <dependency>
             <groupId>org.onap.appc</groupId>
-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
index cf66d37..89fca6e 100644 (file)
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <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-dg-mdsal-store</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent>
 
   <artifactId>appc-dg-mdsal-model</artifactId>
   <packaging>bundle</packaging>
index 4377bbf..3ec3bb9 100644 (file)
          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-dg-shared</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-dg-mdsal-store</artifactId>
     <packaging>pom</packaging>
 
index 4cb5257..2a75478 100644 (file)
   -->
 <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-dg-shared</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-dg-netconf</artifactId>
        <packaging>bundle</packaging>
 
        <dependencies>
                <dependency>
                        <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-common</artifactId>
+                       <artifactId>appc-common-bundle</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
                                                </Import-Package>
                                                <!--Embed-Dependency>eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency-->
                                                <Embed-Transitive>true</Embed-Transitive>
+                                               <_removeheaders>Import-Service</_removeheaders>
                                        </instructions>
                                </configuration>
                        </plugin>
diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/.gitignore b/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/.gitignore
new file mode 100644 (file)
index 0000000..eacf31a
--- /dev/null
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/pom.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/pom.xml
new file mode 100644 (file)
index 0000000..a45bc78
--- /dev/null
@@ -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-dg-shared</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-dg-shared</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/.gitignore b/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/.gitignore
new file mode 100644 (file)
index 0000000..eacf31a
--- /dev/null
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/pom.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/pom.xml
new file mode 100644 (file)
index 0000000..ccf2089
--- /dev/null
@@ -0,0 +1,115 @@
+<?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-dg-shared</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <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>onap-appc-ssh-adapter</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-netconf-adapter</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-dg-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-dg-ssh</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-dg-netconf</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-dg-license-manager</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-dg-aai</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>
index dfb413b..f010c18 100644 (file)
 <?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>
-               <groupId>org.onap.appc</groupId>
-               <artifactId>appc-dg-shared</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>appc-dg-shared-features</artifactId>
-       <packaging>jar</packaging>
+    <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-dg-shared-feature-aggregator</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-dg-ssh</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-dg-netconf</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-dg-aai</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-dg-license-manager</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-dg-common</artifactId>
-                       <version>${project.version}</version>
-               </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-dg-shared</module>
+        <module>features-appc-dg-shared</module>
+    </modules>
 </project>
index 472697c..cd61201 100644 (file)
   -->
 <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-dg-shared</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-dg-shared-installer</artifactId>
        <name>APPC DG Shared - Karaf Installer</name>
        <packaging>pom</packaging>
        <properties>
                <application.name>appc-dg-shared</application.name>
                <features.boot>appc-dg-shared</features.boot>
-               <features.repositories>mvn:org.onap.appc/appc-dg-shared-features/${project.version}/xml/features</features.repositories>
+               <features.repositories>mvn:org.onap.appc/onap-appc-dg-shared/${project.version}/xml/features</features.repositories>
        </properties>
 
        <dependencies>
                <dependency>
                        <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-dg-shared-features</artifactId>
+                       <artifactId>onap-appc-dg-shared</artifactId>
                        <version>${project.version}</version>
                        <classifier>features</classifier>
                        <type>xml</type>
 
                <dependency>
                        <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-ssh-adapter-features</artifactId>
-                       <version>${project.version}</version>
-                       <classifier>features</classifier>
-                       <type>xml</type>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-netconf-adapter-features</artifactId>
+                       <artifactId>onap-appc-ssh-adapter</artifactId>
                        <version>${project.version}</version>
                        <classifier>features</classifier>
                        <type>xml</type>
index 0a474ea..f83c43e 100644 (file)
   -->
 <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-dg-shared</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-dg-ssh</artifactId>
        <packaging>bundle</packaging>
 
        <dependencies>
                <dependency>
                        <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-common</artifactId>
+                       <artifactId>appc-common-bundle</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
@@ -83,6 +85,7 @@
                                                </Import-Package>
                                                <!--Embed-Dependency>eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency-->
                                                <Embed-Transitive>true</Embed-Transitive>
+                                               <_removeheaders>Import-Service</_removeheaders>
                                        </instructions>
                                </configuration>
                        </plugin>
index da2f198..9e048d7 100644 (file)
   -->
 <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-dg</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>
        <artifactId>appc-dg-shared</artifactId>
        <packaging>pom</packaging>
 
index 9e7f438..3957010 100644 (file)
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
        </dependency>
+       <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>1.1.0.Final</version>
+    </dependency>
 
         <dependency>
             <groupId>org.onap.appc</groupId>