From 914d0e065de1352ffbbcf37ffb92b4e966c91477 Mon Sep 17 00:00:00 2001
From: Ahmed Bahajjaj <42177597+madanalogy@users.noreply.github.com>
Date: Fri, 21 Jan 2022 09:47:22 +0800
Subject: [PATCH] [#11504] Update dependencies (#11529)

* Bump follow-redirects from 1.12.1 to 1.14.7 (#11525)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.12.1 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.12.1...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ahmed Bahajjaj <42177597+madanalogy@users.noreply.github.com>

* [#11504] Update Dependencies (#11505)

* 11504 update dependencies

* Making dependency versions specific

* Log4shell

* Update solr dockerfile

* Update solr docs

* Fix infinite loop for login (#11530)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Larry Diamond <1066589+larrydiamond@users.noreply.github.com>
Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com>
---
 build.gradle      | 4 ++--
 docs/search.md    | 6 +++---
 package-lock.json | 6 +++---
 solr/Dockerfile   | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index a4f4444d729..b24c8b754d3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,14 +56,14 @@ dependencies {
     implementation("com.google.code.gson:gson:2.8.6")
     implementation("com.google.guava:guava:30.1.1-jre")
     implementation(objectify)
-    implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20200615.1")
+    implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20211018.2")
     implementation("com.mailjet:mailjet-client:4.5.0")
     implementation("com.sendgrid:sendgrid-java:4.6.0")
     implementation("com.sun.jersey:jersey-client:1.19.4")
     implementation("com.sun.jersey:jersey-core:1.19.4")
     implementation("com.sun.jersey.contribs:jersey-multipart:1.19.4")
     implementation("javax.servlet:javax.servlet-api:3.1.0")
-    implementation("org.apache.solr:solr-solrj:8.8.1")
+    implementation("org.apache.solr:solr-solrj:8.11.1")
     implementation("org.eclipse.jetty:jetty-server:9.4.39.v20210325")
     implementation("org.eclipse.jetty:jetty-webapp:9.4.39.v20210325")
     implementation("org.eclipse.jetty:jetty-annotations:9.4.39.v20210325")
diff --git a/docs/search.md b/docs/search.md
index 38b38600274..dc83a2c1a1a 100644
--- a/docs/search.md
+++ b/docs/search.md
@@ -1,10 +1,10 @@
 # Full-text Search Feature Support
 
-We use [Apache Solr](https://solr.apache.org/guide/8_8/) to support full-text search features required by the application, such as searching for students and instructors.
+We use [Apache Solr](https://solr.apache.org/guide/8_11/) to support full-text search features required by the application, such as searching for students and instructors.
 
 Search service is optional for local development. It is perfectly fine to skip the setup described in this page if you are not working on search features.
 
-This document will assume Solr version `8.8.1`.
+This document will assume Solr version `8.11.1`.
 
 ## Setting up Solr using Docker
 
@@ -21,7 +21,7 @@ docker-compose run -p 8983:8983 solr
 
 You may notice that the setup steps in this method are a manual version of the Docker method.
 
-1. Download and install Solr by following [this guide](https://solr.apache.org/guide/8_8/installing-solr.html#installing-solr).
+1. Download and install Solr by following [this guide](https://solr.apache.org/guide/8_11/installing-solr.html#installing-solr).
 1. To start the Solr server, navigate to the Solr root directory and run the following command:
    ```sh
    # The server listens to port 8983 by default.
diff --git a/package-lock.json b/package-lock.json
index a449ec90ffe..ccaf92e2b2d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6567,9 +6567,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz",
-      "integrity": "sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg==",
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
+      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
       "dev": true
     },
     "for-in": {
diff --git a/solr/Dockerfile b/solr/Dockerfile
index 7be4f0aba22..55afd90b43c 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -1,4 +1,4 @@
-FROM solr:8.8.1
+FROM solr:8.11.1
 
 COPY solr.sh solr.sh