From 1a86d53610c6806e4010001f344a90e134595ec7 Mon Sep 17 00:00:00 2001
From: Lusheng Ji <lji@research.att.com>
Date: Tue, 29 Aug 2017 14:19:57 +0000
Subject: Update LICENSE.txt, pom.xml, mvn script, etc

Issue-Id: DCAEGEN2-86
Change-Id: I9dcafe831bec6ad3bb2eaee85c550f8426b6a1c6
Signed-off-by: Lusheng Ji <lji@research.att.com>
---
 LICENSE.txt         |  70 +++++++++++++++++++---------------
 mvn-phase-script.sh |   0
 pom.xml             | 107 +++++++++++++++++++++++++++++++++-------------------
 version.properties  |   6 +++
 4 files changed, 115 insertions(+), 68 deletions(-)
 mode change 100644 => 100755 mvn-phase-script.sh
 create mode 100644 version.properties

diff --git a/LICENSE.txt b/LICENSE.txt
index 22d3915..69d5fc1 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,30 +1,40 @@
-============LICENSE_START=======================================================
-org.onap.dcae
-================================================================================
-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.
-===================================================================
-===================================================================
-Licensed under the Creative Commons License, Attribution 4.0 Intl.  (the "License");
-you may not use this documentation except in compliance with the License.
-You may obtain a copy of the License at
-       https://creativecommons.org/licenses/by/4.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.
+/*
+* ============LICENSE_START==========================================
+* ===================================================================
+* Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+* ===================================================================
+*
+* Unless otherwise specified, all software contained herein is licensed
+* under the Apache License, Version 2.0 (the “License”);
+* you may not use this software 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.
+*
+*
+*
+* Unless otherwise specified, all documentation contained herein is licensed
+* under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+* you may not use this documentation except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*             https://creativecommons.org/licenses/by/4.0/
+*
+* Unless required by applicable law or agreed to in writing, documentation
+* 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.
+*
+*/
+
diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
old mode 100644
new mode 100755
diff --git a/pom.xml b/pom.xml
index 95cbe2e..41e59cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,21 +1,35 @@
 <?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.collectors</groupId>
   <artifactId>snmptrap</artifactId>
-  <name>dcae_snmptrap</name>
+  <name>snmptrap</name>
   
   <version>1.0.0-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
@@ -23,7 +37,7 @@
     <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>
@@ -31,7 +45,7 @@
     <sonar.inclusions>**/*.py</sonar.inclusions>
     <!-- for JavaScaript -->
     <!--
-             <sonar.language>js</sonar.language>
+    <sonar.language>js</sonar.language>
     <sonar.pluginName>JS</sonar.pluginName>
     <sonar.inclusions>**/*.js</sonar.inclusions>
     -->
@@ -41,37 +55,30 @@
     <finalName>${project.artifactId}-${project.version}</finalName>
     <pluginManagement>
       <plugins>
+        <!-- the following plugins are invoked from oparent, we do not need them -->
+
+
         <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>sonar-maven-plugin</artifactId>
-          <version>2.7.1</version>
+          <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>
-      </plugins>
-    </pluginManagement>
-
-    <plugins>
-      <!-- plugin>
-                   <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.4.1</version>
-        <configuration>
-          <descriptors>
-            <descriptor>assembly/dep.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin -->
 
-      <!-- first disable the default Java plugins at various stages -->
+        <!-- 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 -->
+       dir.  we do not need it -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
@@ -105,7 +112,7 @@
       </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 -->
+       target dir to ~/.m2.  we do not need it -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
@@ -116,7 +123,7 @@
       </plugin>
 
       <!-- maven-surefire-plugin is called during "test" phase by default behavior.  it triggers junit test.
-                  we do not need it -->
+       we do not need it -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -127,6 +134,30 @@
       </plugin>
 
 
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <!-- plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.4.1</version>
+        <configuration>
+          <descriptors>
+            <descriptor>assembly/dep.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin -->
+
+
       <!-- now we configure custom action (calling a script) at various lifecycle phases -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
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