<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.1.0</version>
+ <version>1.2.1</version>
</parent>
<groupId>org.onap.dmaap.messagerouter.messageservice</groupId>
<artifactId>dmaapMR1</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.11-SNAPSHOT</version>
<name>dmaap-messagerouter-messageservice</name>
<description>Message Router - Restful interface built for kafka</description>
<licenses>
<dockerDirectory>${dockerLocation}</dockerDirectory>
<serverId>docker-hub</serverId>
<imageTags>
- <imageTag>${dmaapImg}</imageTag>
- <imageTag>latest</imageTag>
+ <imageTag>${dockertag1}</imageTag>
+ <imageTag>${dockertag2}</imageTag>
</imageTags>
<forceTags>true</forceTags>
<resources>
</goals>
<configuration>
<image>onap/dmaap/dmaap-mr</image>
- <newName>${docker.push.registry}/onap/dmaap/dmaap-mr:${project.version}</newName>
+ <newName>${docker.push.registry}/onap/dmaap/dmaap-mr:${dockertag2}</newName>
<skipDockerTag>${skip.docker.push}</skipDockerTag>
</configuration>
</execution>
</goals>
<configuration>
<image>onap/dmaap/dmaap-mr</image>
- <newName>${docker.push.registry}/onap/dmaap/dmaap-mr:latest</newName>
+ <newName>${docker.push.registry}/onap/dmaap/dmaap-mr:${dockertag1}</newName>
<skipDockerTag>${skip.docker.push}</skipDockerTag>
</configuration>
</execution>
<goal>push</goal>
</goals>
<configuration>
- <imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:${project.version}</imageName>
+ <imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:${dockertag2}</imageName>
<skipDockerPush>${skip.docker.push}</skipDockerPush>
</configuration>
</execution>
<goal>push</goal>
</goals>
<configuration>
- <imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:latest</imageName>
+ <imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:${dockertag1}</imageName>
<skipDockerPush>${skip.docker.push}</skipDockerPush>
</configuration>
</execution>
<!-- <javax-mail-version>1.5.0</javax-mail-version> -->
<module.ajsc.namespace.name>dmaap</module.ajsc.namespace.name>
<module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
- <ajscRuntimeVersion>3.0.7-oss</ajscRuntimeVersion>
+ <ajscRuntimeVersion>3.0.10-oss</ajscRuntimeVersion>
<!-- This will be the Absolute Root of the Project and should contain NO
Versioning -->
8080 -->
<serverPort>3904</serverPort>
<sslport>3905</sslport>
-
+ <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<testRouteOffer>workstation</testRouteOffer>
<testEnv>DEV</testEnv>
<!-- <dmaapImg>${project.version}</dmaapImg> -->
- <dmaapImg>1.1.7</dmaapImg>
+ <timestamp>${maven.build.timestamp}</timestamp>
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<camel.version>2.21.1</camel.version>
<sitePath>/content/sites/site/org/onap/dmaap/messagerouter/messageservice/${project.artifactId}/${project.version}</sitePath>
<skip.docker.build>true</skip.docker.build>
<version>112.0.50</version> </dependency> -->
<!-- TODO: add open source version here -->
- <dependency>
+
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.6.0</version>
+ <exclusions>
+ <!-- javax activation is part of the JDK now -->
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.3.0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.0.1</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>jsr181-api</artifactId>
+ <groupId>javax.jws</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>3.2.5</version>
+ </dependency>
+
+ <!-- <dependency>
<groupId>com.att.cadi</groupId>
<artifactId>cadi-core</artifactId>
<version>1.3.0</version>
<groupId>com.att.aft</groupId>
<artifactId>dme2</artifactId>
<version>3.1.200-oss</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<dependency>
<groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
<artifactId>msgrtr</artifactId>
- <version>1.1.7</version>
+ <version>1.1.15</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<version>3.2.2</version>
<!-- <exclusions> <exclusion> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId>
</exclusion> </exclusions> -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId>
<version>3.1.14</version> </dependency> -->
<dependency>
<groupId>com.att.ajsc</groupId>
<artifactId>ajsc-archetype-parent</artifactId>
- <version>3.0.7-oss</version>
+ <version>3.0.10-oss</version>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>com.att.cadi</groupId>
- <artifactId>cadi-aaf</artifactId>
- <version>1.3.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.att.inno</groupId>
- <artifactId>rosetta</artifactId>
- <version>1.2.11</version>
- </dependency>
- <dependency>
- <groupId>com.att.inno</groupId>
- <artifactId>env</artifactId>
- <version>1.2.11</version>
- </dependency>
- <dependency>
- <groupId>com.att.inno</groupId>
- <artifactId>xgen</artifactId>
- <version>1.2.11</version>
- </dependency>
- <dependency>
- <groupId>com.att.inno</groupId>
- <artifactId>rosetta</artifactId>
- <version>1.2.11</version>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.1</version>
- </dependency>
+ <dependency>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-aaf</artifactId>
+ <version>2.1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<dependency>
<groupId>com.att.ajsc</groupId>
<artifactId>ajsc-runner</artifactId>
- <version>3.0.7-oss</version>
+ <version>3.0.10-oss</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.att.ajsc</groupId>
<artifactId>ajsc-core</artifactId>
- <version>3.0.7-oss</version>
+ <version>3.0.10-oss</version>
<scope>provided</scope>
</dependency>
</dependencies>
<profile>
<id>docker</id>
<properties>
-
<skip.docker.build>false</skip.docker.build>
<skip.docker.tag>false</skip.docker.tag>
<skip.docker.push>false</skip.docker.push>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <properties>
+ <ver>${project.version}</ver>
+ <timestamp>${maven.build.timestamp}</timestamp>
+ </properties>
+ <source>
+ println project.properties['ver'];
+ if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
+ project.properties['dockertag1']=project.properties['ver'] + "-latest";
+ project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp'];
+ } else {
+ project.properties['dockertag1']=project.properties['ver'] + "-STAGING-latest";
+ project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
+ }
+ println 'docker tag 1: ' + project.properties['dockertag1'];
+ println 'docker tag 2: ' + project.properties['dockertag2'];
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>