DMAAP-84 use O-parent and other tidying up

Change-Id: Ia4ca2a2e99c2244785b0366e91d65108f9c124bf
Signed-off-by: ATT default cloud user <dgl@research.att.com>

diff --git a/pom.xml b/pom.xml
index 7807e70..29592f3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,28 +5,11 @@
   <artifactId>dbcapi</artifactId>
   <version>${artifact.version}</version>
   <name>dbcapi</name>
-  <distributionManagement>
-    <repository>
-      <id>ecomp-releases</id>
-      <name>Open eCOMP Release Repository</name>
-      <url>${nexusproxy}/${releases.path}</url>
-    </repository>
-    <snapshotRepository>
-      <id>ecomp-snapshots</id>
-      <name>Open eCOMP Snapshot Repository</name>
-       <url>${nexusproxy}/${snapshots.path}</url>
-    </snapshotRepository>
-    <site>
-      <id>ecomp-site</id>
-      <url>dav:${nexusproxy}/content/sites/site/org/onap/dmaap/dbcapi/${project.artifactId}/${project.version}/</url>
-    </site>
-  </distributionManagement>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>central</id>
-      <url>http://repo1.maven.org/maven2</url>
-    </pluginRepository>
-  </pluginRepositories>
+  <parent>
+    <groupId>org.onap.oparent</groupId>
+    <artifactId>oparent</artifactId>
+    <version>0.1.0</version>
+  </parent>
   <build>
     <finalName>dbcapi</finalName>
     <resources>
@@ -38,90 +21,8 @@
                </resource>
        </resources>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.8</version> <!-- This version supports the "deployAtEnd" parameter -->
-        <configuration>
-          <skip/>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.6</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-webdav-jackrabbit</artifactId>
-            <version>2.10</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.10</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/deps</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- blackduck maven plugin -->
-      <!--plugin>
-        <groupId>com.blackducksoftware.integration</groupId>
-        <artifactId>hub-maven-plugin</artifactId>
-        <version>1.0.4</version>
-        <inherited>false</inherited>
-        <configuration>
-          <target>${project.basedir}</target>
-        </configuration>
-        <executions>
-          <execution>
-            <id>create-bdio-file</id>
-            <phase>package</phase>
-            <goals>
-              <goal>createHubOutput</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin-->
- 
- 
-
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.7</version>
-        <extensions>true</extensions>
-        <configuration>
-          <serverId>ecomp-staging</serverId>
-          <nexusUrl>${nexusproxy}</nexusUrl>
-          <stagingProfileId>176c31dfe190a</stagingProfileId>
-        </configuration>
-      </plugin>
 <!--  reference: https://tech.homeaway.com/development/2016/06/02/generating-swagger-spec.html 
+-->
        <plugin>
     <groupId>com.github.kongchen</groupId>
     <artifactId>swagger-maven-plugin</artifactId>
@@ -179,7 +80,6 @@ A convention of this API is to return JSON responses per OpenStack style.
         </execution>
     </executions>
   </plugin>
--->
  
     </plugins>
     <pluginManagement>

diff --git a/version.properties b/version.properties
new file mode 100644 (file)
index 0000000..74cd587
--- /dev/null
+++ b/version.properties
@@ -0,0 +1,35 @@
+###
+# ============LICENSE_START=======================================================
+# org.onap.dmaap
+# ================================================================================
+# 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.
+###
+
+# Versioning variables
+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
+# because they are used in Jenkins, whose plug-in doesn't support
+
+major=1
+minor=0
+patch=0
+base_version=${major}.${minor}.${patch}
+
+# Release must be completed with git revision # in Jenkins
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT