X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d%2Fpom.xml;h=9c62644d1d6708ff32e976293c09d96203cb02a1;hb=0b93745d3cdfa44fe623792966cd18df27a06fa5;hp=a59eb910aa69d152e28315f099d5bb594a63a413;hpb=d5862631acd4b2f1ad72e5cd8b8d865c3c5be68d;p=holmes%2Fengine-management.git

diff --git a/engine-d/pom.xml b/engine-d/pom.xml
index a59eb91..9c62644 100644
--- a/engine-d/pom.xml
+++ b/engine-d/pom.xml
@@ -15,14 +15,14 @@
   ~ limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.holmes.engine-management</groupId>
         <artifactId>holmes-engine-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>holmes-engine-d</artifactId>
@@ -31,6 +31,7 @@
 
     <properties>
         <drools.version>6.5.0.Final</drools.version>
+        <jetty.version>9.4.18.v20190429</jetty.version>
     </properties>
 
     <dependencies>
@@ -85,34 +86,20 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.holmes.dsa</groupId>
-            <artifactId>dmaap-dsa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpclient</artifactId>
-                </exclusion>
                 <exclusion>
-                    <groupId>org.onap.holmes.common</groupId>
-                    <artifactId>holmes-actions</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.onap.msb.java-sdk</groupId>
-                    <artifactId>msb-java-sdk</artifactId>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-server</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.onap.holmes.common</groupId>
             <artifactId>holmes-actions</artifactId>
@@ -220,22 +207,36 @@
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-server</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlet</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>9.4.11.v20180605</version>
+            <version>${jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
-            <version>9.4.11.v20180605</version>
+            <version>${jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>9.4.11.v20180605</version>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.14.1</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>
@@ -249,16 +250,6 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -356,14 +347,6 @@
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>
-                        <filter>
-                            <artifact>org.onap.holmes.dsa:dmaap-dsa</artifact>
-                            <excludes>
-                                <exclude>org/onap/holmes/common/**</exclude>
-                                <exclude>com/fasterxml/jackson/core/jackson-databind/**</exclude>
-                                <exclude>org/slf4j/**</exclude>
-                            </excludes>
-                        </filter>
                     </filters>
                 </configuration>
                 <executions>
@@ -375,9 +358,9 @@
                         <configuration>
                             <transformers>
                                 <transformer
-                                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                                 <transformer
-                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.onap.holmes.engine.EngineDActiveApp
                                     </mainClass>
                                 </transformer>
@@ -427,7 +410,8 @@
                                         <title>API Descriptions for Holmes Engine Management</title>
                                         <version>v1</version>
                                         <description>
-                                            This page shows all the APIs available in the Holmes engine management module.
+                                            This page shows all the APIs available in the Holmes engine management
+                                            module.
                                         </description>
                                         <termsOfService>
                                             http://www.github.com/kongchen/swagger-maven-plugin