Update License & modify properties in aaf/authz

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

diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index a62f152..3476055 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
@@ -68,7 +69,7 @@
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+               <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>\r
        </properties>\r
        \r
                \r
@@ -76,15 +77,18 @@
         <dependency>\r
             <groupId>org.onap.aaf.authz</groupId>\r
             <artifactId>authz-client</artifactId>\r
+                       <version>${project.version}</version>\r
         </dependency>\r
                \r
                <dependency>\r
             <groupId>org.onap.aaf.authz</groupId>\r
             <artifactId>authz-cmd</artifactId>\r
+                       <version>${project.version}</version>\r
         </dependency>          \r
         <dependency>\r
             <groupId>org.onap.aaf.authz</groupId>\r
             <artifactId>authz-core</artifactId>\r
+                       <version>${project.version}</version>\r
             <exclusions>\r
                          <exclusion> \r
                                        <groupId>javax.servlet</groupId>\r
@@ -96,6 +100,7 @@
         <dependency>\r
             <groupId>org.onap.aaf.authz</groupId>\r
             <artifactId>authz-cass</artifactId>\r
+                       <version>${project.version}</version>\r
         </dependency>\r
 \r
         <dependency>\r
@@ -109,12 +114,14 @@
         <dependency > \r
                        <groupId>org.onap.aaf.inno</groupId>\r
                        <artifactId>env</artifactId>\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.cadiVersion}</version>\r
                </dependency>\r
 \r
                <dependency>\r
@@ -125,42 +132,19 @@
                <dependency>\r
                        <groupId>org.onap.aaf.inno</groupId>\r
                        <artifactId>rosetta</artifactId>\r
+                       <version>${project.innoVersion}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.onap.aaf.cadi</groupId>\r
                        <artifactId>cadi-aaf</artifactId>\r
+                       <version>${project.cadiVersion}</version>\r
                </dependency>   \r
        </dependencies>\r
-       \r
+<profiles>\r
+   <profile>   \r
        <build>\r
            <plugins>\r
-               <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-resources-plugin</artifactId>\r
-                <version>2.7</version>\r
-                <executions>\r
-                    <execution>\r
-                        <id>copy-docker-file</id>\r
-                        <phase>package</phase>\r
-                        <goals>\r
-                            <goal>copy-resources</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <outputDirectory>${dockerLocation}</outputDirectory>\r
-                            <overwrite>true</overwrite>\r
-                            <resources>\r
-                                <resource>\r
-                                    <directory>${basedir}/src/main/resources/docker</directory>\r
-                                    <filtering>true</filtering>\r
-                                    <includes>\r
-                                        <include>**/*</include>\r
-                                    </includes>\r
-                                </resource>\r
-                            </resources>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
+               \r
                        <plugin>\r
                 <groupId>com.spotify</groupId>\r
                 <artifactId>docker-maven-plugin</artifactId>\r
@@ -191,6 +175,26 @@
     <artifactId>maven-resources-plugin</artifactId>\r
     <version>2.7</version>\r
     <executions>\r
+        <execution>\r
+                        <id>copy-docker-file</id>\r
+                        <phase>package</phase>\r
+                        <goals>\r
+                            <goal>copy-resources</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <outputDirectory>${dockerLocation}</outputDirectory>\r
+                            <overwrite>true</overwrite>\r
+                            <resources>\r
+                                <resource>\r
+                                    <directory>${basedir}/src/main/resources/docker</directory>\r
+                                    <filtering>true</filtering>\r
+                                    <includes>\r
+                                        <include>**/*</include>\r
+                                    </includes>\r
+                                </resource>\r
+                            </resources>\r
+                        </configuration>\r
+                    </execution>\r
       <execution>\r
         <id>copy-resources-1</id>\r
         <phase>validate</phase>\r
@@ -216,7 +220,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
@@ -235,12 +239,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
@@ -253,7 +257,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
@@ -264,17 +268,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
@@ -282,6 +286,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
@@ -296,7 +318,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
@@ -342,18 +364,12 @@
                                        </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
                        <artifactId>maven-javadoc-plugin</artifactId>\r
+                       <version>2.10.4</version>\r
                        <configuration>\r
                        <failOnError>false</failOnError>\r
                        </configuration>\r
@@ -448,7 +464,8 @@
                        </plugins>\r
 \r
        </build>\r
-\r
+</profile>\r
+</profiles>\r
                <distributionManagement>\r
                <repository>\r
                        <id>ecomp-releases</id>\r
@@ -465,32 +482,5 @@
                        <url>dav:${nexusproxy}${sitePath}</url>\r
                </site>\r
        </distributionManagement>\r
-<pluginRepositories>\r
-        <pluginRepository>\r
-            <id>onap-plugin-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
-       \r
-       <repositories>\r
-               <repository>\r
-                       <id>central</id>\r
-                       <name>Maven 2 repository 2</name>\r
-                       <url>http://repo2.maven.org/maven2/</url>\r
-               </repository>\r
-               <repository>\r
-            <id>onap-jar-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
-        </repository>\r
-               <repository>\r
-                       <id>spring-repo</id>\r
-                       <name>Spring repo</name>\r
-                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>repository.jboss.org-public</id>\r
-                       <name>JBoss.org Maven repository</name>\r
-                       <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
-               </repository>\r
-       </repositories>\r
+\r
 </project>\r