Karaf 4 for appc-sdc-listener 21/59921/7
authorPatrick Brady <pb071s@att.com>
Thu, 9 Aug 2018 20:42:38 +0000 (13:42 -0700)
committerPatrick Brady <pb071s@att.com>
Tue, 14 Aug 2018 00:00:31 +0000 (00:00 +0000)
Change-Id: If3dabdd96403d1d197b0ac021912a8cd2b8ce772
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1138

appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/.gitignore [new file with mode: 0644]
appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/pom.xml [new file with mode: 0644]
appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/.gitignore [new file with mode: 0644]
appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/pom.xml [new file with mode: 0644]
appc-sdc-listener/appc-sdc-listener-features/pom.xml
appc-sdc-listener/appc-sdc-listener-installer/pom.xml
appc-sdc-listener/appc-yang-generator/dependency-reduced-pom.xml [new file with mode: 0644]
appc-sdc-listener/appc-yang-generator/pom.xml
appc-sdc-listener/pom.xml

index 63d6cd3..5871758 100644 (file)
@@ -24,10 +24,12 @@ limitations under the License.
 
 
        <parent>
-               <artifactId>appc-sdc-listener</artifactId>
-               <groupId>org.onap.appc</groupId>
+               <groupId>org.onap.appc.parent</groupId>
+               <artifactId>binding-parent</artifactId>
                <version>1.4.0-SNAPSHOT</version>
+                <relativePath />
        </parent>
+        <groupId>org.onap.appc</groupId>
 
        <properties>
                <jackson-yaml-version>2.8.1</jackson-yaml-version>
@@ -93,7 +95,7 @@ limitations under the License.
 
                <dependency>
                        <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-common</artifactId>
+                       <artifactId>appc-common-bundle</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
diff --git a/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/.gitignore b/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/.gitignore
new file mode 100644 (file)
index 0000000..eacf31a
--- /dev/null
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/pom.xml b/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/pom.xml
new file mode 100644 (file)
index 0000000..e8247f5
--- /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-sdc-listener</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-sdc-listener</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/.gitignore b/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/.gitignore
new file mode 100644 (file)
index 0000000..eacf31a
--- /dev/null
@@ -0,0 +1 @@
+/target-ide/
diff --git a/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/pom.xml b/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/pom.xml
new file mode 100644 (file)
index 0000000..0aa9988
--- /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-sdc-listener</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name></name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>onap-appc-core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-sdc-listener-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 50c3b4c..a7d0d75 100644 (file)
@@ -3,9 +3,7 @@
 ============LICENSE_START=======================================================
 ONAP : APPC
 ================================================================================
-Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
-================================================================================
-Copyright (C) 2017 Amdocs
+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.
@@ -18,94 +16,27 @@ 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-sdc-listener</artifactId>
-               <groupId>org.onap.appc</groupId>
-               <version>1.4.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>appc-sdc-listener-features</artifactId>
-       <name>Event Listener - Features</name>
-
-       <packaging>jar</packaging>
-
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-sdc-listener-bundle</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>commons-lang</groupId>
-                       <artifactId>commons-lang</artifactId>
-                       <scope>compile</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.opendaylight.mdsal</groupId>
-                       <artifactId>features-mdsal</artifactId>
-                       <classifier>features</classifier>
-                       <type>xml</type>
-                       <scope>runtime</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.opendaylight.yangtools</groupId>
-                       <artifactId>features-yangtools</artifactId>
-                       <classifier>features</classifier>
-                       <type>xml</type>
-                       <scope>runtime</scope>
-               </dependency>
-       </dependencies>
-
-       <build>
-               <resources>
-                       <resource>
-                               <filtering>true</filtering>
-                               <directory>src/main/resources</directory>
-                       </resource>
-               </resources>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-resources-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>filter</id>
-                                               <goals>
-                                                       <goal>resources</goal>
-                                               </goals>
-                                               <phase>generate-resources</phase>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>build-helper-maven-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>attach-artifacts</id>
-                                               <goals>
-                                                       <goal>attach-artifact</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <artifacts>
-                                                               <artifact>
-                                                                       <file>${project.build.directory}/classes/${features.file}</file>
-                                                                       <type>xml</type>
-                                                                       <classifier>features</classifier>
-                                                               </artifact>
-                                                       </artifacts>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.appc</groupId>
+    <artifactId>appc-sdc-listener-feature-aggregator</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name></name>
+
+    <modules>
+        <module>onap-appc-sdc-listener</module>
+        <module>features-appc-sdc-listener</module>
+    </modules>
 </project>
index c4cdec6..0bfbce9 100644 (file)
@@ -24,10 +24,12 @@ limitations under the License.
 <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-sdc-listener</artifactId>
-               <groupId>org.onap.appc</groupId>
+               <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-sdc-listener-installer</artifactId>
        <name>SDC Listener - Karaf Installer</name>
        <packaging>pom</packaging>
@@ -35,7 +37,7 @@ limitations under the License.
        <properties>
                <application.name>appc-sdc-listener</application.name>
                <features.boot>appc-sdc-listener</features.boot>
-               <features.repositories>mvn:org.onap.appc/appc-sdc-listener-features/${project.version}/xml/features</features.repositories>
+               <features.repositories>mvn:org.onap.appc/onap-appc-sdc-listener/${project.version}/xml/features</features.repositories>
                <include.transitive.dependencies>false</include.transitive.dependencies>
        </properties>
 
@@ -43,7 +45,7 @@ limitations under the License.
 
                <dependency>
                        <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-sdc-listener-features</artifactId>
+                       <artifactId>onap-appc-sdc-listener</artifactId>
                        <version>${project.version}</version>
                        <classifier>features</classifier>
                        <type>xml</type>
diff --git a/appc-sdc-listener/appc-yang-generator/dependency-reduced-pom.xml b/appc-sdc-listener/appc-yang-generator/dependency-reduced-pom.xml
new file mode 100644 (file)
index 0000000..fbb0a4f
--- /dev/null
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+  <parent>\r
+    <artifactId>binding-parent</artifactId>\r
+    <groupId>org.onap.appc.parent</groupId>\r
+    <version>1.4.0-SNAPSHOT</version>\r
+    <relativePath>pom.xml</relativePath>\r
+  </parent>\r
+  <modelVersion>4.0.0</modelVersion>\r
+  <groupId>org.onap.appc</groupId>\r
+  <artifactId>appc-yang-generator</artifactId>\r
+  <build>\r
+    <plugins>\r
+      <plugin>\r
+        <artifactId>maven-shade-plugin</artifactId>\r
+        <executions>\r
+          <execution>\r
+            <phase>package</phase>\r
+            <goals>\r
+              <goal>shade</goal>\r
+            </goals>\r
+          </execution>\r
+        </executions>\r
+        <configuration>\r
+          <finalName>${artifactId}-${version}</finalName>\r
+        </configuration>\r
+      </plugin>\r
+      <plugin>\r
+        <artifactId>maven-compiler-plugin</artifactId>\r
+        <version>3.6.1</version>\r
+        <configuration>\r
+          <source>1.8</source>\r
+          <target>1.8</target>\r
+        </configuration>\r
+      </plugin>\r
+    </plugins>\r
+  </build>\r
+  <dependencies>\r
+    <dependency>\r
+      <groupId>junit</groupId>\r
+      <artifactId>junit</artifactId>\r
+      <version>4.11</version>\r
+      <scope>test</scope>\r
+      <exclusions>\r
+        <exclusion>\r
+          <artifactId>hamcrest-core</artifactId>\r
+          <groupId>org.hamcrest</groupId>\r
+        </exclusion>\r
+      </exclusions>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.slf4j</groupId>\r
+      <artifactId>slf4j-api</artifactId>\r
+      <version>1.7.25</version>\r
+      <scope>provided</scope>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.slf4j</groupId>\r
+      <artifactId>slf4j-simple</artifactId>\r
+      <version>1.7.25</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>com.google.code.findbugs</groupId>\r
+      <artifactId>annotations</artifactId>\r
+      <version>3.0.0</version>\r
+      <scope>provided</scope>\r
+      <exclusions>\r
+        <exclusion>\r
+          <artifactId>jcip-annotations</artifactId>\r
+          <groupId>net.jcip</groupId>\r
+        </exclusion>\r
+      </exclusions>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.eclipse.jdt</groupId>\r
+      <artifactId>org.eclipse.jdt.annotation</artifactId>\r
+      <version>2.1.0</version>\r
+      <scope>provided</scope>\r
+    </dependency>\r
+  </dependencies>\r
+  <properties>\r
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+  </properties>\r
+</project>\r
+\r
index cc0fbbc..d268ac4 100644 (file)
@@ -25,11 +25,13 @@ limitations under the License.
          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-sdc-listener</artifactId>
+       <parent>
+               <groupId>org.onap.appc.parent</groupId>
+               <artifactId>binding-parent</artifactId>
+               <version>1.4.0-SNAPSHOT</version>
+                <relativePath />
+       </parent>
         <groupId>org.onap.appc</groupId>
-        <version>1.4.0-SNAPSHOT</version>
-    </parent>
 
     <artifactId>appc-yang-generator</artifactId>
     <packaging>jar</packaging>
index acc6369..438d58f 100644 (file)
@@ -24,10 +24,12 @@ limitations under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.onap.appc</groupId>
-               <artifactId>appc</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-sdc-listener</artifactId>
        <name>SDC Event Listener</name>
@@ -125,4 +127,4 @@ limitations under the License.
                <module>appc-sdc-listener-features</module>
                <module>appc-sdc-listener-installer</module>
        </modules>
-</project>
\ No newline at end of file
+</project>