Pom OParent, other hierarchy

[aaf/cadi.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 54c6c7f..550f8a4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,31 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * ============LICENSE_START====================================================
- * org.onap.aaf
- * ===========================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END====================================================
- *
--->
+<!--* ============LICENSE_START==================================================== 
+    * =========================================================================== 
+    * org.onap.aaf 
+    * Copyright (c) 2017 AT&T Intellectual Property. 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. 
+    * You may obtain a copy of the License at 
+    * 
+    * http://www.apache.org/licenses/LICENSE-2.0 
+    * 
+    * Unless required by applicable law or agreed to in writing, software 
+    * distributed under the License is distributed on an "AS IS" BASIS, 
+    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+    * See the License for the specific language governing permissions and 
+    * limitations under the License. 
+    * ============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">
        <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>
@@ -36,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>
@@ -122,7 +120,7 @@
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>4.10</version>
+                       <version>4.12</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>
@@ -133,7 +131,9 @@
        <modules>
                <module>shiro</module>
                <module>shiro-osgi-bundle</module>
+               <!-- Not in Casablanca 
                <module>sidecar</module>
+               -->
        </modules>
 
        <!-- ============================================================== -->