X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fbase%2Fpom.xml;h=b92ca6ec6e71507f3f5bbbce77283b91aa9364cb;hb=37ad11c5660d017aace257bf7f5bd03c02f26bdd;hp=01d7bbb5c2ea7874cdfd9f05b41eac0061eeb946;hpb=828fb05f1efb4e022dd6dc6b9e5d3ac4136371e5;p=policy%2Fengine.git

diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 01d7bbb5c..b92ca6ec6 100755
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -1,15 +1,15 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  ONAP Policy Engine
   ================================================================================
   Copyright (C) 2017 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.
@@ -18,23 +18,21 @@
   ============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">
+<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.openecomp.policy.engine</groupId>
+		<groupId>org.onap.policy.engine</groupId>
 		<artifactId>packages</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.6.3</version>
 	</parent>
 
-	<groupId>org.openecomp.policy.engine</groupId>
 	<artifactId>base</artifactId>
 	<packaging>pom</packaging>
 
 	<name>Base Package</name>
-	<description>D2 ECOMP Policy Base Packaging</description>
+	<description>D2 ONAP Policy Base Packaging</description>
 
 	<build>
 		<plugins>
@@ -42,27 +40,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
-					<execution>
-						<id>copy-pypdp</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/pypdp/webapps</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.openecomp.policy.engine</groupId>
-									<artifactId>PyPDPServer</artifactId>
-									<version>${project.version}</version>
-									<type>war</type>
-									<destFileName>PyPDPServer.war</destFileName>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
 					<execution>
 						<id>copy-pdp</id>
 						<phase>prepare-package</phase>
@@ -75,8 +52,8 @@
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.openecomp.policy.engine</groupId>
-									<artifactId>ECOMP-PDP-REST</artifactId>
+									<groupId>org.onap.policy.engine</groupId>
+									<artifactId>ONAP-PDP-REST</artifactId>
 									<version>${project.version}</version>
 									<type>war</type>
 									<destFileName>pdp.war</destFileName>
@@ -96,8 +73,8 @@
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.openecomp.policy.engine</groupId>
-									<artifactId>ECOMP-PAP-REST</artifactId>
+									<groupId>org.onap.policy.engine</groupId>
+									<artifactId>ONAP-PAP-REST</artifactId>
 									<version>${project.version}</version>
 									<type>war</type>
 									<destFileName>pap.war</destFileName>
@@ -106,7 +83,7 @@
 						</configuration>
 					</execution>
 					<execution>
-						<id>copy-ecomp</id>
+						<id>copy-onap</id>
 						<phase>prepare-package</phase>
 						<goals>
 							<goal>copy</goal>
@@ -117,11 +94,11 @@
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.openecomp.policy.engine</groupId>
-									<artifactId>ecomp-sdk-app</artifactId>
+									<groupId>org.onap.policy.engine</groupId>
+									<artifactId>ONAP-SDK-APP</artifactId>
 									<version>${project.version}</version>
 									<type>war</type>
-									<destFileName>ecomp.war</destFileName>
+									<destFileName>onap.war</destFileName>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
@@ -140,9 +117,14 @@
 								<artifactItem>
 									<groupId>org.apache.tomcat</groupId>
 									<artifactId>tomcat</artifactId>
-									<version>8.0.23</version>
+									<version>9.0.16</version>
 									<type>tar.gz</type>
-									<destFileName>apache-tomcat-8.0.23.tar.gz</destFileName>
+									<!--
+									Please note that if you change this version, you must
+									update the docker-install.sh script to ensure the right
+									file name is installed. 
+									 -->
+									<destFileName>apache-tomcat-9.0.16.tar.gz</destFileName>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
@@ -159,7 +141,7 @@
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.openecomp.policy.engine</groupId>
+									<groupId>org.onap.policy.engine</groupId>
 									<artifactId>BRMSGateway</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>
@@ -181,7 +163,7 @@
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.openecomp.policy.engine</groupId>
+									<groupId>org.onap.policy.engine</groupId>
 									<artifactId>LogParser</artifactId>
 									<version>${project.version}</version>
 									<type>jar</type>
@@ -190,7 +172,7 @@
 								</artifactItem>
 							</artifactItems>
 						</configuration>
-					</execution>			
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -212,7 +194,7 @@
 			</plugin>
 		</plugins>
 	</build>
-	
+
 	<profiles>
 		<profile>
 			<id>unix_pe_version</id>
@@ -223,28 +205,28 @@
 			</activation>
 			<build>
 				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.5.0</version>
-						<executions>
-							<execution>
-								<id>create-version-file</id>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<phase>prepare-package</phase>
-								<configuration>
-									<executable>/bin/bash</executable>
-									<arguments>
-										<argument>-c</argument>
-										<argument>mkdir -p target ; echo -e 'version="${project.version}"\ndescription="Open ECOMP Policy Engine"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' >target/build.info</argument>
-									</arguments>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.5.0</version>
+                        <executions>
+                            <execution>
+                                <id>create-version-file</id>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <phase>prepare-package</phase>
+                                <configuration>
+                                    <executable>/bin/bash</executable>
+                                    <arguments>
+                                        <argument>-c</argument>
+                                        <argument>mkdir -p target ; echo -e 'version="${project.version}"\ndescription="Open ONAP Policy Engine"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' &gt;target/build.info</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
 			</build>
 		</profile>
 	</profiles>