Skip to content

Migrate to Jakarta EE 10 / Jetty 12 / Karaf 4.5 #1893

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.

Sign up for GitHub

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

Draft
holgerfriedrich wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Migrate to Jakarta EE 10 / Jetty 12 / Karaf 4.5 #1893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
28b6571
Upgrade distro to Karaf 4.5 / Jetty 12
holgerfriedrich Apr 7, 2026
479da81
disable SNI
holgerfriedrich Jun 9, 2026
c5a9eab
Fix launch/app resolve for Jetty 12 / Jersey JAX-RS whiteboard migration
holgerfriedrich Aug 1, 2026
e39caf9
Seed default ConfigAdmin entry for the JAX-RS whiteboard runtime in l…
holgerfriedrich Aug 2, 2026
1bc5a39
Remove pax-web patching by openhab-util library
holgerfriedrich Aug 9, 2026
03793f4
upgrade to pax web 11.1.3
holgerfriedrich Aug 11, 2026
b9fbe55
dep upgrades
holgerfriedrich Aug 13, 2026
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
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,8 @@ xtend-gen/
**/.settings/org.eclipse.*
**/src/main/history/

launch/app/runtime/userdata
launch/app/runtime/userdata/*
!launch/app/runtime/userdata/.keep
!launch/app/runtime/userdata/config/
launch/app/runtime/userdata/config/*
!launch/app/runtime/userdata/config/JakartarsServletWhiteboardRuntimeComponent.config
37 changes: 1 addition & 36 deletions distributions/openhab/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,6 @@
</includes>
</resource>
</resources>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.6.3</version>
<dependencies>
<dependency>
<groupId>org.openhab.util</groupId>
<artifactId>pax-web-patch</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
Expand Down Expand Up @@ -214,10 +198,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>
Expand All @@ -241,25 +225,6 @@
<archiveTarGz>false</archiveTarGz>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<mainClass>org.openhab.patch.ClassPathUtilPatcher</mainClass>
<arguments>
<argument>${project.basedir}/target/assembly/system/org/ops4j/pax/web/pax-web-api</argument>
</arguments>
<includePluginDependencies>True</includePluginDependencies>
</configuration>
<executions>
<execution>
<goals>
<goal>java</goal>
</goals>
<phase>prepare-package</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down
3 changes: 0 additions & 3 deletions distributions/openhab/src/main/resources/bin/karaf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,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 \
Expand Down
3 changes: 0 additions & 3 deletions distributions/openhab/src/main/resources/bin/karaf.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,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 ^
Expand Down
13 changes: 8 additions & 5 deletions distributions/openhab/src/main/resources/runtime/etc/jetty.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions ...ns/openhab/src/main/resources/userdata/etc/JakartarsServletWhiteboardRuntimeComponent.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jersey.context.path=/
5 changes: 5 additions & 0 deletions distributions/openhab/src/main/resources/userdata/etc/org.ops4j.pax.web.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,8 @@ org.ops4j.pax.web.server.idleTimeout = 300000
# This is currently also in the setenv
#
#org.ops4j.pax.web.listening.addresses = 0.0.0.0

#
# SNI host check and requirement. This needs to be disabled to allow interfaces addresses besides localhost.
org.ops4j.pax.web.ssl.sniHostCheck = false
org.ops4j.pax.web.ssl.sniRequired = false
Loading
Loading