Fixed project version parsing

[aai/search-data-service.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index c2e19a1..abbd898 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,11 +23,15 @@
 <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>2.0.0</version>
+       </parent>
        <groupId>org.onap.aai</groupId>
        <artifactId>search-data-service</artifactId>
        <name>aai-search-data-service aggregate pom</name>
-       <version>1.4.3-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <modules>
@@ -37,28 +41,48 @@
 
        <properties>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
+               <!-- docker related properties -->
+               <docker.fabric.version>0.31.0</docker.fabric.version>
+               <aai.docker.version>1.0.0</aai.docker.version>
+               <aai.docker.namespace>onap</aai.docker.namespace>
+               <aai.base.image>alpine</aai.base.image>
+               <aai.base.image.version>1.6.0</aai.base.image.version>
+               <aai.build.directory>${project.build.directory}/${project.artifactId}-build/</aai.build.directory>
+               <!-- This will be used for the docker images as the default format of maven build has issues -->
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
        </properties>
 
+       <profiles>
+               <profile>
+                       <id>docker</id>
+                       <build>
+                               <pluginManagement>
+                                       <plugins>
+                                               <plugin>
+                                                       <groupId>org.codehaus.mojo</groupId>
+                                                       <artifactId>build-helper-maven-plugin</artifactId>
+                                                       <version>3.0.0</version>
+                                                       <executions>
+                                                               <execution>
+                                                                       <phase>pre-clean</phase>
+                                                                       <id>parse-version</id>
+                                                                       <goals>
+                                                                               <goal>parse-version</goal>
+                                                                       </goals>
+                                                               </execution>
+                                                       </executions>
+                                               </plugin>
+                                       </plugins>
+                               </pluginManagement>
+                       </build>
+               </profile>
+       </profiles>
+
        <build>
                <plugins>
                        <plugin>
-                               <groupId>com.spotify</groupId>
-                               <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.4.11</version>
-                               <configuration>
-                                       <skipDockerBuild>true</skipDockerBuild>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.sonatype.plugins</groupId>
-                               <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <nexusUrl>${nexusproxy}</nexusUrl>
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
-                                       <serverId>ecomp-staging</serverId>
-                               </configuration>
+                         <groupId>org.apache.maven.plugins</groupId>
+                         <artifactId>maven-deploy-plugin</artifactId>
                        </plugin>
                </plugins>
        </build>