Revert httpclient jar version change.

- Add explicit dependency to version 4.5 instead

Change-Id: Ic4491a8e0d5fe4baaf902c02c5df21b6130e23dc
Issue-ID: AAI-192
Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>

diff --git a/pom.xml b/pom.xml
index 88e6804..9616a2f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -161,6 +161,11 @@
                    <artifactId>sdc-distribution-client</artifactId>
                    <version>1.1.32-SNAPSHOT</version>
                </dependency>
+               <dependency>
+                       <groupId>org.apache.httpcomponents</groupId>
+                       <artifactId>httpclient</artifactId>
+                       <version>4.5</version>
+               </dependency>
                <dependency>
                        <groupId>org.json</groupId>
                        <artifactId>json</artifactId>

diff --git a/src/main/config/ajsc-jetty.xml b/src/main/config/ajsc-jetty.xml
index 3b1a79e..f0f1e1f 100644 (file)
--- a/src/main/config/ajsc-jetty.xml
+++ b/src/main/config/ajsc-jetty.xml
@@ -1,90 +1,90 @@
-<?xml version="1.0"  encoding="UTF-8"?>\r
-<!--\r
+<?xml version="1.0"  encoding="UTF-8"?>
+<!--
   ============LICENSE_START=======================================================
   MODEL LOADER SERVICE
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");\r
-  you may not use this file except in compliance with the License.\r
-  You may obtain a copy of the License at\r
-  \r
-       http://www.apache.org/licenses/LICENSE-2.0\r
-  \r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
   limitations under the License.
-  ============LICENSE_END=========================================================\r
-  -->\r
-\r
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">\r
-<Configure id="ajsc-server" class="org.eclipse.jetty.server.Server">\r
-       <!-- DO NOT REMOVE!!!! This is setting up the AJSC Context -->\r
-       <New id="ajscContext" class="org.eclipse.jetty.webapp.WebAppContext">\r
-               <Set name="contextPath"><SystemProperty name="AJSC_CONTEXT_PATH" /></Set>\r
-               <Set name="extractWAR">true</Set>\r
-               <Set name="tempDirectory"><SystemProperty name="AJSC_TEMP_DIR" /></Set>\r
-               <Set name="war"><SystemProperty name="AJSC_WAR_PATH" /></Set>\r
-               <Set name="descriptor"><SystemProperty name="AJSC_HOME" />/etc/runner-web.xml</Set>\r
-               <Set name="overrideDescriptor"><SystemProperty name="AJSC_HOME" />/etc/ajsc-override-web.xml</Set>\r
-               <Set name="throwUnavailableOnStartupException">true</Set>\r
-               <Set name="servletHandler">\r
-                       <New class="org.eclipse.jetty.servlet.ServletHandler">\r
-                               <Set name="startWithUnavailable">false</Set>\r
-                       </New>\r
-               </Set>\r
-               <Set name="extraClasspath"><SystemProperty name="AJSC_HOME" />/extJars/httpclient-4.4.1.jar,<SystemProperty name="AJSC_HOME" />/extJars/httpcore-4.4.1.jar,<SystemProperty name="AJSC_HOME" />/extJars/json-20131018.jar</Set>\r
-       </New>\r
-       \r
-       <Set name="handler">\r
-               <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection">\r
-                       <Set name="Handlers">\r
-                               <Array type="org.eclipse.jetty.webapp.WebAppContext">\r
-                                       <Item>\r
-                                               <Ref refid="ajscContext" />\r
-                                       </Item>\r
-                               </Array>\r
-                       </Set>\r
-               </New>\r
-       </Set>\r
-       \r
-       <Call name="addBean">\r
-               <Arg>\r
-                       <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">\r
-                               <Set name="contexts">\r
-                                       <Ref refid="Contexts" />\r
-                               </Set>\r
-                               <Call id="extAppHotDeployProvider" name="addAppProvider">\r
-                                       <Arg>\r
-                                               <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">\r
-                                                       <Set name="monitoredDirName"><SystemProperty name="AJSC_HOME" />/extApps</Set>\r
-                                                       <Set name="scanInterval">10</Set>\r
-                                                       <Set name="extractWars">true</Set>\r
-                                               </New>\r
-                                       </Arg>\r
-                               </Call>\r
-                       </New>\r
-               </Arg>\r
-       </Call>\r
-       \r
-       <Call name="addConnector">\r
-               <Arg>\r
-                       <New class="org.eclipse.jetty.server.ServerConnector">\r
-                               <Arg name="server">\r
-                                       <Ref refid="ajsc-server" />\r
-                               </Arg>\r
-                               <Set name="port"><SystemProperty name="AJSC_HTTP_PORT" default="80" /></Set>\r
-                       </New>\r
-               </Arg>\r
-       </Call>\r
-       \r
-       <Get name="ThreadPool">\r
-               <Set name="minThreads"><SystemProperty name="AJSC_JETTY_ThreadCount_MIN" /></Set>\r
-               <Set name="maxThreads"><SystemProperty name="AJSC_JETTY_ThreadCount_MAX" /></Set>\r
-               <Set name="idleTimeout"><SystemProperty name="AJSC_JETTY_IDLETIME_MAX" /></Set>\r
-               <Set name="detailedDump">false</Set>\r
-       </Get>\r
-       \r
-</Configure>\r
+  ============LICENSE_END=========================================================
+  -->
+
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<Configure id="ajsc-server" class="org.eclipse.jetty.server.Server">
+       <!-- DO NOT REMOVE!!!! This is setting up the AJSC Context -->
+       <New id="ajscContext" class="org.eclipse.jetty.webapp.WebAppContext">
+               <Set name="contextPath"><SystemProperty name="AJSC_CONTEXT_PATH" /></Set>
+               <Set name="extractWAR">true</Set>
+               <Set name="tempDirectory"><SystemProperty name="AJSC_TEMP_DIR" /></Set>
+               <Set name="war"><SystemProperty name="AJSC_WAR_PATH" /></Set>
+               <Set name="descriptor"><SystemProperty name="AJSC_HOME" />/etc/runner-web.xml</Set>
+               <Set name="overrideDescriptor"><SystemProperty name="AJSC_HOME" />/etc/ajsc-override-web.xml</Set>
+               <Set name="throwUnavailableOnStartupException">true</Set>
+               <Set name="servletHandler">
+                       <New class="org.eclipse.jetty.servlet.ServletHandler">
+                               <Set name="startWithUnavailable">false</Set>
+                       </New>
+               </Set>
+               <Set name="extraClasspath"><SystemProperty name="AJSC_HOME" />/extJars/httpclient-4.5.jar,<SystemProperty name="AJSC_HOME" />/extJars/httpcore-4.4.1.jar,<SystemProperty name="AJSC_HOME" />/extJars/json-20131018.jar</Set>\r
+       </New>
+       
+       <Set name="handler">
+               <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
+                       <Set name="Handlers">
+                               <Array type="org.eclipse.jetty.webapp.WebAppContext">
+                                       <Item>
+                                               <Ref refid="ajscContext" />
+                                       </Item>
+                               </Array>
+                       </Set>
+               </New>
+       </Set>
+       
+       <Call name="addBean">
+               <Arg>
+                       <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
+                               <Set name="contexts">
+                                       <Ref refid="Contexts" />
+                               </Set>
+                               <Call id="extAppHotDeployProvider" name="addAppProvider">
+                                       <Arg>
+                                               <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
+                                                       <Set name="monitoredDirName"><SystemProperty name="AJSC_HOME" />/extApps</Set>
+                                                       <Set name="scanInterval">10</Set>
+                                                       <Set name="extractWars">true</Set>
+                                               </New>
+                                       </Arg>
+                               </Call>
+                       </New>
+               </Arg>
+       </Call>
+       
+       <Call name="addConnector">
+               <Arg>
+                       <New class="org.eclipse.jetty.server.ServerConnector">
+                               <Arg name="server">
+                                       <Ref refid="ajsc-server" />
+                               </Arg>
+                               <Set name="port"><SystemProperty name="AJSC_HTTP_PORT" default="80" /></Set>
+                       </New>
+               </Arg>
+       </Call>
+       
+       <Get name="ThreadPool">
+               <Set name="minThreads"><SystemProperty name="AJSC_JETTY_ThreadCount_MIN" /></Set>
+               <Set name="maxThreads"><SystemProperty name="AJSC_JETTY_ThreadCount_MAX" /></Set>
+               <Set name="idleTimeout"><SystemProperty name="AJSC_JETTY_IDLETIME_MAX" /></Set>
+               <Set name="detailedDump">false</Set>
+       </Get>
+       
+</Configure>