diff options
| -rw-r--r-- | pom.xml | 90 | ||||
| -rw-r--r-- | version.properties | 2 |
2 files changed, 83 insertions, 9 deletions
@@ -21,7 +21,7 @@ <groupId>org.onap.dmaap.messagerouter.messageservice</groupId> <artifactId>dmaapMR1</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.4-SNAPSHOT</version> <name>dmaap-messagerouter-messageservice</name> <description>Message Router - Restful interface built for kafka</description> <licenses> @@ -246,10 +246,10 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <dockerLocation>${basedir}/target/swm/package/nix/dist_files/</dockerLocation> <docker.image.prefix>simpledemo</docker.image.prefix> - + <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.3-oss</ajscRuntimeVersion> + <ajscRuntimeVersion>3.0.4-oss</ajscRuntimeVersion> <!-- This will be the Absolute Root of the Project and should contain NO Versioning --> @@ -278,12 +278,13 @@ <testRouteOffer>workstation</testRouteOffer> <testEnv>DEV</testEnv> <dmaapImg>${project.version}</dmaapImg> - <camel.version>2.16.2</camel.version> + <camel.version>2.17.6</camel.version> <sitePath>/content/sites/site/org/onap/dmaap/messagerouter/messageservice/${project.artifactId}/${project.version}</sitePath> <skip.docker.build>true</skip.docker.build> <skip.docker.push>true</skip.docker.push> <nexusproxy>https://nexus.onap.org</nexusproxy> <docker.push.registry>nexus3.onap.org:10003</docker.push.registry> + <spring.version>3.2.18.RELEASE</spring.version> </properties> <!-- Distribution management --> @@ -320,6 +321,7 @@ <!-- <dependency> <groupId>csi-schemas-source</groupId> <artifactId>cmn-CommonDataModel</artifactId> <version>112.0.50</version> </dependency> --> <!-- TODO: add open source version here --> + <dependency> <groupId>com.att.cadi</groupId> <artifactId>cadi-core</artifactId> @@ -330,6 +332,78 @@ <artifactId>dme2</artifactId> <version>3.1.200-oss</version> </dependency> + + <dependency> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> + <version>${javax-mail-version}</version> + <exclusions> + <!-- javax activation is part of the JDK now --> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>3.4.10</version> + </dependency> + <dependency> + <groupId>org.grails</groupId> + <artifactId>grails-bootstrap</artifactId> + <version>2.5.4</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>ant</artifactId> + <groupId>org.apache.ant</groupId> + </exclusion> + <exclusion> + <artifactId>jna</artifactId> + <groupId>net.java.dev.jna</groupId> + </exclusion> + <exclusion> + <artifactId>ant-trax</artifactId> + <groupId>org.apache.ant</groupId> + </exclusion> + <exclusion> + <artifactId>gant_groovy1.8</artifactId> + <groupId>org.codehaus.gant</groupId> + </exclusion> + <exclusion> + <artifactId>ant-launcher</artifactId> + <groupId>org.apache.ant</groupId> + </exclusion> + <exclusion> + <artifactId>jline</artifactId> + <groupId>jline</groupId> + </exclusion> + <exclusion> + <artifactId>ivy</artifactId> + <groupId>org.apache.ivy</groupId> + </exclusion> + <exclusion> + <artifactId>jansi</artifactId> + <groupId>org.fusesource.jansi</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>ant-junit</artifactId> + <groupId>org.apache.ant</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>3.2.18.RELEASE</version> + </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> @@ -423,7 +497,7 @@ <dependency> <groupId>org.grails</groupId> <artifactId>grails-web</artifactId> - <version>2.4.4</version> + <version>2.5.4</version> <exclusions> <exclusion> <groupId>org.grails</groupId> @@ -478,7 +552,7 @@ <dependency> <groupId>com.att.ajsc</groupId> <artifactId>ajsc-archetype-parent</artifactId> - <version>3.0.3-oss</version> + <version>3.0.4-oss</version> <type>pom</type> </dependency> @@ -610,13 +684,13 @@ <dependency> <groupId>com.att.ajsc</groupId> <artifactId>ajsc-runner</artifactId> - <version>3.0.3-oss</version> + <version>3.0.4-oss</version> <scope>runtime</scope> </dependency> <dependency> <groupId>com.att.ajsc</groupId> <artifactId>ajsc-core</artifactId> - <version>3.0.3-oss</version> + <version>3.0.4-oss</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/version.properties b/version.properties index 05dc9e5..e7654d1 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=1 -patch=3 +patch=4 base_version=${major}.${minor}.${patch} |