Merge "Delg,ListActivity,ListApprovals.java-remove useless assignments"

[aaf/authz.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 1926eb0..a753070 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,14 +22,19 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.aaf.authz</groupId>
     <artifactId>parent</artifactId>
-    <version>2.1.16-SNAPSHOT</version>
+    <version>2.1.17-SNAPSHOT</version>
     <name>aaf-authz</name>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
+        <!-- Official Released Version
+        <version>2.1.0</version>
+
+        Frankfurt working Version
+    -->
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -41,13 +46,6 @@
         <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
 
         <maven.test.failure.ignore>false</maven.test.failure.ignore>
-        <!-- SONAR -->
-        <jacoco.version>0.7.7.201606060606</jacoco.version>
-        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-        <!-- Default Sonar configuration -->
-        <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>
@@ -58,7 +56,8 @@
         <project.interfaceVersion>${project.version}</project.interfaceVersion>
         <project.jettyVersion>9.4.12.v20180830</project.jettyVersion>
         <project.cassVersion>3.6.0</project.cassVersion>
-
+        <project.jaxbVersion>2.3.1</project.jaxbVersion>
+        <project.glassfishJaxbVersion>3.0-b71</project.glassfishJaxbVersion>
     </properties>
     <build>
         <plugins>
@@ -349,6 +348,23 @@
                 <scope>test</scope>
             </dependency>
 
+          <!-- Javax removed as of JDK 9 -->
+          <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${project.jaxbVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+            <version>${project.jaxbVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${project.jaxbVersion}</version>
+          </dependency>
+          
         </dependencies>
     </dependencyManagement>