summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dt5972@att.com>2018-05-09 13:27:51 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-09 13:27:51 +0000
commite9b37d308b585b472690bc6cfa2e67e9824200d5 (patch)
tree677a256ef43a2a9eaf0fb102597cab295fcc057e
parent7c685efabc3d52a6a3cc95149e7748278c783267 (diff)
parent2f4cbed5f3f059aeced08cbb7b82f91de5ef4a80 (diff)
Merge "Disable single feature test"
-rwxr-xr-xodlparent/odlparent-lite/pom.xml3
-rwxr-xr-xodlparent/single-feature-parent/pom.xml4
2 files changed, 7 insertions, 0 deletions
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 4517a7e6..8ff01d4a 100755
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -180,6 +180,9 @@
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
<tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
+
+ <dmaapClient.groupId>org.onap.dmaap.messagerouter.dmaapclient</dmaapClient.groupId>
+ <dmaapClient.version>1.1.5</dmaapClient.version>
</properties>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 421b83ac..2d70bbfc 100755
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -180,6 +180,10 @@
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
<tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
+
+
+ <!-- Disable SingleFeatureTest, since it will fail if any dependencies are released ONAP artifacts -->
+ <skip.karaf.featureTest>true</skip.karaf.featureTest>
</properties>