summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2018-10-03 14:09:33 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-03 14:09:33 +0000
commit7126f3011b8f06e93be7d6c6f7ee35b539668236 (patch)
tree5ac5146133d4ab61174013898161182f34091270
parentf9eec43af8de8ac507daf800cc30ac84235d24cd (diff)
parent61c387c7a62815c464aa0ac402623d9b2c6cb129 (diff)
Merge "Fixing the build for master"
-rw-r--r--datafile-devops/pom.xml15
-rw-r--r--docker-compose/docker-compose.yml (renamed from datafile-devops/src/main/resources/docker-compose.yml)0
-rw-r--r--pom.xml1
3 files changed, 0 insertions, 16 deletions
diff --git a/datafile-devops/pom.xml b/datafile-devops/pom.xml
deleted file mode 100644
index 219e9eee..00000000
--- a/datafile-devops/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>datafile</artifactId>
- <groupId>org.onap.dcaegen2.collectors</groupId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>datafile-devops</artifactId>
-
-
-</project> \ No newline at end of file
diff --git a/datafile-devops/src/main/resources/docker-compose.yml b/docker-compose/docker-compose.yml
index a14eb2af..a14eb2af 100644
--- a/datafile-devops/src/main/resources/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
diff --git a/pom.xml b/pom.xml
index 34860bfb..189e392b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,6 @@
<module>datafile-app-server</module>
<module>datafile-dmaap-client</module>
<module>datafile-commons</module>
- <module>datafile-devops</module>
</modules>
<build>