Update AAF project version to release docker image

[aaf/authz.git] / authz-service / pom.xml

diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index f850e5d..b6b4b2f 100644 (file)
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -27,7 +27,7 @@
        <parent>\r
                <groupId>org.onap.aaf.authz</groupId>\r
                <artifactId>parent</artifactId>\r
-               <version>1.0.0-SNAPSHOT</version>\r
+               <version>1.0.1-SNAPSHOT</version>\r
                <relativePath>../pom.xml</relativePath>\r
        </parent>\r
                \r
@@ -53,7 +53,8 @@
        <properties>\r
                <maven.test.failure.ignore>true</maven.test.failure.ignore>\r
                <project.swmVersion>1</project.swmVersion>\r
-                       <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+                       <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>\r
+               <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
            <dockerLocation>${basedir}/target/</dockerLocation>\r
                <docker.registry>nexus3.onap.org</docker.registry>\r
                <distFilesRootDirPath>opt/app/aaf/${project.artifactId}/${project.version}</distFilesRootDirPath>\r
@@ -113,14 +114,14 @@
         <dependency > \r
                        <groupId>org.onap.aaf.inno</groupId>\r
                        <artifactId>env</artifactId>\r
-                       <version>${project.version}</version>\r
+                       <version>${project.innoVersion}</version>\r
                </dependency>\r
 \r
 \r
                <dependency>\r
                        <groupId>org.onap.aaf.cadi</groupId>\r
                        <artifactId>cadi-core</artifactId>\r
-                       <version>${project.version}</version>\r
+                       <version>${project.cadiVersion}</version>\r
                </dependency>\r
 \r
                <dependency>\r
@@ -131,12 +132,12 @@
                <dependency>\r
                        <groupId>org.onap.aaf.inno</groupId>\r
                        <artifactId>rosetta</artifactId>\r
-                       <version>${project.version}</version>\r
+                       <version>${project.innoVersion}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.onap.aaf.cadi</groupId>\r
                        <artifactId>cadi-aaf</artifactId>\r
-                       <version>${project.version}</version>\r
+                       <version>${project.cadiVersion}</version>\r
                </dependency>   \r
        </dependencies>\r
        \r
@@ -224,7 +225,7 @@
           <goal>copy-resources</goal>\r
         </goals>\r
         <configuration>\r
-          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}/etc</outputDirectory>\r
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/etc</outputDirectory>\r
           <resources>\r
             <resource>\r
                         <directory>${project.basedir}/src/main/resources/etc</directory>\r
@@ -243,12 +244,12 @@
           <goal>copy-resources</goal>\r
         </goals>\r
         <configuration>\r
-          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}/lib</outputDirectory>\r
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/lib</outputDirectory>\r
           <resources>\r
             <resource>\r
                         <directory>${project.basedir}/../authz-cmd/target</directory>\r
                         <includes>\r
-                            <include>**/authz-cmd-1.0.0-SNAPSHOT-jar-with-dependencies.jar</include>\r
+                            <include>**/*.jar</include>\r
                         </includes>\r
                     </resource>\r
           </resources>\r
@@ -261,7 +262,7 @@
           <goal>copy-resources</goal>\r
         </goals>\r
         <configuration>\r
-          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}</outputDirectory>\r
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/</outputDirectory>\r
           <resources>\r
             <resource>\r
                         <directory>${project.basedir}/../authz-cmd</directory>\r
@@ -272,17 +273,17 @@
           </resources>\r
         </configuration>\r
       </execution>\r
-          <execution>\r
+               <execution>\r
         <id>copy-resources-5</id>\r
         <phase>validate</phase>\r
         <goals>\r
           <goal>copy-resources</goal>\r
         </goals>\r
         <configuration>\r
-          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}/etc</outputDirectory>\r
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/etc/</outputDirectory>\r
           <resources>\r
             <resource>\r
-                        <directory>${project.basedir}/../authz-cmd/etc</directory>\r
+                        <directory>${project.basedir}/src/main/config</directory>\r
                         <includes>\r
                             <include>**/**</include>\r
                         </includes>\r
@@ -290,6 +291,24 @@
           </resources>\r
         </configuration>\r
       </execution>\r
+         <execution>\r
+        <id>copy-resources-6</id>\r
+        <phase>validate</phase>\r
+        <goals>\r
+          <goal>copy-resources</goal>\r
+        </goals>\r
+        <configuration>\r
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/etc/data</outputDirectory>\r
+          <resources>\r
+            <resource>\r
+                        <directory>${project.basedir}/../opt/app/aaf/data</directory>\r
+                        <includes>\r
+                            <include>**/**</include>\r
+                        </includes>\r
+                    </resource>\r
+          </resources>\r
+        </configuration>\r
+               </execution>\r
     </executions>\r
   </plugin>\r
                        <plugin>\r
@@ -304,7 +323,7 @@
                                                        <goal>copy-dependencies</goal>\r
                                                </goals>\r
                                                <configuration>\r
-                                                       <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}/lib</outputDirectory>\r
+                                                       <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/lib</outputDirectory>\r
                                                        <overWriteReleases>false</overWriteReleases>\r
                                                        <overWriteSnapshots>false</overWriteSnapshots>\r
                                                        <overWriteIfNewer>true</overWriteIfNewer>\r
@@ -350,14 +369,7 @@
                                        </configuration>\r
                                        <version>2.3.1</version>\r
                                </plugin>\r
-\r
-                               <plugin>\r
-                                       <groupId>org.apache.maven.plugins</groupId>\r
-                                       <artifactId>maven-deploy-plugin</artifactId>\r
-                                       <configuration>\r
-                                               <skip>true</skip>\r
-                                       </configuration>\r
-                           </plugin>  \r
+ \r
 \r
                <plugin>\r
                        <groupId>org.apache.maven.plugins</groupId>\r