Fix/Renable sidecar builds

[aaf/cadi.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 8e9f174..16282a0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
                <cadi.version>2.1.7-SNAPSHOT</cadi.version>
                <!-- <sonar.skip>true</sonar.skip> -->
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
+               <!-- project.jettyVersion>9.4.12.v20180830</project.jettyVersion -->
                <powermock.version>1.5.1</powermock.version>
                <!-- SONAR -->
                <jacoco.version>0.7.7.201606060606</jacoco.version>
@@ -131,9 +131,7 @@
        <modules>
                <module>shiro</module>
                <module>shiro-osgi-bundle</module>
-               <!-- Not in Casablanca 
                <module>sidecar</module>
-               -->
        </modules>
 
        <!-- ============================================================== -->
@@ -159,7 +157,6 @@
                                <version>${cadi.version}</version>
                        </dependency>
 
-
                        <!-- Prevent Cycles in Testing -->
                        <dependency>
                                <groupId>org.onap.aaf.authz</groupId>
@@ -216,6 +213,8 @@
                                <artifactId>aaf-misc-log4j</artifactId>
                                <version>${cadi.version}</version>
                        </dependency>
+                       
+                       <!-- 
 
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
@@ -252,13 +251,7 @@
                                <artifactId>jetty-server</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
-
-                       <dependency>
-                               <groupId>javax.servlet</groupId>
-                               <artifactId>javax.servlet-api</artifactId>
-                               <version>3.0.1</version>
-                       </dependency>
-
+                       -->
                        <dependency>
                                <groupId>org.slf4j</groupId>
                                <artifactId>slf4j-api</artifactId>
@@ -282,8 +275,8 @@
                                        <artifactId>maven-compiler-plugin</artifactId>
                                        <version>2.3.2</version>
                                        <configuration>
-                                               <source>1.7</source>
-                                               <target>1.7</target>
+                                               <source>${maven.compiler.source}</source>
+                                               <target>${maven.compiler.target}</target>
                                        </configuration>
                                </plugin>