temporary fix for missing focker image

[dmaap/messagerouter/messageservice.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index e1f685f..65e17bf 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,7 @@
                                        <serverId>docker-hub</serverId>
                                        <imageTags>
                                                <imageTag>${dmaapImg}</imageTag>
+                                               <imageTag>${dmaapImg.release.version}</imageTag>
                                                <imageTag>latest</imageTag>
                                        </imageTags>
                                        <forceTags>true</forceTags>
@@ -164,6 +165,18 @@
                                                        <skipDockerTag>${skip.docker.push}</skipDockerTag>
                                                </configuration>
                                        </execution>
+                                       <execution>
+                                               <id>tag-image-tmp</id>
+                                               <phase>install</phase>
+                                               <goals>
+                                                       <goal>tag</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <image>onap/dmaap/dmaap-mr</image>
+                                                       <newName>${docker.push.registry}/onap/dmaap/dmaap-mr:${dmaapImg.release.version}</newName>
+                                                       <skipDockerTag>${skip.docker.push}</skipDockerTag>
+                                               </configuration>
+                                       </execution>
 
                                        <execution>
                                                <id>push-image-latest</id>
@@ -188,6 +201,17 @@
                                                        <skipDockerPush>${skip.docker.push}</skipDockerPush>
                                                </configuration>
                                        </execution>
+                                       <execution>
+                                               <id>push-image-tmp</id>
+                                               <phase>deploy</phase>
+                                               <goals>
+                                                       <goal>push</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:${dmaapImg.release.version}</imageName>
+                                                       <skipDockerPush>${skip.docker.push}</skipDockerPush>
+                                               </configuration>
+                                       </execution>
                                </executions>
                        </plugin>
                        <plugin>
@@ -250,6 +274,7 @@
                <module.ajsc.namespace.name>dmaap</module.ajsc.namespace.name>
                <module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
                <ajscRuntimeVersion>3.0.6-oss</ajscRuntimeVersion>
+               <dmaapImg.release.version>1.1.4</dmaapImg.release.version>
 
                <!-- This will be the Absolute Root of the Project and should contain NO 
                        Versioning -->
@@ -335,7 +360,7 @@
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-expression</artifactId>
-                       <version>3.1.0.RELEASE</version>
+                       <version>4.3.16.RELEASE</version>
                </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
@@ -817,6 +842,18 @@
                                                                                        <key>logback.configurationFile</key>
                                                                                        <value>${basedir}/ajsc-shared-config/etc/logback.xml</value>
                                                                                </systemProperty>
+                                                                               <systemProperty>
+                                                                                       <key>com.att.eelf.logging.file</key>
+                                                                                       <value>logback.xml</value>
+                                                                               </systemProperty>
+                                                                               <systemProperty>
+                                                                                       <key>com.att.eelf.logging.path</key>
+                                                                                       <value>${basedir}/ajsc-shared-config/etc</value>
+                                                                               </systemProperty>
+                                                                               <systemProperty>
+                                                                                       <key>logging.config</key>
+                                                                                       <value>${basedir}/ajsc-shared-config/etc/logback.xml</value>
+                                                                               </systemProperty>
                                                                                <systemProperty>
                                                                                        <key>AJSC_SHARED_CONFIG</key>
                                                                                        <value>${basedir}/ajsc-shared-config</value>