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 79b71bcb3 [OPENMEETINGS-2824] logback and surefire
79b71bcb3 is described below
commit 79b71bcb39f89f9be9563e54190653b04ad9441d
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Mon Oct 26 13:25:06 2026 +0700
[OPENMEETINGS-2824] logback and surefire
---
LICENSE | 77 +++++++++++-----------
.../openmeetings/ws/TestCalendarService.java | 3 +-
pom.xml | 6 +-
3 files changed, 44 insertions(+), 42 deletions(-)
diff --git a/LICENSE b/LICENSE
index 4e3a958f0..09963ab13 100644
--- a/LICENSE
+++ b/LICENSE
@@ -267,7 +267,7 @@ conditions of the following licenses.
Eclipse Public License v2.0
* Angus Mail Provider (org.eclipse.angus:angus-mail:2.0.5 -
http://eclipse-ee4j.github.io/angus-mail/angus-mail)
- * AspectJ Tools (Compiler) (org.aspectj:aspectjtools:1.9.25.1 -
https://www.eclipse.org/aspectj/)
+ * AspectJ Tools (Compiler) (org.aspectj:aspectjtools:1.9.26 -
https://www.eclipse.org/aspectj/)
* jakarta.transaction API
(jakarta.transaction:jakarta.transaction-api:2.0.1 -
https://projects.eclipse.org/projects/ee4j.jta)
* Jakarta Annotations API
(jakarta.annotation:jakarta.annotation-api:3.0.0 -
https://projects.eclipse.org/projects/ee4j.ca)
* Jakarta Mail API (jakarta.mail:jakarta.mail-api:2.1.5 -
https://projects.eclipse.org/projects/ee4j/jakarta.mail-api)
@@ -276,8 +276,8 @@ conditions of the following licenses.
* Jakarta RESTful WS API (jakarta.ws.rs:jakarta.ws.rs-api:4.0.0 -
https://github.com/jakartaee/rest/jakarta.ws.rs-api)
* JUnit Jupiter API (org.junit.jupiter:junit-jupiter-api:6.1.3 -
https://junit.org/)
* JUnit Platform Commons
(org.junit.platform:junit-platform-commons:6.1.3 - https://junit.org/)
- * Logback Classic Module (ch.qos.logback:logback-classic:1.6.5 -
http://logback.qos.ch/logback-classic)
- * Logback Core Module (ch.qos.logback:logback-core:1.6.5 -
http://logback.qos.ch/logback-core)
+ * Logback Classic Module (ch.qos.logback:logback-classic:1.6.6 -
http://logback.qos.ch/logback-classic)
+ * Logback Core Module (ch.qos.logback:logback-core:1.6.6 -
http://logback.qos.ch/logback-core)
iCal4j - License
@@ -482,14 +482,15 @@ conditions of the following licenses.
* jqplot4java (org.wicketstuff:jqplot4java:10.12.0-20261014.151453-33
- http://maven.apache.org)
* JqPlot Plugin Integration
(org.wicketstuff:jqplot:10.12.0-20261014.151512-28 -
http://wicketstuff.org/jqplot-parent/jqplot)
* JSpecify annotations (org.jspecify:jspecify:1.0.0 -
http://jspecify.org/)
+ * JSpecify annotations (org.jspecify:jspecify:1.0.1 -
https://jspecify.dev/)
* jwarc (org.netpreserve:jwarc:0.37.0 - https://github.com/iipc/jwarc)
* Kurento Client (org.kurento:kurento-client:7.3.0 -
https://kurento.openvidu.io/)
* Kurento Common utils (org.kurento:kurento-commons:7.3.0 -
https://kurento.openvidu.io/kurento-commons/)
* Kurento JSON-RPC Client (org.kurento:kurento-jsonrpc-client:7.3.0 -
https://kurento.openvidu.io/kurento-jsonrpc/kurento-jsonrpc-client/)
* library (de.agilecoders.wicket.webjars:wicket-webjars:4.0.15 -
https://github.com/l0rdn1kk0n/wicket-webjars/wicket-webjars)
* Log4j Implemented Over SLF4J (org.slf4j:log4j-over-slf4j:2.0.20 -
http://www.slf4j.org)
- * micrometer-commons (io.micrometer:micrometer-commons:1.16.7 -
https://github.com/micrometer-metrics/micrometer-commercial)
- * micrometer-observation (io.micrometer:micrometer-observation:1.16.7
- https://github.com/micrometer-metrics/micrometer-commercial)
+ * micrometer-commons (io.micrometer:micrometer-commons:1.16.8 -
https://github.com/micrometer-metrics/micrometer)
+ * micrometer-observation (io.micrometer:micrometer-observation:1.16.8
- https://github.com/micrometer-metrics/micrometer)
* Netty/Buffer (io.netty:netty-buffer:4.2.7.Final -
https://netty.io/netty-buffer/)
* Netty/Codec/Base (io.netty:netty-codec-base:4.2.7.Final -
https://netty.io/netty-codec-base/)
* Netty/Codec/Compression
(io.netty:netty-codec-compression:4.2.7.Final -
https://netty.io/netty-codec-compression/)
@@ -519,54 +520,54 @@ conditions of the following licenses.
* parso (com.epam:parso:2.0.14 - https://github.com/epam/parso)
* PDFBox JBIG2 ImageIO plugin (org.apache.pdfbox:jbig2-imageio:3.0.5 -
https://www.apache.org/jbig2-imageio/)
* picocli (info.picocli:picocli:4.7.7 - https://picocli.info)
- * Prometheus Metrics Annotations
(io.prometheus:prometheus-metrics-annotations:1.9.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-annotations)
- * Prometheus Metrics Config
(io.prometheus:prometheus-metrics-config:1.9.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-config)
- * Prometheus Metrics Core (io.prometheus:prometheus-metrics-core:1.9.0
- http://github.com/prometheus/client_java/client_java/prometheus-metrics-core)
- * Prometheus Metrics Exporter - Common
(io.prometheus:prometheus-metrics-exporter-common:1.9.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exporter-common)
- * Prometheus Metrics Exporter - Servlet Jakarta
(io.prometheus:prometheus-metrics-exporter-servlet-jakarta:1.9.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exporter-servlet-jakarta)
- * Prometheus Metrics Exposition Formats
(io.prometheus:prometheus-metrics-exposition-formats:1.9.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exposition-formats)
- * Prometheus Metrics Exposition Text Formats
(io.prometheus:prometheus-metrics-exposition-textformats:1.9.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exposition-textformats)
- * Prometheus Metrics Model
(io.prometheus:prometheus-metrics-model:1.9.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-model)
- * Prometheus Metrics Tracer Common
(io.prometheus:prometheus-metrics-tracer-common:1.9.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-common)
- * Prometheus Metrics Tracer Initializer
(io.prometheus:prometheus-metrics-tracer-initializer:1.9.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer)
- * Prometheus Metrics Tracer OpenTelemetry
(io.prometheus:prometheus-metrics-tracer-otel:1.9.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel)
- * Prometheus Metrics Tracer OpenTelemetry Agent
(io.prometheus:prometheus-metrics-tracer-otel-agent:1.9.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent)
+ * Prometheus Metrics Annotations
(io.prometheus:prometheus-metrics-annotations:1.10.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-annotations)
+ * Prometheus Metrics Config
(io.prometheus:prometheus-metrics-config:1.10.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-config)
+ * Prometheus Metrics Core
(io.prometheus:prometheus-metrics-core:1.10.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-core)
+ * Prometheus Metrics Exporter - Common
(io.prometheus:prometheus-metrics-exporter-common:1.10.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exporter-common)
+ * Prometheus Metrics Exporter - Servlet Jakarta
(io.prometheus:prometheus-metrics-exporter-servlet-jakarta:1.10.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exporter-servlet-jakarta)
+ * Prometheus Metrics Exposition Formats
(io.prometheus:prometheus-metrics-exposition-formats:1.10.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exposition-formats)
+ * Prometheus Metrics Exposition Text Formats
(io.prometheus:prometheus-metrics-exposition-textformats:1.10.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-exposition-textformats)
+ * Prometheus Metrics Model
(io.prometheus:prometheus-metrics-model:1.10.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-model)
+ * Prometheus Metrics Tracer Common
(io.prometheus:prometheus-metrics-tracer-common:1.10.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-common)
+ * Prometheus Metrics Tracer Initializer
(io.prometheus:prometheus-metrics-tracer-initializer:1.10.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer)
+ * Prometheus Metrics Tracer OpenTelemetry
(io.prometheus:prometheus-metrics-tracer-otel:1.10.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel)
+ * Prometheus Metrics Tracer OpenTelemetry Agent
(io.prometheus:prometheus-metrics-tracer-otel-agent:1.10.0 -
http://github.com/prometheus/client_java/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent)
* quartz (org.quartz-scheduler:quartz:2.5.2 -
https://www.quartz-scheduler.org/)
* Reflections (org.reflections:reflections:0.10.2 -
http://github.com/ronmamo/reflections)
* rome (com.rometools:rome:2.1.0 - http://rometools.com/rome)
* rome-utils (com.rometools:rome-utils:2.1.0 -
http://rometools.com/rome-utils)
* SparseBitSet (com.zaxxer:SparseBitSet:1.3 -
https://github.com/brettwooldridge/SparseBitSet)
- * Spring AOP (org.springframework:spring-aop:7.0.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Beans (org.springframework:spring-beans:7.0.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Context (org.springframework:spring-context:7.0.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Context Support
(org.springframework:spring-context-support:7.0.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Core (org.springframework:spring-core:7.0.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Expression Language (SpEL)
(org.springframework:spring-expression:7.0.9 -
https://github.com/spring-projects/spring-framework)
- * Spring JDBC (org.springframework:spring-jdbc:7.0.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Object/Relational Mapping
(org.springframework:spring-orm:7.0.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Transaction (org.springframework:spring-tx:7.0.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Web (org.springframework:spring-web:7.0.9 -
https://github.com/spring-projects/spring-framework)
- * Spring Web MVC (org.springframework:spring-webmvc:7.0.9 -
https://github.com/spring-projects/spring-framework)
+ * Spring AOP (org.springframework:spring-aop:7.0.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Beans (org.springframework:spring-beans:7.0.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Context (org.springframework:spring-context:7.0.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Context Support
(org.springframework:spring-context-support:7.0.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Core (org.springframework:spring-core:7.0.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Expression Language (SpEL)
(org.springframework:spring-expression:7.0.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring JDBC (org.springframework:spring-jdbc:7.0.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Object/Relational Mapping
(org.springframework:spring-orm:7.0.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Transaction (org.springframework:spring-tx:7.0.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Web (org.springframework:spring-web:7.0.10 -
https://github.com/spring-projects/spring-framework)
+ * Spring Web MVC (org.springframework:spring-webmvc:7.0.10 -
https://github.com/spring-projects/spring-framework)
* swagger-annotations (io.swagger.core.v3:swagger-annotations:2.2.55 -
https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
* tomcat (org.apache.tomcat:tomcat:11.0.27 -
https://tomcat.apache.org/)
* UNO interface library (org.openoffice:unoil:4.1.2 -
https://wiki.openoffice.org/wiki/Uno)
- * Wicket Auth Roles
(org.apache.wicket:wicket-auth-roles:10.12.0-20261016.202807-8 -
http://wicket.apache.org/wicket-auth-roles)
- * Wicket Core
(org.apache.wicket:wicket-core:10.12.0-20261016.202807-10 -
http://wicket.apache.org/wicket-core)
- * Wicket Development Utilities
(org.apache.wicket:wicket-devutils:10.12.0-20261016.202807-8 -
http://wicket.apache.org/wicket-devutils)
- * Wicket Extensions
(org.apache.wicket:wicket-extensions:10.12.0-20261016.202807-8 -
http://wicket.apache.org/wicket-extensions)
- * Wicket IoC common code
(org.apache.wicket:wicket-ioc:10.12.0-20261016.202807-8 -
http://wicket.apache.org/wicket-ioc)
+ * Wicket Auth Roles
(org.apache.wicket:wicket-auth-roles:10.12.0-20261023.124610-11 -
http://wicket.apache.org/wicket-auth-roles)
+ * Wicket Core
(org.apache.wicket:wicket-core:10.12.0-20261023.153745-14 -
http://wicket.apache.org/wicket-core)
+ * Wicket Development Utilities
(org.apache.wicket:wicket-devutils:10.12.0-20261023.124610-11 -
http://wicket.apache.org/wicket-devutils)
+ * Wicket Extensions
(org.apache.wicket:wicket-extensions:10.12.0-20261023.124610-11 -
http://wicket.apache.org/wicket-extensions)
+ * Wicket IoC common code
(org.apache.wicket:wicket-ioc:10.12.0-20261023.124610-11 -
http://wicket.apache.org/wicket-ioc)
* Wicket JQuery Selectors
(de.agilecoders.wicket:jquery-selectors:4.0.15 -
http://nexus.sonatype.org/oss-repository-hosting.html/jquery-selectors)
* wicket-jquery-ui-calendar
(org.wicketstuff:wicketstuff-jquery-ui-calendar:10.12.0-20261014.155132-39 -
https://github.com/sebfz1/wicket-jquery-ui/wicketstuff-jquery-ui-calendar)
* wicket-jquery-ui-core
(org.wicketstuff:wicketstuff-jquery-ui-core:10.12.0-20261014.155132-34 -
https://github.com/sebfz1/wicket-jquery-ui/wicketstuff-jquery-ui-core)
* wicket-jquery-ui-plugins
(org.wicketstuff:wicketstuff-jquery-ui-plugins:10.12.0-20261014.155132-40 -
https://github.com/sebfz1/wicket-jquery-ui/wicketstuff-jquery-ui-plugins)
- * Wicket Native WebSocket Core
(org.apache.wicket:wicket-native-websocket-core:10.12.0-20261016.202807-8 -
http://wicket.apache.org/wicket-native-websocket/wicket-native-websocket-core)
- * Wicket Native WebSocket Javax
(org.apache.wicket:wicket-native-websocket-javax:10.12.0-20261016.202807-8 -
http://wicket.apache.org/wicket-native-websocket/wicket-native-websocket-javax)
- * Wicket Request
(org.apache.wicket:wicket-request:10.12.0-20261016.202807-10 -
http://maven.apache.org)
- * Wicket Spring Integration
(org.apache.wicket:wicket-spring:10.12.0-20261016.202807-8 -
http://wicket.apache.org/wicket-spring)
+ * Wicket Native WebSocket Core
(org.apache.wicket:wicket-native-websocket-core:10.12.0-20261023.124610-11 -
http://wicket.apache.org/wicket-native-websocket/wicket-native-websocket-core)
+ * Wicket Native WebSocket Javax
(org.apache.wicket:wicket-native-websocket-javax:10.12.0-20261023.124610-11 -
http://wicket.apache.org/wicket-native-websocket/wicket-native-websocket-javax)
+ * Wicket Request
(org.apache.wicket:wicket-request:10.12.0-20261023.153745-14 -
http://maven.apache.org)
+ * Wicket Spring Integration
(org.apache.wicket:wicket-spring:10.12.0-20261023.124610-11 -
http://wicket.apache.org/wicket-spring)
* Wicketstuff Dashboard Core
(org.wicketstuff:wicketstuff-dashboard-core:10.12.0-20261014.155132-31 -
http://wicketstuff.org/wicketstuff-dashboard-parent/wicketstuff-dashboard-core)
* wicketstuff-jquery-ui
(org.wicketstuff:wicketstuff-jquery-ui:10.12.0-20261014.155132-35 -
https://github.com/sebfz1/wicket-jquery-ui/wicketstuff-jquery-ui)
* Wicketstuff-Select2 Components
(org.wicketstuff:wicketstuff-select2:10.12.0-20261014.155132-34 -
http://wicketstuff.org/wicketstuff-select2-parent/wicketstuff-select2)
- * Wicket Util
(org.apache.wicket:wicket-util:10.12.0-20261016.202807-10 -
http://wicket.apache.org/wicket-util)
+ * Wicket Util
(org.apache.wicket:wicket-util:10.12.0-20261023.153745-14 -
http://wicket.apache.org/wicket-util)
* Woodstox (com.fasterxml.woodstox:woodstox-core:7.2.2 -
https://github.com/FasterXML/woodstox)
* XmlBeans (org.apache.xmlbeans:xmlbeans:5.3.0 -
https://xmlbeans.apache.org/)
* XML Commons Resolver Component (xml-resolver:xml-resolver:1.2 -
http://xml.apache.org/commons/components/resolver/)
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestCalendarService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestCalendarService.java
index a60c5b310..dc626eca5 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestCalendarService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestCalendarService.java
@@ -319,7 +319,8 @@ class TestCalendarService extends AbstractWebServiceTest {
List<MeetingMemberDTO> initialList = new
ArrayList<>(dto.getMeetingMembers());
MeetingMemberDao mmDao = getBean(MeetingMemberDao.class);
MeetingMember mm = mmDao.get(initialList.get(initialList.size()
- 1).getId());
- Long mmId = mm.getId(), mmUserId = mm.getUser().getId();
+ Long mmId = mm.getId();
+ Long mmUserId = mm.getUser().getId();
String hash = mm.getInvitation().getHash();
dto.getMeetingMembers().remove(initialList.size() - 1);
diff --git a/pom.xml b/pom.xml
index 692705ee2..01033eaca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<!-- plugin versions -->
<version.maven-javadoc-plugin>3.12.0</version.maven-javadoc-plugin>
- <version.maven-surefire>3.6.0</version.maven-surefire>
+ <surefire.version>3.6.1</surefire.version>
<version.maven-site-plugin>4.0.0-M16</version.maven-site-plugin>
<version.maven-enforcer-plugin>3.6.3</version.maven-enforcer-plugin>
<version.maven-source-plugin>3.4.0</version.maven-source-plugin>
@@ -130,8 +130,7 @@
<jackrabbit-webdav.version>2.21.22</jackrabbit-webdav.version>
<tika-parsers.version>4.1.0</tika-parsers.version>
<slf4j.version>2.0.20</slf4j.version>
- <logback.version>1.6.5</logback.version>
- <license.excludedScopes>test</license.excludedScopes>
+ <logback.version>1.6.6</logback.version>
<bcprov.version>1.86</bcprov.version>
<mockito.version>5.24.0</mockito.version>
<quartz.version>2.5.2</quartz.version>
@@ -152,6 +151,7 @@
<sonar.junit.reportPaths>target/surefire-reports</sonar.junit.reportPaths>
<jacoco.binary.path>${project.basedir}/../target/jacoco.exec</jacoco.binary.path>
<excluded.test.groups>heavy-test</excluded.test.groups>
+ <license.excludedScopes>test</license.excludedScopes>
<db_user></db_user>
<db_pass></db_pass>
</properties>
