Upgrade appc-dispatcher features to karaf4

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

diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml
index c28d1d8..0750979 100644 (file)
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml
@@ -25,11 +25,12 @@
          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>
          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-command-executor</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>

 
     <artifactId>appc-command-executor-api</artifactId>
     <packaging>bundle</packaging>
 
     <artifactId>appc-command-executor-api</artifactId>
     <packaging>bundle</packaging>


@@ -53,7 +54,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.appc</groupId>
         </dependency>
         <dependency>
             <groupId>org.onap.appc</groupId>

-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>

             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>


@@ -88,4 +89,5 @@
             </plugin>
         </plugins>
     </build>
             </plugin>
         </plugins>
     </build>

+    <groupId>org.onap.appc</groupId>

 </project>
 </project>

diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml
index 9ed08dd..86ed514 100644 (file)
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml
@@ -25,11 +25,12 @@
          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>
          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-command-executor</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>

 
     <artifactId>appc-command-executor-core</artifactId>
     <packaging>bundle</packaging>
 
     <artifactId>appc-command-executor-core</artifactId>
     <packaging>bundle</packaging>


@@ -106,6 +107,7 @@
                             org.onap.appc.executor.objects,
                             *;resolution:=optional
                         </Import-Package>
                             org.onap.appc.executor.objects,
                             *;resolution:=optional
                         </Import-Package>

+                        <_removeheaders>Import-Service</_removeheaders>

                     </instructions>
                 </configuration>
             </plugin>
                     </instructions>
                 </configuration>
             </plugin>


@@ -121,4 +123,5 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
             </dependency>
         </dependencies>
     </dependencyManagement>

+    <groupId>org.onap.appc</groupId>

 </project>
 </project>

diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-features/features-appc-command-executor/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-features/features-appc-command-executor/pom.xml
new file mode 100644 (file)
index 0000000..650c02d
--- /dev/null
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-features/features-appc-command-executor/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-command-executor</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-command-executor</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>

diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-features/onap-appc-command-executor/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-features/onap-appc-command-executor/pom.xml
new file mode 100644 (file)
index 0000000..8fcd9de
--- /dev/null
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-features/onap-appc-command-executor/pom.xml
@@ -0,0 +1,78 @@
+<?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-command-executor</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>execution-queue-management-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-command-executor-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-command-executor-core</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-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml
index 18b1d00..a2e04a9 100644 (file)
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml
@@ -1,131 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 <?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=========================================================
-  -->
-<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">
+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>
     <modelVersion>4.0.0</modelVersion>

+

     <parent>
     <parent>

-        <artifactId>appc-command-executor</artifactId>
-        <groupId>org.onap.appc</groupId>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>

         <version>1.4.0-SNAPSHOT</version>
         <version>1.4.0-SNAPSHOT</version>

+        <relativePath />

     </parent>
 
     </parent>
 

-    <name>APPC Command Executor - Features</name>
-    <artifactId>appc-command-executor-features</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.appc</groupId>
-            <artifactId>appc-command-executor-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.appc</groupId>
-            <artifactId>appc-command-executor-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
+    <groupId>org.onap.appc</groupId>
+    <artifactId>appc-command-executor-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. -->
-            <!--                 <groupId>org.apache.maven.plugins</groupId> -->
-            <!--                 <artifactId>maven-surefire-plugin</artifactId> -->
-            <!--                 <version>2.16</version> -->
-            <!--                 <configuration> -->
-            <!--                     <systemPropertyVariables> -->
-            <!--                         <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId> -->
-            <!--                         <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId> -->
-            <!--                         <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version> -->
-            <!--                     </systemPropertyVariables> -->
-            <!--                     <dependenciesToScan> -->
-            <!--                         <dependency>org.opendaylight.yangtools:features-test</dependency> -->
-            <!--                     </dependenciesToScan> -->
-            <!--                     <classpathDependencyExcludes> -->
-            <!-- The dependencies which bring in AbstractDataBrokerTest class brings
-                in a second PaxExam container which results in the feature tests failing
-                with a message similar to: "ERROR o.ops4j.pax.exam.spi.PaxExamRuntime - Ambiguous
-                TestContainer ..." This excludes the container we don't want to use. -->
-            <!--                         <classpathDependencyExcludes>org.ops4j.pax.exam:pax-exam-container-native</classpathDependencyExcludes> -->
-            <!--                     </classpathDependencyExcludes> -->
-            <!--                 </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>

 
 

-            <!-- Skipping ODL feature test -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <modules>
+        <module>onap-appc-command-executor</module>
+        <module>features-appc-command-executor</module>
+    </modules>

 </project>
 </project>

diff --git a/appc-dispatcher/appc-command-executor/pom.xml b/appc-dispatcher/appc-command-executor/pom.xml
index 9c48ccd..e2bcd0e 100644 (file)
--- a/appc-dispatcher/appc-command-executor/pom.xml
+++ b/appc-dispatcher/appc-command-executor/pom.xml
@@ -26,9 +26,10 @@
          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>
          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-dispatcher</artifactId>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>

         <version>1.4.0-SNAPSHOT</version>
         <version>1.4.0-SNAPSHOT</version>

+        <relativePath />

     </parent>
 
     <artifactId>appc-command-executor</artifactId>
     </parent>
 
     <artifactId>appc-command-executor</artifactId>


@@ -45,4 +46,5 @@
         <module>appc-command-executor-features</module>
     </modules>
 
         <module>appc-command-executor-features</module>
     </modules>
 

+    <groupId>org.onap.appc</groupId>

 </project>
 </project>

diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml
index 82ce55e..80ba833 100644 (file)
--- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml
@@ -43,7 +43,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>

-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>

             <version>${project.version}</version>
         </dependency>
         <dependency>
             <version>${project.version}</version>
         </dependency>
         <dependency>

diff --git a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml
index 496d519..59f15b1 100644 (file)
--- a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml
@@ -41,7 +41,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>

-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>

             <version>${project.version}</version>
         </dependency>
         <dependency>
             <version>${project.version}</version>
         </dependency>
         <dependency>


@@ -81,6 +81,7 @@
                         <Export-Package>
                             org.onap.appc.transactionrecorder,org.onap.appc.transactionrecorder.impl,org.onap.appc.transactionrecorder.objects
                         </Export-Package>
                         <Export-Package>
                             org.onap.appc.transactionrecorder,org.onap.appc.transactionrecorder.impl,org.onap.appc.transactionrecorder.objects
                         </Export-Package>

+                        <_removeheaders>Import-Service,Export-Service</_removeheaders>

                     </instructions>
                 </configuration>
             </plugin>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/appc-dispatcher/appc-dispatcher-installer/pom.xml b/appc-dispatcher/appc-dispatcher-installer/pom.xml
index 2850cb6..508916f 100644 (file)
--- a/appc-dispatcher/appc-dispatcher-installer/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-installer/pom.xml
@@ -44,10 +44,10 @@
         <features.repo.dispatcher>mvn:org.onap.appc/appc-dispatcher-features/${project.version}/xml/features
         </features.repo.dispatcher>
         <features.repo.requestHandler>
         <features.repo.dispatcher>mvn:org.onap.appc/appc-dispatcher-features/${project.version}/xml/features
         </features.repo.dispatcher>
         <features.repo.requestHandler>

-            mvn:org.onap.appc/appc-request-handler-features/${project.version}/xml/features
+            mvn:org.onap.appc/onap-appc-request-handler/${project.version}/xml/features

         </features.repo.requestHandler>
         <features.repo.commandExecutor>
         </features.repo.requestHandler>
         <features.repo.commandExecutor>

-            mvn:org.onap.appc/appc-command-executor-features/${project.version}/xml/features
+            mvn:org.onap.appc/onap-appc-command-executor/${project.version}/xml/features

         </features.repo.commandExecutor>
         <features.repo.lifecycleManagement>
             mvn:org.onap.appc/onap-appc-lifecycle-management/${project.version}/xml/features
         </features.repo.commandExecutor>
         <features.repo.lifecycleManagement>
             mvn:org.onap.appc/onap-appc-lifecycle-management/${project.version}/xml/features


@@ -56,7 +56,7 @@
             mvn:org.onap.appc/onap-appc-license-manager/${project.version}/xml/features
         </features.repo.licenseManager>
         <features.repo.workflowManagement>
             mvn:org.onap.appc/onap-appc-license-manager/${project.version}/xml/features
         </features.repo.licenseManager>
         <features.repo.workflowManagement>

-            mvn:org.onap.appc/appc-workflow-management-features/${project.version}/xml/features
+            mvn:org.onap.appc/onap-appc-workflow-management/${project.version}/xml/features

         </features.repo.workflowManagement>
         <features.repo.lockManager>mvn:org.onap.appc/lock-manager-features/${project.version}/xml/features
         </features.repo.lockManager>
         </features.repo.workflowManagement>
         <features.repo.lockManager>mvn:org.onap.appc/lock-manager-features/${project.version}/xml/features
         </features.repo.lockManager>


@@ -76,7 +76,7 @@
 
         <dependency>
             <groupId>org.onap.appc</groupId>
 
         <dependency>
             <groupId>org.onap.appc</groupId>

-            <artifactId>appc-request-handler-features</artifactId>
+            <artifactId>onap-appc-request-handler</artifactId>

             <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
             <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>


@@ -84,7 +84,7 @@
 
         <dependency>
             <groupId>org.onap.appc</groupId>
 
         <dependency>
             <groupId>org.onap.appc</groupId>

-            <artifactId>appc-command-executor-features</artifactId>
+            <artifactId>onap-appc-command-executor</artifactId>

             <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
             <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>


@@ -100,7 +100,7 @@
 
         <dependency>
             <groupId>org.onap.appc</groupId>
 
         <dependency>
             <groupId>org.onap.appc</groupId>

-            <artifactId>appc-workflow-management-features</artifactId>
+            <artifactId>onap-appc-workflow-management</artifactId>

             <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
             <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>

diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml
index d650a33..925bf78 100644 (file)
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml
@@ -82,6 +82,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>dblib-provider</artifactId>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>dblib-provider</artifactId>

+            <scope>provided</scope>

         </dependency>
     </dependencies>
 
         </dependency>
     </dependencies>
 


@@ -104,6 +105,7 @@
                             org.onap.appc.licmgr,org.onap.appc.licmgr.exception,org.onap.appc.licmgr.objects,
                             *;resolution:=optional
                         </Import-Package>
                             org.onap.appc.licmgr,org.onap.appc.licmgr.exception,org.onap.appc.licmgr.objects,
                             *;resolution:=optional
                         </Import-Package>

+                        <_removeheaders>Import-Service</_removeheaders>

 
                         <Embed-Transitive>true</Embed-Transitive>
                     </instructions>
 
                         <Embed-Transitive>true</Embed-Transitive>
                     </instructions>

diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml
index b770775..493cb52 100644 (file)
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml
@@ -24,11 +24,12 @@
          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>
          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-request-handler</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>

 
     <artifactId>appc-request-handler-api</artifactId>
     <packaging>bundle</packaging>
 
     <artifactId>appc-request-handler-api</artifactId>
     <packaging>bundle</packaging>


@@ -57,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.appc</groupId>
         </dependency>
         <dependency>
             <groupId>org.onap.appc</groupId>

-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>

             <version>${project.version}</version>
         </dependency>
     </dependencies>
             <version>${project.version}</version>
         </dependency>
     </dependencies>


@@ -86,4 +87,5 @@
             </plugin>
         </plugins>
     </build>
             </plugin>
         </plugins>
     </build>

+    <groupId>org.onap.appc</groupId>

 </project>
 </project>

diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml
index 6bf2335..dbb81bb 100644 (file)
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml
@@ -25,11 +25,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>
          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-request-handler</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>

 
     <artifactId>appc-request-handler-core</artifactId>
     <packaging>bundle</packaging>
 
     <artifactId>appc-request-handler-core</artifactId>
     <packaging>bundle</packaging>


@@ -40,7 +41,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>

-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>

             <version>${project.version}</version>
         </dependency>
         <dependency>
             <version>${project.version}</version>
         </dependency>
         <dependency>


@@ -130,6 +131,7 @@
         <dependency>
             <groupId>equinoxSDK381</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
         <dependency>
             <groupId>equinoxSDK381</groupId>
             <artifactId>org.eclipse.osgi</artifactId>

+            <version>${equinox.osgi.version}</version>

             <scope>test</scope>
         </dependency>
     </dependencies>
             <scope>test</scope>
         </dependency>
     </dependencies>


@@ -161,10 +163,12 @@
                             !org.onap.appc.requesthandler.conv,
                             *;resolution:=optional
                         </Import-Package>
                             !org.onap.appc.requesthandler.conv,
                             *;resolution:=optional
                         </Import-Package>

+                        <_removeheaders>Import-Service</_removeheaders>

                     </instructions>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
                     </instructions>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 

+    <groupId>org.onap.appc</groupId>

 </project>
 </project>

diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-features/features-appc-request-handler/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-features/features-appc-request-handler/pom.xml
new file mode 100644 (file)
index 0000000..1673e67
--- /dev/null
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-features/features-appc-request-handler/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-request-handler</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-request-handler</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>

diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-features/onap-appc-request-handler/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-features/onap-appc-request-handler/pom.xml
new file mode 100644 (file)
index 0000000..2fcff3a
--- /dev/null
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-features/onap-appc-request-handler/pom.xml
@@ -0,0 +1,110 @@
+<?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-request-handler</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>transaction-recorder</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-data-access-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>domain-model-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-message-adapter-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-provider-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-command-executor-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-request-handler-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-request-handler-core</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-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml
index 56a5a77..fcd18e2 100644 (file)
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml
@@ -1,132 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 <?xml version="1.0" encoding="UTF-8"?>
 <!--

-  ============LICENSE_START=======================================================
-  ONAP : APPC
-  ================================================================================
-  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Copyright (C) 2017 Amdocs
-  =============================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  ============LICENSE_END=========================================================
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+=============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>

+

     <parent>
     <parent>

-        <artifactId>appc-request-handler</artifactId>
-        <groupId>org.onap.appc</groupId>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>

         <version>1.4.0-SNAPSHOT</version>
         <version>1.4.0-SNAPSHOT</version>

+        <relativePath />

     </parent>
 
     </parent>
 

-    <name>APPC Request Handler - Features</name>
-    <artifactId>appc-request-handler-features</artifactId>
-    <packaging>jar</packaging>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.appc</groupId>
-            <artifactId>appc-request-handler-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.appc</groupId>
-            <artifactId>appc-request-handler-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
+    <groupId>org.onap.appc</groupId>
+    <artifactId>appc-request-handler-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>
-              &lt;!&ndash; 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. &ndash;&gt;
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <version>2.16</version>
-              <configuration>
-                <systemPropertyVariables>
-                  <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-                  <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-                  <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
-                </systemPropertyVariables>
-                <dependenciesToScan>
-                  <dependency>org.opendaylight.yangtools:features-test</dependency>
-                </dependenciesToScan>
-                <classpathDependencyExcludes>
-                  &lt;!&ndash; 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. &ndash;&gt;
-                  <classpathDependencyExcludes>org.ops4j.pax.exam:pax-exam-container-native</classpathDependencyExcludes>
-                </classpathDependencyExcludes>
-              </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>

 
 

-            <!-- Skipping ODL feature test -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <modules>
+        <module>onap-appc-request-handler</module>
+        <module>features-appc-request-handler</module>
+    </modules>

 </project>
 </project>

diff --git a/appc-dispatcher/appc-request-handler/pom.xml b/appc-dispatcher/appc-request-handler/pom.xml
index 05c5c41..0579ef2 100644 (file)
--- a/appc-dispatcher/appc-request-handler/pom.xml
+++ b/appc-dispatcher/appc-request-handler/pom.xml
@@ -26,9 +26,10 @@
          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>
          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-dispatcher</artifactId>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>

         <version>1.4.0-SNAPSHOT</version>
         <version>1.4.0-SNAPSHOT</version>

+        <relativePath />

     </parent>
 
     <artifactId>appc-request-handler</artifactId>
     </parent>
 
     <artifactId>appc-request-handler</artifactId>


@@ -46,4 +47,5 @@
         <module>appc-request-handler-features</module>
     </modules>
 
         <module>appc-request-handler-features</module>
     </modules>
 

+    <groupId>org.onap.appc</groupId>

 </project>
 </project>

diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml
index fd09754..498ea44 100644 (file)
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml
@@ -25,11 +25,12 @@
          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>
          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-workflow-management</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>

 
     <artifactId>appc-workflow-management-api</artifactId>
     <name>APPC Workflow Management API</name>
 
     <artifactId>appc-workflow-management-api</artifactId>
     <name>APPC Workflow Management API</name>


@@ -73,4 +74,5 @@
             </plugin>
         </plugins>
     </build>
             </plugin>
         </plugins>
     </build>

+    <groupId>org.onap.appc</groupId>

 </project>
 </project>

diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml
index 170a008..7c874f8 100644 (file)
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml
@@ -25,11 +25,12 @@
          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>
          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-workflow-management</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>

 
     <artifactId>appc-workflow-management-core</artifactId>
     <packaging>bundle</packaging>
 
     <artifactId>appc-workflow-management-core</artifactId>
     <packaging>bundle</packaging>


@@ -40,7 +41,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>

-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>

             <version>${project.version}</version>
         </dependency>
         <dependency>
             <version>${project.version}</version>
         </dependency>
         <dependency>


@@ -62,6 +63,7 @@
             <groupId>equinoxSDK381</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
             <scope>test</scope>
             <groupId>equinoxSDK381</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
             <scope>test</scope>

+            <version>${equinox.osgi.version}</version>

         </dependency>
         <dependency>
             <groupId>org.onap.appc</groupId>
         </dependency>
         <dependency>
             <groupId>org.onap.appc</groupId>


@@ -90,10 +92,12 @@
                             org.onap.appc.util,com.att.eelf.configuration, org.onap.appc.dao.util,
                             *;resolution:=optional
                         </Import-Package>
                             org.onap.appc.util,com.att.eelf.configuration, org.onap.appc.dao.util,
                             *;resolution:=optional
                         </Import-Package>

+                        <_removeheaders>Import-Service</_removeheaders>

                     </instructions>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
                     </instructions>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 

+    <groupId>org.onap.appc</groupId>

 </project>
 </project>

diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/features-appc-workflow-management/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/features-appc-workflow-management/pom.xml
new file mode 100644 (file)
index 0000000..b0ba391
--- /dev/null
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/features-appc-workflow-management/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-workflow-management</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-workflow-management</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>

diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/onap-appc-workflow-management/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/onap-appc-workflow-management/pom.xml
new file mode 100644 (file)
index 0000000..d7a7e9d
--- /dev/null
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/onap-appc-workflow-management/pom.xml
@@ -0,0 +1,83 @@
+<?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-workflow-management</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-data-access-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-workflow-management-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-workflow-management-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-ranking-framework-lib</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-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml
index e5dfba7..f4c5dd0 100644 (file)
--- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml
+++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml
@@ -1,132 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 <?xml version="1.0" encoding="UTF-8"?>
 <!--

-  ============LICENSE_START=======================================================
-  ONAP : APPC
-  ================================================================================
-  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Copyright (C) 2017 Amdocs
-  =============================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  ============LICENSE_END=========================================================
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+=============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>

+

     <parent>
     <parent>

-        <artifactId>appc-workflow-management</artifactId>
-        <groupId>org.onap.appc</groupId>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>

         <version>1.4.0-SNAPSHOT</version>
         <version>1.4.0-SNAPSHOT</version>

+        <relativePath />

     </parent>
 
     </parent>
 

-    <artifactId>appc-workflow-management-features</artifactId>
-    <name>APPC Workflow Management - Feature</name>
-    <packaging>jar</packaging>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.appc</groupId>
-            <artifactId>appc-workflow-management-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.appc</groupId>
-            <artifactId>appc-workflow-management-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
+    <groupId>org.onap.appc</groupId>
+    <artifactId>appc-workflow-management-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>
-              &lt;!&ndash; 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. &ndash;&gt;
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <version>2.16</version>
-              <configuration>
-                <systemPropertyVariables>
-                  <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-                  <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-                  <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
-                </systemPropertyVariables>
-                <dependenciesToScan>
-                  <dependency>org.opendaylight.yangtools:features-test</dependency>
-                </dependenciesToScan>
-                <classpathDependencyExcludes>
-                  &lt;!&ndash; 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. &ndash;&gt;
-                  <classpathDependencyExcludes>org.ops4j.pax.exam:pax-exam-container-native</classpathDependencyExcludes>
-                </classpathDependencyExcludes>
-              </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>

 
 

-            <!-- Skipping ODL feature test -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <modules>
+        <module>onap-appc-workflow-management</module>
+        <module>features-appc-workflow-management</module>
+    </modules>

 </project>
 </project>

diff --git a/appc-dispatcher/appc-workflow-management/pom.xml b/appc-dispatcher/appc-workflow-management/pom.xml
index 3b4d07a..d582fee 100644 (file)
--- a/appc-dispatcher/appc-workflow-management/pom.xml
+++ b/appc-dispatcher/appc-workflow-management/pom.xml
@@ -26,9 +26,10 @@
          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>
          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-dispatcher</artifactId>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>

         <version>1.4.0-SNAPSHOT</version>
         <version>1.4.0-SNAPSHOT</version>

+        <relativePath />

     </parent>
 
     <artifactId>appc-workflow-management</artifactId>
     </parent>
 
     <artifactId>appc-workflow-management</artifactId>


@@ -45,4 +46,5 @@
         <module>appc-workflow-management-features</module>
     </modules>
 
         <module>appc-workflow-management-features</module>
     </modules>
 

+    <groupId>org.onap.appc</groupId>

 </project>
 </project>