X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fapex-pdp-package-full%2Fpom.xml;h=32b0262e2fff40a9bc0798d12320fe3b4ce7d071;hb=56a7b65fbb058df5781b1f25e6c9be597ea643b9;hp=d0a2c15bce59b4f0863ceb5ebb0f7bd2e9cf3d39;hpb=46c6d88b3002afef0a05b10c73bceb0c6c9d0c51;p=policy%2Fapex-pdp.git

diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index d0a2c15bc..32b0262e2 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -1,7 +1,9 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2019 Nordix Foundation
+   Modifications Copyright (C) 2019-2020, 2022 Nordix Foundation
+   Modifications Copyright (C) 2019-2020, 2022 Bell Canada.
+   Modifications Copyright (C) 2020 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.
@@ -23,11 +25,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.apex-pdp.packages</groupId>
-        <artifactId>packages</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <artifactId>apex-packages</artifactId>
+        <version>2.9.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>apex-pdp-package-full</artifactId>
+    <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>[${project.parent.artifactId}] packaging, with all optional functionality, clients, servlets, and examples included</description>
 
@@ -46,32 +49,7 @@
             <artifactId>services-onappf</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- Client Servlet applications -->
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>client-full</artifactId>
-            <type>war</type>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>client-editor</artifactId>
-            <type>war</type>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>client-deployment</artifactId>
-            <type>war</type>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>client-monitoring</artifactId>
-            <type>war</type>
-            <version>${project.version}</version>
-        </dependency>
-        
+
         <!-- Plugins for Context Distribution -->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
@@ -102,6 +80,11 @@
             <artifactId>plugins-context-schema-avro</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
+            <artifactId>plugins-context-schema-json</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <!-- Plugins for Executors -->
         <dependency>
@@ -119,35 +102,24 @@
             <artifactId>plugins-executor-jruby</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
+        <!-- Jython support disabled due to security concerns -->
+        <!-- dependency>
             <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
             <artifactId>plugins-executor-jython</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
             <artifactId>plugins-executor-mvel</artifactId>
             <version>${project.version}</version>
         </dependency>
 
-        <!-- Plugins for Persistence of Models over JPA -->
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence.plugins-persistence-jpa</groupId>
-            <artifactId>plugins-persistence-jpa-eclipselink</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <!-- Plugins for event carrier technologies -->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
             <artifactId>plugins-event-carrier-kafka</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
-            <artifactId>plugins-event-carrier-websocket</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
             <artifactId>plugins-event-carrier-jms</artifactId>
@@ -168,7 +140,11 @@
             <artifactId>plugins-event-carrier-restrequestor</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
+            <artifactId>plugins-event-carrier-grpc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <!-- Benchmark test event generator -->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId>
@@ -177,11 +153,6 @@
         </dependency>
 
         <!-- Plugins for event protocols -->
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
-            <artifactId>plugins-event-protocol-xml</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
             <artifactId>plugins-event-protocol-jms</artifactId>
@@ -194,7 +165,7 @@
             <artifactId>cli-editor</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <!-- Tools -->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.tools</groupId>
@@ -206,14 +177,14 @@
             <artifactId>model-generator</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <!-- Test Data used by examples -->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
             <artifactId>integration-common</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <!-- Sample Examples -->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.examples</groupId>
@@ -230,11 +201,6 @@
             <artifactId>examples-myfirstpolicy</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.examples</groupId>
-            <artifactId>examples-pcvs</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.examples</groupId>
             <artifactId>examples-decisionmaker</artifactId>
@@ -252,18 +218,29 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.examples</groupId>
-            <artifactId>examples-servlet</artifactId>
-            <type>war</type>
+            <artifactId>examples-onap-bbs</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.examples</groupId>
-            <artifactId>examples-onap-bbs</artifactId>
+            <artifactId>examples-grpc</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
 
     <build>
+        <filters>
+            <filter>src/main/resources/properties/db.properties</filter>
+        </filters>
+        <resources>
+            <resource>
+                <directory>src/main/resources/META-INF</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
         <plugins>
             <!-- Copy required resources and examples -->
             <plugin>
@@ -341,15 +318,6 @@
                                     <outputDirectory>${project.build.directory}</outputDirectory>
                                     <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.onap.policy.apex-pdp.examples</groupId>
-                                    <artifactId>examples-pcvs</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}</outputDirectory>
-                                    <includes>etc/**/*,examples/**/*</includes>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.examples</groupId>
                                     <artifactId>examples-decisionmaker</artifactId>
@@ -422,23 +390,32 @@
                                     <outputDirectory>${project.build.directory}/examples/models/ONAPBBS</outputDirectory>
                                     <includes>NomadicONTPolicyModel.json</includes>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.onap.policy.apex-pdp.tools</groupId>
+                                    <artifactId>tools-common</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/etc</outputDirectory>
+                                    <includes>/app-version.txt</includes>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.examples</groupId>
-                                    <artifactId>examples-servlet</artifactId>
+                                    <artifactId>examples-grpc</artifactId>
                                     <version>${project.version}</version>
-                                    <type>war</type>
+                                    <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/examples/servlet</outputDirectory>
-                                    <includes>readme_examples-servlet.txt</includes>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.onap.policy.apex-pdp.tools</groupId>
-                                    <artifactId>tools-common</artifactId>
+                                    <groupId>org.onap.policy.apex-pdp.examples</groupId>
+                                    <artifactId>examples-grpc</artifactId>
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/etc</outputDirectory>
-                                    <includes>/app-version.txt</includes>
+                                    <outputDirectory>${project.build.directory}/examples/models/APEXgRPC</outputDirectory>
+                                    <includes>APEXgRPCPolicy.json</includes>
                                 </artifactItem>
                             </artifactItems>
                             <overWriteReleases>true</overWriteReleases>
@@ -461,34 +438,6 @@
                                     <classifier>jar-with-dependencies</classifier>
                                     <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.onap.policy.apex-pdp.client</groupId>
-                                    <artifactId>client-monitoring</artifactId>
-                                    <version>${project.version}</version>
-                                    <classifier>monitoring</classifier>
-                                    <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.onap.policy.apex-pdp.client</groupId>
-                                    <artifactId>client-editor</artifactId>
-                                    <version>${project.version}</version>
-                                    <classifier>editor</classifier>
-                                    <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.onap.policy.apex-pdp.client</groupId>
-                                    <artifactId>client-deployment</artifactId>
-                                    <version>${project.version}</version>
-                                    <classifier>deployment</classifier>
-                                    <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.onap.policy.apex-pdp.client</groupId>
-                                    <artifactId>client-full</artifactId>
-                                    <version>${project.version}</version>
-                                    <classifier>full</classifier>
-                                    <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
-                                </artifactItem>
                             </artifactItems>
                             <overWriteReleases>true</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
@@ -497,7 +446,7 @@
 
                 </executions>
             </plugin>
- 
+
             <!-- Build the tar ball -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -514,103 +463,7 @@
                                 <descriptor>src/main/package/tarball/assembly.xml</descriptor>
                             </descriptors>
                             <finalName>${project.artifactId}-${project.version}</finalName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <configuration>
-                            <tasks>
-                                <untar
-                                    src="${project.build.directory}/${project.artifactId}-${project.version}-tarball.tar.gz"
-                                    dest="${project.build.directory}/install_hierarchy" compression="gzip" />
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>fix-permissions</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <tasks>
-                                <chmod file="${project.build.directory}/install_hierarchy/bin/*" perm="755" />
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- Build the dpkg distribution -->
-            <plugin>
-                <groupId>org.vafer</groupId>
-                <artifactId>jdeb</artifactId>
-                <version>1.5</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jdeb</goal>
-                        </goals>
-                        <configuration>
-                            <deb>${project.build.directory}/${project.artifactId}-${project.version}.deb</deb>
-                            <controlDir>${basedir}/src/main/package/control</controlDir>
-                            <dataSet>
-                                <!-- Copy the Apex run time configuration -->
-                                <data>
-                                    <src>${project.build.directory}/install_hierarchy/lib</src>
-                                    <type>directory</type>
-                                    <dst>lib</dst>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>/opt/app/policy/${project.artifactId}-${project.version}/lib</prefix>
-                                        <filemode>755</filemode>
-                                    </mapper>
-                                </data>
-                                <data>
-                                    <src>${project.build.directory}/install_hierarchy/bin</src>
-                                    <type>directory</type>
-                                    <dst>etc</dst>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>/opt/app/policy/${project.artifactId}-${project.version}/bin</prefix>
-                                    </mapper>
-                                </data>
-                                <data>
-                                    <src>${project.build.directory}/install_hierarchy/etc</src>
-                                    <type>directory</type>
-                                    <dst>etc</dst>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>/opt/app/policy/${project.artifactId}-${project.version}/etc</prefix>
-                                    </mapper>
-                                </data>
-                                <data>
-                                    <src>${project.build.directory}/install_hierarchy/war</src>
-                                    <type>directory</type>
-                                    <dst>etc</dst>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>/opt/app/policy/${install.package.name}-${project.version}/war</prefix>
-                                    </mapper>
-                                </data>
-                                <data>
-                                    <src>${project.build.directory}/install_hierarchy/examples</src>
-                                    <type>directory</type>
-                                    <dst>etc</dst>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>/opt/app/policy/${project.artifactId}-${project.version}/examples</prefix>
-                                    </mapper>
-                                </data>
-                            </dataSet>
+                            <appendAssemblyId>false</appendAssemblyId>
                         </configuration>
                     </execution>
                 </executions>
@@ -656,20 +509,5 @@
                 </pluginManagement>
             </build>
         </profile>
-
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
     </profiles>
 </project>