summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouët <adetalhouet89@gmail.com>2018-11-20 15:46:41 -0500
committerAlexis de Talhouët <adetalhouet89@gmail.com>2018-11-20 15:46:41 -0500
commitaa901b9e75c5918e097ebd1f0a14de5c84d3c371 (patch)
treebc0247ed7d65a1ed8cddb2a8719fdc12462e9be6
parent5160246a8bf4cfa54b623a1b2a737b3a9452f653 (diff)
Enable blueprintprocessor and vlantag-api
Also, fix add IntelliJ file in gitignore Change-Id: Iee192350ec3ec9c1aceefe814d4b0c11c326a897 Issue-ID: CCSDK-734 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
-rw-r--r--.gitignore10
-rw-r--r--ms/pom.xml10
2 files changed, 8 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index 82cae9e5..12004f5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@
**/tokens/*
# Added for Intellij IDEA IDE
+**/*.ipr
+**/*.iws
**/debug-logs/*
**/.idea/*
**/*.iml
@@ -19,11 +21,3 @@
**/*.jsonld
**/.checkstyle
**/.gitignore
-**/.gitignore
-**/.gitignore
-**/.gitignore
-**/.gitignore
-**/.gitignore
-**/.gitignore
-**/.gitignore
-
diff --git a/ms/pom.xml b/ms/pom.xml
index 0493db15..9a80e6f5 100644
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -19,14 +19,15 @@
* ============LICENSE_END=========================================================
-->
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
<version>1.2.0-SNAPSHOT</version>
- <relativePath />
+ <relativePath/>
</parent>
<groupId>org.onap.ccsdk.apps</groupId>
@@ -38,9 +39,10 @@
<description>Micro-services</description>
<modules>
- <module>controllerblueprints</module>
+ <module>controllerblueprints</module>
+ <module>blueprintsprocessor</module>
<module>neng</module>
- <!--module>vlantag-api</module-->
+ <module>vlantag-api</module>
</modules>
</project>