X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=pom.xml;h=b51170750f4164820439bb658174d9768c03894c;hp=babb150ee1bfb604c64962ef25a31a73e651b3a7;hb=ca05983eb56787a5780de2c47556b1c7a14f42ce;hpb=3acec6becfbb2ffb621a1f8c3eb0f14929b09226

diff --git a/pom.xml b/pom.xml
index babb150..b511707 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,28 +21,29 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
-	
+
 	<groupId>org.onap.aai.esr-server</groupId>
-    <artifactId>aai-esr-server-parent</artifactId>
+    <artifactId>aai-esr-server</artifactId>
     <packaging>pom</packaging>
 
-    <version>1.0.0-SNAPSHOT</version>
-    <name>aai-esr-server-parent</name>
+    <version>1.2.2-SNAPSHOT</version>
+    <name>aai-esr-server</name>
     <modules>
-        <module>esr-core</module>
+        <module>esr-mgr</module>
+		<module>standalone</module>
     </modules>
-	
+
 	<properties>
-        <dropwizard.version>0.8.0</dropwizard.version>
+        <dropwizard.version>1.3.0</dropwizard.version>
         <swagger.version>1.5.3</swagger.version>
         <jersey.version>2.16</jersey.version>
         <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
         <gson.version>2.2.4</gson.version>
         <junit.version>4.10</junit.version>
-        <org.powermock.version>1.4.10</org.powermock.version>
-        <org.apache.ant.version>1.8.2</org.apache.ant.version>
+		<jetty.version>9.4.11.v20180605</jetty.version>
+        <org.apache.ant.version>1.10.5</org.apache.ant.version>
     </properties>
 
     <dependencyManagement>
@@ -66,7 +67,111 @@
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-jersey2-jaxrs</artifactId>
                 <version>${swagger.version}</version>
-            </dependency> 
+            </dependency>
+			<dependency>
+				<groupId>org.hibernate</groupId>
+				<artifactId>hibernate-validator</artifactId>
+				<version>5.4.2.Final</version>
+			</dependency>
+
+			<!-- Jetty -->
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-server</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-util</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-webapp</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-continuation</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlet</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlet</artifactId>
+				<classifier>tests</classifier>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-servlets</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-http</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-http</artifactId>
+				<classifier>tests</classifier>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-alpn-openjdk8-server</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty.http2</groupId>
+				<artifactId>http2-server</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty.http2</groupId>
+				<artifactId>http2-client</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-client</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty.http2</groupId>
+				<artifactId>http2-http-client-transport</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-alpn-openjdk8-client</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-alpn-conscrypt-server</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty.toolchain.setuid</groupId>
+				<artifactId>jetty-setuid-java</artifactId>
+				<version>1.0.3</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.eclipse.jetty</groupId>
+						<artifactId>jetty-util</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.eclipse.jetty</groupId>
+						<artifactId>jetty-server</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
 
             <!-- jersey -->
             <dependency>
@@ -102,16 +207,6 @@
                 <artifactId>junit</artifactId>  
                 <version>${junit.version}</version>
             </dependency> 
-            <dependency> 
-                <groupId>org.powermock</groupId> 
-                <artifactId>powermock-module-junit4</artifactId> 
-                <version>${org.powermock.version}</version>
-            </dependency> 
-            <dependency> 
-                <groupId>org.powermock</groupId> 
-                <artifactId>powermock-api-mockito</artifactId> 
-                <version>${org.powermock.version}</version>
-            </dependency> 
             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant</artifactId>
@@ -120,7 +215,6 @@
             <!-- UT end -->
         </dependencies>
     </dependencyManagement>
-	
     <build>
         <pluginManagement>
             <plugins>
@@ -205,13 +299,7 @@
                     <artifactId>maven-antrun-plugin</artifactId>
                     <version>1.8</version>
                 </plugin>
-				<plugin>
-					<groupId>com.mycila</groupId>
-					<artifactId>license-maven-plugin</artifactId>
-				</plugin>
             </plugins>
         </pluginManagement>
     </build>   
-	
-	
 </project>