X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=5ac2477607c1071171abd474055fe720eb3763ec;hb=430153e1a9489a86cf0ff7942eceb0bf5f1c170c;hp=982ca96033fba80cc6b3a5571ec3c3a54c49960e;hpb=b8bad9d2cc5168e55271929a6474184129f31ef2;p=optf%2Fosdf.git

diff --git a/pom.xml b/pom.xml
index 982ca96..5ac2477 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,36 +14,41 @@
     License for the specific language governing permissions and limitations
     under the License.
 -->
-<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">
+<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>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent-python</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
 
     <groupId>org.onap.optf.osdf</groupId>
     <artifactId>optf-osdf</artifactId>
     <name>optf-osdf</name>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <description>Optimization Service Design Framework</description>
 
     <properties>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <sonar.sources>.</sonar.sources>
-      <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
-      <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
-      <sonar.language>py</sonar.language>
-      <sonar.pluginname>python</sonar.pluginname>
-      <sonar.inclusions>**/**.py</sonar.inclusions>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <sonar.sources>.</sonar.sources>
+        <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
+        <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
+        <sonar.language>py</sonar.language>
+        <sonar.pluginname>python</sonar.pluginname>
+        <sonar.inclusions>**/**.py,osdfapp.py</sonar.inclusions>
+        <sonar.exclusions>test/**.py</sonar.exclusions>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+        <osdf.build.timestamp>${maven.build.timestamp}</osdf.build.timestamp>
+        <osdf.project.version>${project.version}</osdf.project.version>
+        <osdf.docker.repository>nexus3.onap.org:10003</osdf.docker.repository>
+		<image.namespace>${osdf.docker.repository}/onap/optf-osdf</image.namespace>
     </properties>
 
     <build>
         <plugins>
+            <!-- triggers tox test for sonar -->
             <plugin>
                 <artifactId>exec-maven-plugin</artifactId>
                 <groupId>org.codehaus.mojo</groupId>
@@ -79,6 +84,80 @@
                     <retryFailedDeploymentCount>2</retryFailedDeploymentCount>
                 </configuration>
             </plugin>
+            <plugin>
+				<groupId>org.codehaus.groovy.maven</groupId>
+				<artifactId>gmaven-plugin</artifactId>
+				<version>1.0</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>execute</goal>
+						</goals>
+						<configuration>
+							<source>${project.basedir}/script/TagVersion.groovy</source>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+            <plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>0.26.0</version>
+				<configuration>
+					<verbose>true</verbose>
+					<apiVersion>1.23</apiVersion>
+					<images>
+						<image>
+							<name>${image.namespace}</name>
+							<alias>optf-osdf</alias>
+							<build>
+								<cleanup>true</cleanup>
+								<tags>
+									<tag>latest</tag>
+									<tag>${project.docker.latesttagtimestamp.version}</tag>
+									<tag>${project.docker.latesttag.version}</tag>
+								</tags>
+
+								<dockerFile>${project.basedir}/docker/Dockerfile</dockerFile>
+								<assembly>
+									<descriptor>${project.basedir}/docker/assembly/osdf-files.xml</descriptor>
+									<name>onap-osdf-tm</name>
+								</assembly>
+								<args>
+                                    <MVN_ARTIFACT_VERSION>${project.version}</MVN_ARTIFACT_VERSION>
+                                    <REPO>${project.repo}</REPO>
+
+									<!-- plugin cannot handle empty (no proxy) arguments
+									<http_proxy_arg>${docker.http_proxy}</http_proxy_arg>
+									<https_proxy_arg>${docker.https_proxy}</https_proxy_arg>
+									-->
+								</args>
+							</build>
+						</image>
+					</images>
+				</configuration>
+				<executions>
+					<execution>
+						<id>generate-images</id>
+						<phase>install</phase>
+						<goals>
+							<goal>build</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>push-images</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>build</goal>
+							<goal>push</goal>
+						</goals>
+						<configuration>
+							<image>${image.namespace}:%l</image>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
         </plugins>
     </build>
 </project>