This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new a6645ac67 [OPENMEETINGS-2780] junit, wicket-bootstrap, ical4j and
plugins; HTTPS for jetty is fixed
a6645ac67 is described below
commit a6645ac67e22f0935f51749dcc9be12246cee254
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Jul 2 16:19:48 2024 +0700
[OPENMEETINGS-2780] junit, wicket-bootstrap, ical4j and plugins; HTTPS for
jetty is fixed
---
openmeetings-web/src/main/java/module-info.java | 8 +--
openmeetings-web/src/test/jetty/jetty-http.xml | 60 ++++++++++----------
openmeetings-web/src/test/jetty/jetty-https.xml | 74 ++++++++++++-------------
openmeetings-web/src/test/jetty/jetty-ssl.xml | 39 +++++++------
pom.xml | 10 ++--
5 files changed, 98 insertions(+), 93 deletions(-)
diff --git a/openmeetings-web/src/main/java/module-info.java
b/openmeetings-web/src/main/java/module-info.java
index 7630d283b..b8f956224 100644
--- a/openmeetings-web/src/main/java/module-info.java
+++ b/openmeetings-web/src/main/java/module-info.java
@@ -54,10 +54,10 @@ module org.apache.openmeetings.web {
requires org.wicketstuff.urlfragment;
requires org.wicketstuff.jqplot;
requires org.wicketstuff.jqplot4j;
- requires wicketstuff.jquery.ui;
- requires wicketstuff.jquery.ui.calendar;
- requires wicketstuff.jquery.ui.core;
- requires wicketstuff.jquery.ui.plugins;
+ requires org.wicketstuff.jquery.ui;
+ requires org.wicketstuff.jquery.ui.calendar;
+ requires org.wicketstuff.jquery.ui.core;
+ requires org.wicketstuff.jquery.ui.plugins;
requires wicket.bootstrap.extensions;
requires wicket.bootstrap.core;
requires wicket.bootstrap.themes;
diff --git a/openmeetings-web/src/test/jetty/jetty-http.xml
b/openmeetings-web/src/test/jetty/jetty-http.xml
index 92ad3d1c3..686b8b441 100644
--- a/openmeetings-web/src/test/jetty/jetty-http.xml
+++ b/openmeetings-web/src/test/jetty/jetty-http.xml
@@ -22,33 +22,33 @@
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server">
- <!-- =========================================================== -->
- <!-- Add a HTTP Connector. -->
- <!-- Configure an o.e.j.server.ServerConnector with a single -->
- <!-- HttpConnectionFactory instance using the common httpConfig -->
- <!-- instance defined in jetty.xml -->
- <!-- -->
- <!-- Consult the javadoc of o.e.j.server.ServerConnector and -->
- <!-- o.e.j.server.HttpConnectionFactory for all configuration -->
- <!-- that may be set here. -->
- <!-- =========================================================== -->
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.ServerConnector">
- <Arg name="server"><Ref refid="Server" /></Arg>
- <Arg name="factories">
- <Array type="org.eclipse.jetty.server.ConnectionFactory">
- <Item>
- <New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Arg name="config"><Ref refid="httpConfig" /></Arg>
- </New>
- </Item>
- </Array>
- </Arg>
- <Set name="host"><Property name="jetty.host" /></Set>
- <Set name="port"><Property name="jetty.port" default="5080" /></Set>
- <Set name="idleTimeout"><Property name="http.timeout"
default="30000"/></Set>
- </New>
- </Arg>
- </Call>
-</Configure>
+ <!-- =========================================================== -->
+ <!-- Add a HTTP Connector. -->
+ <!-- Configure an o.e.j.server.ServerConnector with a single -->
+ <!-- HttpConnectionFactory instance using the common httpConfig -->
+ <!-- instance defined in jetty.xml -->
+ <!-- -->
+ <!-- Consult the javadoc of o.e.j.server.ServerConnector and -->
+ <!-- o.e.j.server.HttpConnectionFactory for all configuration -->
+ <!-- that may be set here. -->
+ <!-- =========================================================== -->
+ <Call name="addConnector">
+ <Arg>
+ <New class="org.eclipse.jetty.server.ServerConnector">
+ <Arg name="server"><Ref refid="Server" /></Arg>
+ <Arg name="factories">
+ <Array
type="org.eclipse.jetty.server.ConnectionFactory">
+ <Item>
+ <New
class="org.eclipse.jetty.server.HttpConnectionFactory">
+ <Arg
name="config"><Ref refid="httpConfig" /></Arg>
+ </New>
+ </Item>
+ </Array>
+ </Arg>
+ <Set name="host"><Property name="jetty.host"
/></Set>
+ <Set name="port"><Property name="jetty.port"
default="5080" /></Set>
+ <Set name="idleTimeout"><Property
name="http.timeout" default="30000" /></Set>
+ </New>
+ </Arg>
+ </Call>
+</Configure>
\ No newline at end of file
diff --git a/openmeetings-web/src/test/jetty/jetty-https.xml
b/openmeetings-web/src/test/jetty/jetty-https.xml
index 8718ac33b..01f980fe4 100644
--- a/openmeetings-web/src/test/jetty/jetty-https.xml
+++ b/openmeetings-web/src/test/jetty/jetty-https.xml
@@ -22,40 +22,40 @@
<!-- 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="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="jetty.host" /></Set>
- <Set name="port"><Property name="jetty.https.port" default="5443"
/></Set>
- <Set name="idleTimeout">30000</Set>
- </New>
- </Arg>
- </Call>
-</Configure>
+ <!-- =========================================================== -->
+ <!-- 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="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="jetty.host"
/></Set>
+ <Set name="port"><Property
name="jetty.https.port" default="5443" /></Set>
+ <Set name="idleTimeout">30000</Set>
+ </New>
+ </Arg>
+ </Call>
+</Configure>
\ No newline at end of file
diff --git a/openmeetings-web/src/test/jetty/jetty-ssl.xml
b/openmeetings-web/src/test/jetty/jetty-ssl.xml
index 2bcc55978..64a9472c6 100644
--- a/openmeetings-web/src/test/jetty/jetty-ssl.xml
+++ b/openmeetings-web/src/test/jetty/jetty-ssl.xml
@@ -22,20 +22,25 @@
<!-- and either jetty-https.xml or jetty-spdy.xml (but not both) -->
<!-- ============================================================= -->
<Configure id="sslContextFactory"
class="org.eclipse.jetty.util.ssl.SslContextFactory">
- <Set name="KeyStorePath"><Property
name="maven.project.build.directory.test-classes" default="." />/<Property
name="jetty.keystore" default="localhost.jks"/></Set>
- <Set name="KeyStorePassword"><Property name="jetty.keystore.password"
default="openmeetings"/></Set>
- <Set name="KeyManagerPassword"><Property name="jetty.keymanager.password"
default="openmeetings"/></Set>
- <Set name="EndpointIdentificationAlgorithm"></Set>
- <!-- =========================================================== -->
- <!-- Create a TLS specific HttpConfiguration based on the -->
- <!-- common HttpConfiguration defined in jetty.xml -->
- <!-- Add a SecureRequestCustomizer to extract certificate and -->
- <!-- session information -->
- <!-- =========================================================== -->
- <New id="sslHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
- <Arg><Ref refid="httpConfig"/></Arg>
- <Call name="addCustomizer">
- <Arg><New
class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>
- </Call>
- </New>
-</Configure>
+ <Set name="KeyStorePath"><Property
name="maven.project.build.directory.test-classes" default="." />
+ /<Property name="jetty.keystore" default="localhost.jks"
/></Set>
+ <Set name="KeyStorePassword"><Property name="jetty.keystore.password"
default="openmeetings" /></Set>
+ <Set name="KeyManagerPassword"><Property
name="jetty.keymanager.password" default="openmeetings" /></Set>
+ <Set name="EndpointIdentificationAlgorithm"></Set>
+ <!-- =========================================================== -->
+ <!-- Create a TLS specific HttpConfiguration based on the -->
+ <!-- common HttpConfiguration defined in jetty.xml -->
+ <!-- Add a SecureRequestCustomizer to extract certificate and -->
+ <!-- session information -->
+ <!-- =========================================================== -->
+ <New id="sslHttpConfig"
class="org.eclipse.jetty.server.HttpConfiguration">
+ <Arg><Ref refid="httpConfig" /></Arg>
+ <Call name="addCustomizer">
+ <Arg>
+ <New
class="org.eclipse.jetty.server.SecureRequestCustomizer">
+ <Set name="SniHostCheck"><Property
name="jetty.ssl.sniHostCheck" default="false" /></Set>
+ </New>
+ </Arg>
+ </Call>
+ </New>
+</Configure>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2dcf22425..124290f08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
<version.maven-enforcer-plugin>3.5.0</version.maven-enforcer-plugin>
<version.maven-source-plugin>3.3.1</version.maven-source-plugin>
<version.maven-compiler-plugin>3.13.0</version.maven-compiler-plugin>
-
<version.maven-project-info-reports-plugin>3.6.0</version.maven-project-info-reports-plugin>
+
<version.maven-project-info-reports-plugin>3.6.1</version.maven-project-info-reports-plugin>
<version.maven-jar-plugin>3.4.2</version.maven-jar-plugin>
<version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
<version.maven-dependency-plugin>3.7.1</version.maven-dependency-plugin>
@@ -82,14 +82,14 @@
<plexus-utils.version>3.5.1</plexus-utils.version>
<!-- dependency versions -->
- <junit.version>5.10.2</junit.version>
+ <junit.version>5.10.3</junit.version>
<wicket.version>10.1.0</wicket.version>
<wicketstuff.version>10.2.0-SNAPSHOT</wicketstuff.version>
- <wicket-bootstrap.version>7.0.5</wicket-bootstrap.version>
+
<wicket-bootstrap.version>7.0.7-SNAPSHOT</wicket-bootstrap.version>
<spring.version>6.1.10</spring.version>
<tomcat.version>10.1.25</tomcat.version>
<jetty.version>11.0.21</jetty.version>
- <ical4j.version>4.0.0</ical4j.version>
+ <ical4j.version>4.0.1</ical4j.version>
<cxf.version>4.0.4</cxf.version>
<io.prometheus.version>1.3.1</io.prometheus.version>
<aspectjtools.version>1.9.22.1</aspectjtools.version>
@@ -1540,7 +1540,7 @@
<contextPath>/openmeetings</contextPath>
<descriptor>${project.basedir}/src/test/jetty/web.xml</descriptor>
</webApp>
-
<jettyXml>${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml</jettyXml>
+
<jettyXmls>${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml</jettyXmls>
</configuration>
</plugin>
<plugin>
