Index: 3rdParty_sources/basiclti-util/pom.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7d9bfd67d479d215fd32fffe2c772b76c07494b5
--- 3rdParty_sources/basiclti-util/pom.xml (.../pom.xml) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ 3rdParty_sources/basiclti-util/pom.xml (.../pom.xml) (revision 7d9bfd67d479d215fd32fffe2c772b76c07494b5)
@@ -87,7 +87,7 @@
org.apache.httpcomponents
httpclient
- 4.2.2
+ 4.5.2
oauth.signpost
Index: 3rdParty_sources/basiclti-util/readme by LAMS.txt
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7d9bfd67d479d215fd32fffe2c772b76c07494b5
--- 3rdParty_sources/basiclti-util/readme by LAMS.txt (.../readme by LAMS.txt) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ 3rdParty_sources/basiclti-util/readme by LAMS.txt (.../readme by LAMS.txt) (revision 7d9bfd67d479d215fd32fffe2c772b76c07494b5)
@@ -3,4 +3,7 @@
* LDEV-4221: Some of the integrations complain about outcome call request format (when LAMS is used as LTI Tool Provider)
Which required changes to be done for org.imsglobal.pox.IMSPOXRequest.java
-* LDEV-4589: Added a few valid parameter names
\ No newline at end of file
+* LDEV-4589: Added a few valid parameter names
+
+* LDEV-4883 Fix HttpClient warning “Invalid expires attribute”
+ org.imsglobal.pox.IMSPOXRequest.java is customized as a result.
\ No newline at end of file
Index: 3rdParty_sources/basiclti-util/src/main/java/org/imsglobal/pox/IMSPOXRequest.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7d9bfd67d479d215fd32fffe2c772b76c07494b5
--- 3rdParty_sources/basiclti-util/src/main/java/org/imsglobal/pox/IMSPOXRequest.java (.../IMSPOXRequest.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ 3rdParty_sources/basiclti-util/src/main/java/org/imsglobal/pox/IMSPOXRequest.java (.../IMSPOXRequest.java) (revision 7d9bfd67d479d215fd32fffe2c772b76c07494b5)
@@ -21,29 +21,32 @@
import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathFactory;
-import net.oauth.OAuthAccessor;
-import net.oauth.OAuthConsumer;
-import net.oauth.OAuthMessage;
-import net.oauth.OAuthValidator;
-import net.oauth.SimpleOAuthValidator;
-import net.oauth.server.OAuthServlet;
-import net.oauth.signature.OAuthSignatureMethod;
-import oauth.signpost.commonshttp.CommonsHttpOAuthConsumer;
-import oauth.signpost.exception.OAuthException;
-import oauth.signpost.http.HttpParameters;
-
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
import org.apache.http.client.HttpResponseException;
+import org.apache.http.client.config.CookieSpecs;
+import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClients;
import org.imsglobal.lti.XMLMap;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import net.oauth.OAuthAccessor;
+import net.oauth.OAuthConsumer;
+import net.oauth.OAuthMessage;
+import net.oauth.OAuthValidator;
+import net.oauth.SimpleOAuthValidator;
+import net.oauth.server.OAuthServlet;
+import net.oauth.signature.OAuthSignatureMethod;
+import oauth.signpost.commonshttp.CommonsHttpOAuthConsumer;
+import oauth.signpost.exception.OAuthException;
+import oauth.signpost.http.HttpParameters;
+
public class IMSPOXRequest {
private final static Logger Log = Logger.getLogger(IMSPOXRequest.class .getName());
@@ -551,7 +554,11 @@
public static void sendReplaceResult(String url, String key, String secret, String sourcedid, String score, String resultData, Boolean isUrl) throws IOException, OAuthException, GeneralSecurityException {
HttpPost request = buildReplaceResult(url, key, secret, sourcedid, score, resultData, isUrl);
- DefaultHttpClient client = new DefaultHttpClient();
+ //*LAMS* replaced DefaultHttpClient with HttpClient
+ HttpClient client = HttpClients.custom()
+ .setDefaultRequestConfig(RequestConfig.custom()
+ .setCookieSpec(CookieSpecs.STANDARD).build())
+ .build(); // DefaultHttpClient client = new DefaultHttpClient();
HttpResponse response = client.execute(request);
if (response.getStatusLine().getStatusCode() >= 400) {
throw new HttpResponseException(response.getStatusLine().getStatusCode(),
Index: lams_build/lib/basiclti-util/basiclti-util-1.2.0.jar
===================================================================
diff -u -r5462a5e4f4762e4de1db63099864a5c0301a5b2e -r7d9bfd67d479d215fd32fffe2c772b76c07494b5
Binary files differ