This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new b2878d1 SOLR-15612: Remove unecessary https8 jetty module (#282)
b2878d1 is described below
commit b2878d1afcd5492b0d54f5053c0986847b17fc7e
Author: Houston Putman <[email protected]>
AuthorDate: Fri Sep 3 10:45:50 2021 -0400
SOLR-15612: Remove unecessary https8 jetty module (#282)
---
solr/CHANGES.txt | 2 ++
solr/bin/solr | 10 +-----
solr/bin/solr.cmd | 7 +----
solr/server/etc/jetty-https8.xml | 68 ----------------------------------------
solr/server/modules/https8.mod | 9 ------
5 files changed, 4 insertions(+), 92 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7ad0cd8..493e3bc 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -336,6 +336,8 @@ Other Changes
* SOLR-15111: Use JDK8 Base64 instead of own implementation (Andras Salamon
via janhoy)
+* SOLR-15612: Remove unecessary https8 jetty module (Houston Putman)
+
Bug Fixes
---------------------
* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor
that could lead to out of order execution
diff --git a/solr/bin/solr b/solr/bin/solr
index d861d4c..f312617 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -190,15 +190,7 @@ if [ -z "$SOLR_SSL_ENABLED" ]; then
fi
fi
if [ "$SOLR_SSL_ENABLED" == "true" ]; then
- if [[ "$JAVA_VER_NUM" -lt "9" ]] ; then
- echo >&2 "HTTP/2 + SSL is not support in Java 8. "
- echo >&2 "Configure Solr with HTTP/1.1 + SSL"
- SOLR_JETTY_CONFIG+=("--module=https8")
- else
- SOLR_JETTY_CONFIG+=("--module=https")
- fi
-
-
SOLR_JETTY_CONFIG+=("--lib=$DEFAULT_SERVER_DIR/solr-webapp/webapp/WEB-INF/lib/*")
+ SOLR_JETTY_CONFIG+=("--module=https"
"--lib=$DEFAULT_SERVER_DIR/solr-webapp/webapp/WEB-INF/lib/*")
SOLR_URL_SCHEME=https
if [ -n "$SOLR_SSL_KEY_STORE" ]; then
SOLR_SSL_OPTS+=" -Dsolr.jetty.keystore=$SOLR_SSL_KEY_STORE"
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index b035402..f19eea9 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -85,12 +85,7 @@ IF NOT DEFINED SOLR_SSL_ENABLED (
)
IF "%SOLR_SSL_ENABLED%"=="true" (
- set
"SOLR_JETTY_CONFIG=--lib="%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*""
- if !JAVA_MAJOR_VERSION! GEQ 9 (
- set "SOLR_JETTY_CONFIG=!SOLR_JETTY_CONFIG! --module=https"
- ) else (
- set "SOLR_JETTY_CONFIG=!SOLR_JETTY_CONFIG! --module=https8"
- )
+ set "SOLR_JETTY_CONFIG=--module=https
--lib="%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*""
set SOLR_URL_SCHEME=https
IF DEFINED SOLR_SSL_KEY_STORE (
set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS!
-Dsolr.jetty.keystore=%SOLR_SSL_KEY_STORE%"
diff --git a/solr/server/etc/jetty-https8.xml b/solr/server/etc/jetty-https8.xml
deleted file mode 100644
index f937852..0000000
--- a/solr/server/etc/jetty-https8.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
- -->
-
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN"
"http://www.eclipse.org/jetty/configure_9_0.dtd";>
-
-<!-- ============================================================= -->
-<!-- Configure a HTTPS connector. -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- and jetty-ssl.xml. -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!-- =========================================================== -->
- <!-- Add a HTTPS Connector. -->
- <!-- Configure an o.e.j.server.ServerConnector with connection -->
- <!-- factories for TLS (aka SSL) and HTTP to provide HTTPS. -->
- <!-- All accepted TLS connections are wired to a HTTP connection.-->
- <!-- -->
- <!-- Consult the javadoc of o.e.j.server.ServerConnector, -->
- <!-- o.e.j.server.SslConnectionFactory and -->
- <!-- o.e.j.server.HttpConnectionFactory for all configuration -->
- <!-- that may be set here. -->
- <!-- =========================================================== -->
- <Call id="httpsConnector" name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.ServerConnector">
- <Arg name="server"><Ref refid="Server" /></Arg>
- <Arg name="acceptors" type="int"><Property
name="solr.jetty.ssl.acceptors" default="-1"/></Arg>
- <Arg name="selectors" type="int"><Property
name="solr.jetty.ssl.selectors" default="-1"/></Arg>
- <Arg name="factories">
- <Array type="org.eclipse.jetty.server.ConnectionFactory">
- <Item>
- <New class="org.eclipse.jetty.server.SslConnectionFactory">
- <Arg name="next">http/1.1</Arg>
- <Arg name="sslContextFactory"><Ref
refid="sslContextFactory"/></Arg>
- </New>
- </Item>
- <Item>
- <New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Arg name="config"><Ref refid="sslHttpConfig"/></Arg>
- </New>
- </Item>
- </Array>
- </Arg>
- <Set name="host"><Property name="solr.jetty.host" default="127.0.0.1"
/></Set>
- <Set name="port"><Property name="solr.jetty.https.port" default="8983"
/></Set>
- <Set name="idleTimeout"><Property name="solr.jetty.https.timeout"
default="120000"/></Set>
- <Set name="acceptorPriorityDelta"><Property
name="solr.jetty.ssl.acceptorPriorityDelta" default="0"/></Set>
- <Set name="acceptQueueSize"><Property
name="solr.jetty.https.acceptQueueSize" default="0"/></Set>
- </New>
- </Arg>
- </Call>
-</Configure>
diff --git a/solr/server/modules/https8.mod b/solr/server/modules/https8.mod
deleted file mode 100644
index f799f6b..0000000
--- a/solr/server/modules/https8.mod
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Jetty HTTPS Connector
-#
-
-[depend]
-ssl
-
-[xml]
-etc/jetty-https8.xml
\ No newline at end of file
