Upgrade distro to Karaf 4.5 / Jetty 12

* remove java2 endorsement libs
* adapt jetty config
* jakarta servlet config
* disable sni

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

Author: holgerfriedrich

distributions/openhab/pom.xml

@@ -92,7 +92,7 @@
             <dependency>
               <groupId>org.openhab.util</groupId>
               <artifactId>pax-web-patch</artifactId>
-              <version>1.0.0</version>
+              <version>1.0.1</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -214,10 +214,10 @@
           <javase>${oh.java.version}</javase>
           <installedFeatures>
             <feature>wrapper</feature>
-            <feature>wrap</feature>
           </installedFeatures>
           <startupFeatures>
             <feature>eventadmin</feature>
+            <feature>wrap</feature>
           </startupFeatures>
           <bootFeatures>
             <feature>jaas</feature>

distributions/openhab/src/main/resources/bin/karaf

@@ -303,9 +303,6 @@ run() {
             if [ "${VERSION}" -gt "8" ]; then
                 ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
                     --add-reads=java.xml=java.logging \
-                    --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED \
-                    --patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.11.jar" \
-                    --patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.11.jar" \
                     --add-opens java.base/java.security=ALL-UNNAMED \
                     --add-opens java.base/java.net=ALL-UNNAMED \
                     --add-opens java.base/java.lang=ALL-UNNAMED \

distributions/openhab/src/main/resources/bin/karaf.bat

@@ -416,9 +416,6 @@ if "%KARAF_PROFILER%" == "" goto :RUN
         if %JAVA_VERSION% GTR 8 (
             "%JAVA%" %JAVA_OPTS% %OPTS% ^
                 --add-reads=java.xml=java.logging ^
-                --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED ^
-                --patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.11.jar" ^
-                --patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.11.jar" ^
                 --add-opens java.base/java.security=ALL-UNNAMED ^
                 --add-opens java.base/java.net=ALL-UNNAMED ^
                 --add-opens java.base/java.lang=ALL-UNNAMED ^

distributions/openhab/src/main/resources/runtime/etc/jetty.xml

@@ -23,7 +23,7 @@
 					<Call name="addRule">
 						<Arg>
 							<New class="org.eclipse.jetty.rewrite.handler.ForwardedSchemeHeaderRule">
-								<Set name="header">X-Forwarded-Proto</Set>
+								<Set name="headerName">X-Forwarded-Proto</Set>
 								<Set name="headerValue">https</Set> <!-- if this is unset, any value will match against the rule -->
 								<Set name="scheme">https</Set>
 							</New>
@@ -32,7 +32,7 @@
 					<Call name="addRule">
 						<Arg>
 							<New class="org.eclipse.jetty.rewrite.handler.ForwardedSchemeHeaderRule">
-								<Set name="header">X-Forwarded-Proto</Set>
+								<Set name="headerName">X-Forwarded-Proto</Set>
 								<Set name="headerValue">http</Set> <!-- if this is unset, any value will match against the rule -->
 								<Set name="scheme">http</Set>
 							</New>
@@ -49,8 +49,8 @@
 					<Set name="contextPath">/static</Set>
 					<Set name="handler">
 						<New class="org.eclipse.jetty.server.handler.ResourceHandler">
-							<Set name="resourceBase"><SystemProperty name="openhab.conf" />/html</Set>
-							<Set name="directoriesListed">false</Set>
+							<Set name="baseResourceAsString"><SystemProperty name="openhab.conf" />/html</Set>
+							<Set name="dirAllowed">false</Set>
 							<Set name="cacheControl">max-age=31536000</Set>
 						</New>
 					</Set>
@@ -100,7 +100,10 @@
 
 		<Call name="addCustomizer">
 			<Arg>
-				<New class="org.eclipse.jetty.server.SecureRequestCustomizer" />
+				<New class="org.eclipse.jetty.server.SecureRequestCustomizer">
+					<Set name="sniRequired">false</Set>
+					<Set name="sniHostCheck">false</Set>
+				</New>
 			</Arg>
 		</Call>
 	</New>

distributions/openhab/src/main/resources/userdata/etc/JakartarsServletWhiteboardRuntimeComponent.cfg

@@ -0,0 +1 @@
+jersey.context.path=/

pom.xml

@@ -61,7 +61,7 @@
     <ohc.version>5.2.0-SNAPSHOT</ohc.version>
     <oha.version>5.2.0-SNAPSHOT</oha.version>
 
-    <karaf.version>4.4.11</karaf.version>
+    <karaf.version>4.5.0-SNAPSHOT</karaf.version>
 
     <oh.java.version>21</oh.java.version>
     <maven.compiler.release>${oh.java.version}</maven.compiler.release>