<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>0.1.1</version>
+ <version>1.1.0</version>
</parent>
<groupId>org.onap.dmaap.messagerouter.messageservice</groupId>
<artifactId>dmaapMR1</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.8-SNAPSHOT</version>
<name>dmaap-messagerouter-messageservice</name>
<description>Message Router - Restful interface built for kafka</description>
<licenses>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-no-snapshots</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireReleaseDeps>
+ <message>No Snapshots Allowed!</message>
+ <excludes>
+ <exclude>org.onap.dmaap.messagerouter.msgrtr:msgrtr</exclude>
+ </excludes>
+ </requireReleaseDeps>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<executions>
<execution>
<id>build-image</id>
- <phase>package</phase>
+ <phase>install</phase>
<goals>
<goal>build</goal>
</goals>
<execution>
<id>tag-image-project-version</id>
- <phase>package</phase>
+ <phase>install</phase>
<goals>
<goal>tag</goal>
</goals>
<execution>
<id>tag-image-latest</id>
- <phase>package</phase>
+ <phase>install</phase>
<goals>
<goal>tag</goal>
</goals>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <compilerId>groovy-eclipse-compiler</compilerId>
- <verbose>true</verbose>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.8.0-01</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-eclipse-batch</artifactId>
- <version>2.1.5-03</version>
- </dependency>
- </dependencies>
- </plugin>
+ <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version> <configuration> <compilerId>groovy-eclipse-compiler</compilerId>
+ <verbose>true</verbose> <source>1.7</source> <target>1.7</target> </configuration>
+ <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-eclipse-compiler</artifactId>
+ <version>2.8.0-01</version> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-eclipse-batch</artifactId> <version>2.1.5-03</version>
+ </dependency> </dependencies> </plugin> -->
<plugin>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
<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>1.0.0</ajscRuntimeVersion>
+ <ajscRuntimeVersion>3.0.10-oss</ajscRuntimeVersion>
<!-- This will be the Absolute Root of the Project and should contain NO
Versioning -->
<testRouteOffer>workstation</testRouteOffer>
<testEnv>DEV</testEnv>
- <dmaapImg>${project.version}</dmaapImg>
- <camel.version>2.15.5</camel.version>
+ <!-- <dmaapImg>${project.version}</dmaapImg> -->
+ <dmaapImg>1.1.8</dmaapImg>
+ <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>
<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 -->
so). If you have a startup failure related to a missing dme2 class not found
exception, please contact the AJSC team for assistance. You can email support
at ajsc-Support <DL-ajsc-Support@att.com>. For more information regarding
- the usage of the AJSC service pom.xml and management of dependencies, please
- goto wiki link:http://wiki.web.att.com/display/ajsc/pom.xml -->
+ the usage of the AJSC service pom.xml and management of dependencies, -->
<dependencies>
<!-- cmn-CommonDataModel dependency added to resolve build issue not finding
<!-- <dependency> <groupId>csi-schemas-source</groupId> <artifactId>cmn-CommonDataModel</artifactId>
<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>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>4.3.18.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-messaging</artifactId>
+ <version>4.1.9.RELEASE</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>4.3.18.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>4.3.18.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>4.3.18.RELEASE</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>4.3.18.RELEASE</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<dependency>
<groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
<artifactId>msgrtr</artifactId>
- <version>1.1.1</version>
+ <version>1.1.12-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>tomcat-util</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<version>1.6.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>1.9.13</version>
- </dependency>
+ <!-- <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-jaxrs</artifactId>
+ <version>1.9.13</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId> <version>1.9.13</version> </dependency>
+ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId>
+ <version>1.9.13</version> </dependency> -->
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.13</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.9.13</version>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.2.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.4.3</version>
+ <version>2.8.11</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.3.3</version>
+ <version>2.8.11.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.grails</groupId>
+ <artifactId>grails-web</artifactId>
+ <version>2.5.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.grails</groupId>
+ <artifactId>grails-web-jsp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>2.4.8</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>jline</artifactId>
+ <groupId>jline</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.0.4</version>
+ <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>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.3.7</version>
</dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.att.aft</groupId>
- <artifactId>dme2</artifactId>
- <version>3.1.200</version>
- <!-- <scope>provided</scope> -->
- </dependency>
+ <!-- <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId>
+ <version>1.6.1</version> <scope>provided</scope> </dependency> -->
<dependency>
<groupId>com.att.ajsc</groupId>
<artifactId>ajsc-archetype-parent</artifactId>
- <version>1.0.0</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>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servlet</artifactId>
<version>${camel.version}</version>
+ <!-- <exclusions> <exclusion> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId>
+ </exclusion> </exclusions> -->
</dependency>
+ <!-- <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId>
+ <version>4.0</version> </dependency> -->
+
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http4</artifactId>
<artifactId>camel-xmpp</artifactId>
<version>${camel.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.igniterealtime.smack</groupId>
+ <artifactId>smack-tcp</artifactId>
+ <version>4.1.0-rc1</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-velocity</artifactId>
<dependency>
<groupId>com.att.ajsc</groupId>
<artifactId>ajsc-runner</artifactId>
- <version>1.0.0</version>
+ <version>3.0.10-oss</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.att.ajsc</groupId>
<artifactId>ajsc-core</artifactId>
- <version>1.0.0</version>
+ <version>3.0.10-oss</version>
<scope>provided</scope>
</dependency>
</dependencies>
<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>
Code Review / dmaap / messagerouter / messageservice.git / blobdiff