Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Jetty12 + EE10 #2876

Draft
wants to merge 69 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
d1c5e55
Remove the hadoop-auth module from source
epugh Nov 2, 2024
af5a296
Remove build tooling integrations
epugh Nov 2, 2024
9b533ed
Remove from login screen.
epugh Nov 2, 2024
480f8f7
First path of removing related docs
epugh Nov 2, 2024
b5e6cff
Missed this core file
epugh Nov 2, 2024
72f4457
Light edits to get ref guide build to pass
epugh Nov 2, 2024
a86505e
Remove hadoop version
epugh Nov 2, 2024
b46987f
Precommit told me to regenerate versions.lock after removing hadoop-auth
epugh Nov 2, 2024
b7e33ca
Post 'checkUnusedConstraints' step
epugh Nov 2, 2024
e6ca759
Post updateLicenses step
epugh Nov 2, 2024
4bf733b
Remove no longer required libraries.
epugh Nov 2, 2024
9569b95
Respond to feedback
epugh Nov 5, 2024
fb3a0e0
One last eradication
epugh Nov 5, 2024
83a5d05
Proper way to change htaccess.
epugh Nov 5, 2024
760b0c9
Respond to warning from build
epugh Nov 6, 2024
029dc5b
Restore some permissions that are used by the HDFS module
epugh Nov 6, 2024
a2cba05
Back out change, we have another JIRA to cover this work.
epugh Nov 6, 2024
90316c3
Format fix
epugh Nov 6, 2024
59e28b0
Merge remote-tracking branch 'upstream/main' into SOLR-17540
epugh Nov 16, 2024
d8fd76d
update from main
epugh Nov 16, 2024
0ce563e
Merge remote-tracking branch 'apache/main' into fork/epugh/SOLR-17540
malliaridis Nov 16, 2024
1b8894e
Update locks and sync commons-text version downgrade
malliaridis Nov 16, 2024
70754d8
Remove unused dependencies from catalogs
malliaridis Nov 16, 2024
4409b27
Jetty12 + EE8 \u1F680
iamsanjay Nov 19, 2024
336f0d3
Merge remote-tracking branch 'upstream/main' into SOLR-17540
epugh Nov 20, 2024
0189004
Merge remote-tracking branch 'upstream/main' into SOLR-17540
epugh Nov 21, 2024
d8b3d00
Strip out kerberous support in Auth tool.
epugh Nov 22, 2024
90853fc
Update Jetty deps for s3mock
iamsanjay Nov 22, 2024
a718562
Merge branch 'main' into jetty12_ee8
iamsanjay Nov 22, 2024
9f8f9c5
Strip kerberos out of the hdfs module
epugh Nov 22, 2024
fd24abc
Remove Kerberos specific functions from HttpSolrClient
epugh Nov 22, 2024
30f4bd6
Doc cleanups
epugh Nov 22, 2024
5e1bc75
add missing licenses
iamsanjay Nov 22, 2024
dbc0a08
adding permissions to solr test policy
iamsanjay Nov 22, 2024
930d17f
Strip out Kerberos
epugh Nov 22, 2024
a3a8acc
useShortName was only implemented in Kerberos, so remove it.
epugh Nov 22, 2024
3ed7ddf
No longer support Kerberos for Solr on HDFS
epugh Nov 22, 2024
b42274e
Track that Kerberos has been removed
epugh Nov 23, 2024
7de517b
Align changes to both files to reflect each other.
epugh Nov 24, 2024
66d5d1d
Revert "No longer support Kerberos for Solr on HDFS"
epugh Nov 24, 2024
716ee09
restore removed docs that are still relevant
epugh Nov 24, 2024
5425d73
Restore permissions needed by hdfs and crossdc
epugh Nov 24, 2024
a1e67bc
Fix TestHttpServletRequestGetter
iamsanjay Nov 25, 2024
d3594a4
tidy
iamsanjay Nov 25, 2024
7bd7259
jetty xml changes
iamsanjay Nov 25, 2024
31e58a1
versions.lock updated
iamsanjay Nov 25, 2024
dfe667f
Merge remote-tracking branch 'upstream/main' into SOLR-17540
epugh Nov 27, 2024
a20d775
Simplify method signature
epugh Nov 27, 2024
69d5831
Update major-changes-in-solr-10.adoc
epugh Nov 27, 2024
6ca7d16
Track changes
epugh Nov 27, 2024
e3f30c6
Set DefaultSessionIdManager on Server
iamsanjay Nov 28, 2024
1413157
Merge branch 'main' into jetty12_ee8
iamsanjay Nov 28, 2024
9634c1c
removed extra logging annotation
iamsanjay Nov 28, 2024
fa2c41e
workaround for removing headers
iamsanjay Nov 28, 2024
8ba85f5
Backout changes to HDFS and kerberos security.
epugh Nov 30, 2024
52adc6f
Update usage to reflect Kerberos being gone.
epugh Dec 1, 2024
d4a905d
Attempt to clarify why we mention Kerberos and Hadoop Auth in comments
epugh Dec 2, 2024
ea09711
Remove dead logic. Tested locally using basic auth.
epugh Dec 2, 2024
bc20356
Highlight why we mention Kerberos....
epugh Dec 2, 2024
f0cfc42
merge
iamsanjay Dec 6, 2024
60308aa
adding versions.lock
iamsanjay Dec 6, 2024
35acabe
versions.lock
iamsanjay Dec 6, 2024
894b52f
ee10 switch
iamsanjay Dec 8, 2024
72c9cf9
Fix a metric test
iamsanjay Dec 9, 2024
be9b7fb
Merge main
iamsanjay Dec 9, 2024
62e1249
Fix JettyWebappTest
iamsanjay Dec 9, 2024
8fb561f
Merge main
iamsanjay Dec 10, 2024
c3c2f1c
Merge remove hadoop-auth changes
iamsanjay Dec 10, 2024
f7d900b
Upgrade to EE10
iamsanjay Dec 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion solr/core/src/java/org/apache/solr/api/V2HttpCall.java
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,12 @@ protected void executeCoreRequest(SolrQueryResponse rsp) {
// SolrCore counter
core.close();
core = null;
response.getHeaderNames().stream().forEach(name -> response.setHeader(name, null));
// Skip specific headers
// workaround for response.setHeader(name, null)
response.getHeaderNames().stream()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good for now IMO.

Longer term I'd love to see this code go away in favor of having the v2 API stuff get handled by its own servlet, but we're pretty far from that being workable for now. It is a little hacky in the interim though 😦

.filter(name -> !name.equalsIgnoreCase("Content-Length"))
.forEach(name -> response.setHeader(name, ""));
response.setContentLength(-1);
invokeJerseyRequest(
cores, null, cores.getJerseyApplicationHandler(), cores.getRequestHandlers(), rsp);
}
Expand Down
Loading