From 6cbbec7f1b92273157b68757da2933fb6ec43b7a Mon Sep 17 00:00:00 2001
From: Lusheng Ji <lji@research.att.com>
Date: Wed, 30 Aug 2017 02:12:33 +0000
Subject: Fix pom.xml, version.properties

Issue-Id: DCAEGEN2-60
Change-Id: I2180cdb4ff0338d0323a353e8039a37e08cf6cc1
Signed-off-by: Lusheng Ji <lji@research.att.com>
---
 pom.xml            | 287 +++++++++++++++++++++++++++++------------------------
 version.properties |   6 ++
 2 files changed, 165 insertions(+), 128 deletions(-)
 create mode 100644 version.properties

diff --git a/pom.xml b/pom.xml
index 3d38c1d..cd67153 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,47 +1,129 @@
 <?xml version="1.0"?>
-<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">
+<!--
+================================================================================
+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.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
+
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
+-->
+<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.oparent</groupId>
     <artifactId>oparent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
-  <!-- parent>
-    <groupId>org.onap.dcae.platform</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.0.0</version>
-  </parent -->
-
   <!--- CHANGE THE FOLLOWING 3 OBJECTS for your own repo -->
   <groupId>org.onap.dcaegen2.platform</groupId>
   <artifactId>deployment-handler</artifactId>
   <name>deployment-handler</name>
-  
   <version>1.0.0-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <sonar.sources>.</sonar.sources>
     <!-- customize the SONARQUBE URL -->
-    <sonar.host.url>http://localhost:9000</sonar.host.url>
+    <!-- sonar.host.url>http://localhost:9000</sonar.host.url -->
     <!-- below are language dependent -->
+    <!-- for Python -->
+    <!--
+    <sonar.language>py</sonar.language>
+    <sonar.pluginName>Python</sonar.pluginName>
+    <sonar.inclusions>**/*.py</sonar.inclusions>
+    -->
+    <!-- for JavaScaript -->
     <sonar.language>js</sonar.language>
     <sonar.pluginName>JS</sonar.pluginName>
     <sonar.inclusions>**/*.js</sonar.inclusions>
   </properties>
-
   <build>
     <finalName>${project.artifactId}-${project.version}</finalName>
     <pluginManagement>
       <plugins>
+        <!-- the following plugins are invoked from oparent, we do not need them -->
+        <plugin>
+          <groupId>org.sonatype.plugins</groupId>
+          <artifactId>nexus-staging-maven-plugin</artifactId>
+          <version>1.6.7</version>
+          <configuration>
+            <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <!-- This version supports the "deployAtEnd" parameter -->
+          <version>2.8</version>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- first disable the default Java plugins at various stages -->
+        <!-- maven-resources-plugin is called during "*resource" phases by default behavior.  it prepares the resources
+       dir.  we do not need it -->
         <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>sonar-maven-plugin</artifactId>
-          <version>2.7.1</version>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.6</version>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- maven-compiler-plugin is called during "compile" phases by default behavior.  we do not need it -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.1</version>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- maven-jar-plugin is called during "compile" phase by default behavior.  we do not need it -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.4</version>
+          <executions>
+            <execution>
+              <id>default-jar</id>
+              <phase/>
+            </execution>
+          </executions>
+        </plugin>
+        <!-- maven-install-plugin is called during "install" phase by default behavior.  it tries to copy stuff under 
+       target dir to ~/.m2.  we do not need it -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.4</version>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- maven-surefire-plugin is called during "test" phase by default behavior.  it triggers junit test.
+       we do not need it -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.12.4</version>
+          <configuration>
+            <skipTests>true</skipTests>
+          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>
-
     <plugins>
       <!-- plugin>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -61,65 +143,6 @@
           </execution>
         </executions>
       </plugin -->
-
-      <!-- first disable the default Java plugins at various stages -->
-      <!-- maven-resources-plugin is called during "*resource" phases by default behavior.  it prepares the resources
-       dir.  we do not need it -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-      <!-- maven-compiler-plugin is called during "compile" phases by default behavior.  we do not need it -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-      <!-- maven-jar-plugin is called during "compile" phase by default behavior.  we do not need it -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <executions>
-          <execution>
-            <id>default-jar</id>
-            <phase/>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- maven-install-plugin is called during "install" phase by default behavior.  it tries to copy stuff under 
-       target dir to ~/.m2.  we do not need it -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-      <!-- maven-surefire-plugin is called during "test" phase by default behavior.  it triggers junit test.
-       we do not need it -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.12.4</version>
-        <configuration>
-          <skipTests>true</skipTests>
-        </configuration>
-      </plugin>
-
-
       <!-- now we configure custom action (calling a script) at various lifecycle phases -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -129,7 +152,9 @@
           <execution>
             <id>clean phase script</id>
             <phase>clean</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
               <arguments>
@@ -138,19 +163,20 @@
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL --> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
-
           <execution>
             <id>generate-sources script</id>
             <phase>generate-sources</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>mvn-phase-script.sh</executable>
               <arguments>
@@ -159,19 +185,20 @@
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!-- MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
-
           <execution>
             <id>compile script</id>
             <phase>compile</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>mvn-phase-script.sh</executable>
               <arguments>
@@ -180,19 +207,20 @@
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL --> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
-
           <execution>
             <id>package script</id>
             <phase>package</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>mvn-phase-script.sh</executable>
               <arguments>
@@ -201,19 +229,20 @@
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL --> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
-
           <execution>
             <id>test script</id>
             <phase>test</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>mvn-phase-script.sh</executable>
               <arguments>
@@ -222,19 +251,20 @@
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
-
           <execution>
             <id>install script</id>
             <phase>install</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>mvn-phase-script.sh</executable>
               <arguments>
@@ -243,19 +273,20 @@
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
-
           <execution>
             <id>deploy script</id>
             <phase>deploy</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>mvn-phase-script.sh</executable>
               <arguments>
@@ -264,12 +295,12 @@
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
         </executions>
diff --git a/version.properties b/version.properties
new file mode 100644
index 0000000..73415a7
--- /dev/null
+++ b/version.properties
@@ -0,0 +1,6 @@
+major=1
+minor=1
+patch=0
+base_version=${major}.${minor}.${patch}
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg