Update the Jetty & PG Dependencies Version

Change-Id: I485b34e023366a80d813cdb211838c5cbc07f9e3
Issue-ID: HOLMES-165
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/engine-d/pom.xml b/engine-d/pom.xml
index e02af64..f1a1f89 100644 (file)
--- a/engine-d/pom.xml
+++ b/engine-d/pom.xml
@@ -208,8 +208,35 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-server</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>9.4.11.v20180605</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-http</artifactId>
+            <version>9.4.11.v20180605</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>9.4.11.v20180605</version>
+        </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-jdbi</artifactId>

diff --git a/pom.xml b/pom.xml
index eee0bba..2523f78 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -45,9 +45,8 @@
         <excludesFile>**/*$*</excludesFile>
         <nexusproxy>https://nexus.open-o.org/content</nexusproxy>
 
-
         <stringtemplate.version>3.2.1</stringtemplate.version>
-        <postgres.jdbc.driver.version>42.1.1</postgres.jdbc.driver.version>
+        <postgres.jdbc.driver.version>42.2.5</postgres.jdbc.driver.version>
         <dropwizard.version>1.3.0</dropwizard.version>
         <swagger.version>1.5.3</swagger.version>
         <lombok.version>1.16.8</lombok.version>