aai-service: Force maven-dependency-plugin version

[aai/aai-service.git] / ajsc-aai / pom.xml

diff --git a/ajsc-aai/pom.xml b/ajsc-aai/pom.xml
index 9176bba..75d6188 100644 (file)
--- a/ajsc-aai/pom.xml
+++ b/ajsc-aai/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.openecomp.aai.aai-service</groupId>
     <artifactId>aai-service</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>ajsc-aai</artifactId>
   <name>ajsc</name>
@@ -17,6 +17,9 @@
                <skipTests>false</skipTests>
         <!-- sonar properties -->
                <sonar.language>java</sonar.language>
+               <docker.image.version>1.0.0</docker.image.version>
+               <timestamp>${maven.build.timestamp}</timestamp>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
        <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
@@ -339,12 +342,12 @@
        <dependency>
                <groupId>org.openecomp.aai.aai-service</groupId>
                <artifactId>aai-schema</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </dependency>
        <dependency>
                <groupId>org.openecomp.aai.aai-service</groupId>
                <artifactId>annotations</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </dependency>
   </dependencies>
   <build>
@@ -435,7 +438,6 @@
                            <dockerDirectory>${dockerLocation}</dockerDirectory>
                            <serverId>docker-hub</serverId>                   
                            <imageTags>
-                               <imageTag>${docker_imageversion}</imageTag>
                                <imageTag>latest</imageTag>
                            </imageTags>
                            <forceTags>true</forceTags>
@@ -538,7 +540,7 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-dependency-plugin</artifactId>
-                               <version>2.5.1</version>
+                               <version>2.8</version>
                                <executions>
                                        <execution>
                                                <id>copy-agent</id>
@@ -563,6 +565,7 @@
                        <plugin>
                            <groupId>org.apache.maven.plugins</groupId>
                            <artifactId>maven-dependency-plugin</artifactId>
+                            <version>2.8</version>
                            <executions>
                              <execution>
                                <id>unpack-schema-dependency</id>
@@ -577,14 +580,14 @@
                                <artifactItem>
                                  <groupId>org.openecomp.aai.aai-service</groupId>
                                  <artifactId>aai-schema</artifactId>
-                                 <version>1.0.0-SNAPSHOT</version>
+                                 <version>1.1.0-SNAPSHOT</version>
                                  <outputDirectory>bundleconfig-local/etc</outputDirectory>
                                  <includes>oxm/*.xml</includes>
                                </artifactItem>
                                <artifactItem>
                                  <groupId>org.openecomp.aai.aai-service</groupId>
                                  <artifactId>aai-schema</artifactId>
-                                 <version>1.0.0-SNAPSHOT</version>
+                                 <version>1.1.0-SNAPSHOT</version>
                                  <outputDirectory>src/main</outputDirectory>
                                  <includes>aai_schema/*.xsd</includes>
                                </artifactItem>