Move AAF/CADI Poms to 2.1.2

[aaf/authz.git] / cadi / core / pom.xml

diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml
index 93d5a8f..f7ad1a7 100644 (file)
--- a/cadi/core/pom.xml
+++ b/cadi/core/pom.xml
@@ -13,10 +13,10 @@
 <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>
-               <groupId>org.onap.aaf.authz.cadi</groupId>
-               <artifactId>parent</artifactId>
+               <groupId>org.onap.aaf.authz</groupId>
+               <artifactId>cadiparent</artifactId>
                <relativePath>..</relativePath>
-               <version>1.5.0-SNAPSHOT</version>
+               <version>2.1.2-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
@@ -30,8 +30,8 @@
            <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
            <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
            <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-           <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+           <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
            <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
            <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
@@ -79,7 +79,7 @@
        <dependencies>
                <dependency>
                        <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
+                       <artifactId>javax.servlet-api</artifactId>
                        <scope>provided</scope>
                </dependency>
        </dependencies>
@@ -128,7 +128,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>