Pom OParent, other hierarchy
Issue-ID: AAF-613
Change-Id: I14531b546aebb9e5326ddc67eb3ec4eb9e17dac1
Signed-off-by: Instrumental <jonathan.gathman@att.com>
diff --git a/pom.xml b/pom.xml
index 45bfe29..550f8a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,9 +21,9 @@
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>
<groupId>org.onap.aaf.cadi</groupId>
- <artifactId>cadimiscparent</artifactId>
- <version>2.1.2-SNAPSHOT</version>
- <name>aaf-cadi</name>
+ <artifactId>parent</artifactId>
+ <version>2.1.7-SNAPSHOT</version>
+ <name>CADI Plugins Parent</name>
<packaging>pom</packaging>
<parent>
@@ -34,7 +34,7 @@
<properties>
<!-- This version needs to be RELEASED version. Fails on SNAPSHOT -->
- <cadi.version>2.1.2</cadi.version>
+ <cadi.version>2.1.6</cadi.version>
<!-- <sonar.skip>true</sonar.skip> -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
@@ -120,7 +120,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -131,7 +131,9 @@
<modules>
<module>shiro</module>
<module>shiro-osgi-bundle</module>
+ <!-- Not in Casablanca
<module>sidecar</module>
+ -->
</modules>
<!-- ============================================================== -->