Code Review
/
dmaap
/
datarouter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "small, multi-platform docker images"
[dmaap/datarouter.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index
afbbf92
..
8f3672c
100755
(executable)
--- a/
pom.xml
+++ b/
pom.xml
@@
-3,6
+3,7
@@
* org.onap.dmaap
* ===========================================================================
* Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* org.onap.dmaap
* ===========================================================================
* Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 Nokia. All rights reserved.
* ===========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* ===========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-25,15
+26,16
@@
<groupId>org.onap.dmaap.datarouter</groupId>
<artifactId>parent</artifactId>
<name>dmaap-datarouter</name>
<groupId>org.onap.dmaap.datarouter</groupId>
<artifactId>parent</artifactId>
<name>dmaap-datarouter</name>
- <version>
1.0.1
-SNAPSHOT</version>
+ <version>
2.0.2
-SNAPSHOT</version>
<packaging>pom</packaging>
<url>https://github.com/att/DMAAP_DATAROUTER</url>
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
<packaging>pom</packaging>
<url>https://github.com/att/DMAAP_DATAROUTER</url>
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.
1.0
</version>
+ <version>1.
2.3
</version>
</parent>
<properties>
</parent>
<properties>
+ <datarouter.version>2.0.2-SNAPSHOT</datarouter.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
@@
-45,10
+47,11
@@
<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
<sonar.projectVersion>${project.version}</sonar.projectVersion>
<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
<sonar.projectVersion>${project.version}</sonar.projectVersion>
- <jetty.version>9.
3.8.RC0
</jetty.version>
+ <jetty.version>9.
4.14.v20181114
</jetty.version>
<jetty.websocket.version>8.2.0.v20160908</jetty.websocket.version>
<javax.mail-api.version>1.5.5</javax.mail-api.version>
<jetty.websocket.version>8.2.0.v20160908</jetty.websocket.version>
<javax.mail-api.version>1.5.5</javax.mail-api.version>
- <dom4j.version>1.6</dom4j.version>
+ <dom4j.version>2.1.1</dom4j.version>
+ <xml-apis.version>1.4.01</xml-apis.version>
<thoughtworks.version>1.4.10</thoughtworks.version>
<google.guava.version>26.0-jre</google.guava.version>
<qos.logback.version>1.2.3</qos.logback.version>
<thoughtworks.version>1.4.10</thoughtworks.version>
<google.guava.version>26.0-jre</google.guava.version>
<qos.logback.version>1.2.3</qos.logback.version>
@@
-56,7
+59,6
@@
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
<sitePath>/content/sites/site/org/onap/dmaap/datarouter/${project.artifactId}/${project.version}</sitePath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
<sitePath>/content/sites/site/org/onap/dmaap/datarouter/${project.artifactId}/${project.version}</sitePath>
- <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
<skip.docker.build>true</skip.docker.build>
<skip.docker.tag>true</skip.docker.tag>
<skip.docker.push>true</skip.docker.push>
<skip.docker.build>true</skip.docker.build>
<skip.docker.tag>true</skip.docker.tag>
<skip.docker.push>true</skip.docker.push>
@@
-66,17
+68,10
@@
<module>datarouter-prov</module>
<module>datarouter-node</module>
<module>datarouter-subscriber</module>
<module>datarouter-prov</module>
<module>datarouter-node</module>
<module>datarouter-subscriber</module>
+ <module>datarouter-docker-compose</module>
</modules>
<build>
<plugins>
</modules>
<build>
<plugins>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>${docker.maven.plugin.version}</version>
- <configuration>
- <skipDockerBuild>true</skipDockerBuild>
- </configuration>
- </plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
@@
-146,6
+141,15
@@
</execution>
</executions>
</plugin>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>IntegrationSuite.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
<distributionManagement>
</plugins>
</build>
<distributionManagement>