<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
<name>Authz Service</name>\r
<description>API for Authorization and Authentication</description>\r
<url>https://github.com/att/AAF</url>\r
- <licenses>\r
- <license>\r
- <name>BSD License</name>\r
- <url> </url>\r
- </license>\r
- </licenses>\r
+ \r
<developers>\r
<developer>\r
<name>Jonathan Gathman</name>\r
</developers>\r
\r
<properties>\r
+ <maven.build.timestamp.format>yyyy.MM.dd'T'hh.mm.ss'Z'</maven.build.timestamp.format>\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
- <dockerLocation>${basedir}/target/</dockerLocation>\r
- <docker.registry>nexus3.onap.org</docker.registry>\r
+ <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>\r
+ <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <dockerLocation>${basedir}/target/</dockerLocation>\r
<distFilesRootDirPath>opt/app/aaf/${project.artifactId}/${project.version}</distFilesRootDirPath>\r
<sonar.language>java</sonar.language>\r
+ <sonar.skip>true</sonar.skip>\r
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
<sonar.projectVersion>${project.version}</sonar.projectVersion>\r
<nexusproxy>https://nexus.onap.org</nexusproxy>\r
+ <docker.push.registry>localhost:5000</docker.push.registry>\r
<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
+ <skip.docker.build>true</skip.docker.build>\r
+ <skip.docker.push>true</skip.docker.push>\r
+ <skip.staging.artifacts>false</skip.staging.artifacts>\r
</properties>\r
\r
\r
<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
<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
+\r
+\r
<build>\r
+ <finalName>authz-service</finalName>\r
<plugins>\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
+ \r
+ \r
+<plugin>\r
+ <groupId>com.spotify</groupId>\r
+ <artifactId>docker-maven-plugin</artifactId>\r
+ <version>1.0.0</version>\r
+ <configuration>\r
+ <imageName>onap/aaf/authz-service</imageName>\r
+ <!-- <dockerDirectory>${dockerLocation}</dockerDirectory> -->\r
+ <dockerDirectory>${basedir}/src/main/resources/docker</dockerDirectory>\r
+ <imageTags>\r
+ <imageTag>latest</imageTag>\r
+ <imageTag>${project.docker.latesttagtimestamp.version}</imageTag>\r
+ <imageTag>${project.docker.latesttag.version}</imageTag>\r
+ </imageTags>\r
+ <forceTags>true</forceTags>\r
+ <!-- <resources>\r
+ <resource>\r
+ <targetPath>/</targetPath>\r
+ <directory>${project.build.directory}/opt</directory>\r
+ <filtering>true</filtering>\r
+ <includes>\r
+ <include>**/**</include>\r
+ </includes>\r
+ </resource>\r
+ </resources> --> \r
+ <resources>\r
+ <resource>\r
+ <targetPath>/</targetPath>\r
+ <directory>${project.build.directory}/opt</directory>\r
+ <include>${project.build.finalName}.jar</include>\r
+ </resource>\r
+ <resource>\r
+ <targetPath>/</targetPath>\r
+ <directory>${project.build.directory}</directory>\r
+ <include>**/**</include>\r
+ </resource>\r
+ </resources>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>build-image</id>\r
+ <phase>package</phase>\r
+ <goals>\r
+ <goal>build</goal>\r
+ </goals>\r
+ <configuration>\r
+ <skipDockerBuild>${skip.docker.build}</skipDockerBuild>\r
+ </configuration>\r
+ </execution> \r
+\r
+ <execution>\r
+ <id>tag-image-project-version</id>\r
+ <phase>package</phase>\r
+ <goals>\r
+ <goal>tag</goal>\r
+ </goals>\r
+ <configuration>\r
+ <image>onap/aaf/authz-service</image>\r
+ <newName>${docker.push.registry}/onap/aaf/authz-service:${project.version}</newName>\r
+ <skipDockerTag>${skip.docker.push}</skipDockerTag>\r
+ </configuration>\r
+ </execution>\r
+ \r
+ <execution>\r
+ <id>tag-image-latest</id>\r
+ <phase>package</phase>\r
+ <goals>\r
+ <goal>tag</goal>\r
+ </goals>\r
+ <configuration>\r
+ <image>onap/aaf/authz-service</image>\r
+ <newName>${docker.push.registry}/onap/aaf/authz-service:latest</newName>\r
+ <skipDockerTag>${skip.docker.push}</skipDockerTag>\r
+ </configuration>\r
+ </execution>\r
+ \r
+ <execution>\r
+ <id>push-image-latest</id>\r
+ <phase>deploy</phase>\r
+ <goals>\r
+ <goal>push</goal>\r
+ </goals>\r
+ <configuration>\r
+ <imageName>${docker.push.registry}/onap/aaf/authz-service:${project.version}</imageName>\r
+ <skipDockerPush>${skip.docker.push}</skipDockerPush>\r
+ </configuration>\r
+ </execution>\r
+ \r
+ <execution>\r
+ <id>push-image</id>\r
+ <phase>deploy</phase>\r
+ <goals>\r
+ <goal>push</goal>\r
+ </goals>\r
+ <configuration>\r
+ <imageName>${docker.push.registry}/onap/aaf/authz-service:latest</imageName>\r
+ <skipDockerPush>${skip.docker.push}</skipDockerPush>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
+\r
+ <plugin>\r
<artifactId>maven-resources-plugin</artifactId>\r
<version>2.7</version>\r
- <executions>\r
- <execution>\r
+ <executions>\r
+ <execution>\r
<id>copy-docker-file</id>\r
<phase>package</phase>\r
<goals>\r
</resource>\r
</resources>\r
</configuration>\r
- </execution>\r
- </executions>\r
- </plugin>\r
- <plugin>\r
- <groupId>com.spotify</groupId>\r
- <artifactId>docker-maven-plugin</artifactId>\r
- <version>0.4.11</version>\r
- <configuration>\r
- <imageName>onap/aaf/authz-service</imageName>\r
- <dockerDirectory>${dockerLocation}</dockerDirectory>\r
- <serverId>docker-hub</serverId>\r
- <registryUrl>https://${docker.registry}</registryUrl>\r
- <imageTags>\r
- <imageTag>${project.version}</imageTag>\r
- <imageTag>latest</imageTag>\r
- </imageTags>\r
- <resources>\r
- <resource>\r
- <targetPath>/</targetPath>\r
- <directory>/${basedir}/target/opt</directory>\r
- <filtering>true</filtering>\r
- <includes>\r
- <include>**/*</include>\r
- </includes>\r
- </resource>\r
- </resources>\r
- <forceTags>true</forceTags>\r
- </configuration>\r
- </plugin>\r
- <plugin>\r
- <artifactId>maven-resources-plugin</artifactId>\r
- <version>2.7</version>\r
- <executions>\r
+ </execution> \r
<execution>\r
<id>copy-resources-1</id>\r
<phase>validate</phase>\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}/src/main/resources/etc</directory>\r
<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
<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
</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
</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
<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
</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
</configuration>\r
</execution>\r
</executions>\r
- </plugin>\r
+ </plugin> \r
+\r
\r
</plugins>\r
\r
</build>\r
\r
+\r
<distributionManagement>\r
<repository>\r
<id>ecomp-releases</id>\r
<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
+ <profiles>\r
+ <profile>\r
+ <id>docker</id>\r
+ <properties>\r
+ <skip.staging.artifacts>true</skip.staging.artifacts>\r
+ <skip.docker.build>false</skip.docker.build>\r
+ <skip.docker.tag>false</skip.docker.tag>\r
+ <skip.docker.push>false</skip.docker.push>\r
+ </properties>\r
+ </profile>\r
+ </profiles>\r
</project>\r
Code Review / aaf / authz.git / blobdiff