Skip to content

Commit

Permalink
[TEAMMATES#11504] Update dependencies (TEAMMATES#11529)
Browse files Browse the repository at this point in the history
* Bump follow-redirects from 1.12.1 to 1.14.7 (TEAMMATES#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](follow-redirects/follow-redirects@v1.12.1...v1.14.7)

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

Signed-off-by: dependabot[bot] <[email protected]>

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

* [TEAMMATES#11504] Update Dependencies (TEAMMATES#11505)

* 11504 update dependencies

* Making dependency versions specific

* Log4shell

* Update solr dockerfile

* Update solr docs

* Fix infinite loop for login (TEAMMATES#11530)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Larry Diamond <[email protected]>
Co-authored-by: Zhang Ziqing <[email protected]>
  • Loading branch information
4 people authored Jan 21, 2022
1 parent 2a7aa0b commit 914d0e0
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions docs/search.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion solr/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM solr:8.8.1
FROM solr:8.11.1

COPY solr.sh solr.sh

Expand Down

0 comments on commit 914d0e0

Please sign in to comment.