X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=9e47ff07c04f159958b117d3031db9af7d00c14c;hb=6a1ddb5e38cf8fa29f84c4b6ac4172bc1063691a;hp=5e6c358619c5bfd01a495d71f9976344ce35d510;hpb=e9ae04800c417330c3e1c5dae45744f819f41130;p=aaf%2Fauthz.git

diff --git a/pom.xml b/pom.xml
index 5e6c3586..9e47ff07 100644
--- 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.15-SNAPSHOT</version>
+    <version>2.1.19-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.1</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>
@@ -56,9 +54,17 @@
         <powermock.version>1.5.1</powermock.version>
         <mockito.version>1.9.5</mockito.version>
         <project.interfaceVersion>${project.version}</project.interfaceVersion>
-        <project.jettyVersion>9.4.12.v20180830</project.jettyVersion>
+	<project.jettyVersion>9.4.12.v20180830</project.jettyVersion>
+        <!--
+            This version needs work.
+        	<project.jettyVersion>9.4.17.v20190418</project.jettyVersion>
+            This version requires changes in how to start Jetty  
+        	<project.jettyVersion>9.4.26.v20200117</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>
@@ -244,16 +250,37 @@
                 <version>3.0.1</version>
             </dependency>
 
-            <!-- JettyVersion is partly covered in "OParent" dependency> <groupId>org.eclipse.jetty</groupId> 
-                <artifactId>jetty-servlet</artifactId> <version>${project.jettyVersion}</version> 
-                </dependency><dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> 
-                <version>${project.jettyVersion}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> 
-                <artifactId>jetty-http</artifactId> <version>${project.jettyVersion}</version> 
-                </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> 
-                <version>${project.jettyVersion}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> 
-                <artifactId>jetty-security</artifactId> <version>${project.jettyVersion}</version> 
-                </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> 
-                <version>${project.jettyVersion}</version> </dependency> -->
+			            <!-- JettyVersion is partly covered in "OParent" dependency> -->
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlet</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-http</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-io</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-security</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-util</artifactId>
+				<version>${project.jettyVersion}</version>
+			</dependency> 
 
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -349,6 +376,40 @@
                 <scope>test</scope>
             </dependency>
 
+          <!-- Javax removed as of JDK 9 -->
+          <!--  Annotation MAY not be needed -->
+          <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+          </dependency>
+          <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>
+          <!-- 
+          <dependency>
+		    <groupId>com.sun.xml.bind</groupId>
+		    <artifactId>jaxb-impl</artifactId>
+		    <version>2.2.11</version>
+		  </dependency>
+		  <dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-core</artifactId>
+			<version>2.2.11</version>
+		   </dependency>
+		    -->
         </dependencies>
     </dependencyManagement>
 
@@ -368,4 +429,47 @@
             <url>dav:${nexusproxy}${sitePath}</url>
         </site>
     </distributionManagement>
+
+    <profiles>
+        <profile>
+            <id>build-docker</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.6.0</version>
+                        <executions>
+                            <execution>
+                                <id>Docker Build</id>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <skip>true</skip>
+                            <executable>bash</executable>
+                            <commandlineArgs>echo "No Docker Here"</commandlineArgs>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                            <groupId>org.sonarsource.scanner.maven</groupId>
+                            <artifactId>sonar-maven-plugin</artifactId>
+                            <configuration>
+                                <skip>true</skip>
+                            </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+
+            <modules>
+                <module>auth-client</module>
+                <module>misc</module>
+                <module>cadi</module>
+                <module>auth</module>
+                <module>auth/docker</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>