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 526471b47 [OPENMEETINGS-2790] spring, junit, dom4j, swagger and plugins
526471b47 is described below
commit 526471b47c0c9f6434c2f94effe9621ecb37cca0
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Jul 3 10:15:02 2025 +0700
[OPENMEETINGS-2790] spring, junit, dom4j, swagger and plugins
---
LICENSE | 39 ++++++++++++++++++---------------------
pom.xml | 15 ++++++++-------
2 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/LICENSE b/LICENSE
index 93c7ef23a..35a00aaea 100644
--- a/LICENSE
+++ b/LICENSE
@@ -281,9 +281,9 @@ conditions of the following licenses.
* Jakarta Persistence API
(jakarta.persistence:jakarta.persistence-api:3.2.0 -
https://github.com/jakartaee/persistence)
* Jakarta RESTful WS API (jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 -
https://github.com/eclipse-ee4j/jaxrs-api)
* JUnit Jupiter (Aggregator) (org.junit.jupiter:junit-jupiter:5.12.2 -
https://junit.org/junit5/)
- * JUnit Jupiter API (org.junit.jupiter:junit-jupiter-api:5.13.1 -
https://junit.org/junit5/)
- * JUnit Platform Commons
(org.junit.platform:junit-platform-commons:1.13.1 - https://junit.org/junit5/)
- * JUnit Platform Engine API
(org.junit.platform:junit-platform-engine:1.13.1 - https://junit.org/junit5/)
+ * JUnit Jupiter API (org.junit.jupiter:junit-jupiter-api:5.13.2 -
https://junit.org/)
+ * JUnit Platform Commons
(org.junit.platform:junit-platform-commons:1.13.2 - https://junit.org/)
+ * JUnit Platform Engine API
(org.junit.platform:junit-platform-engine:1.13.2 - https://junit.org/)
* JUnit Vintage Engine (org.junit.vintage:junit-vintage-engine:5.12.2
- https://junit.org/junit5/)
GENERAL PUBLIC LICENSE, version 3 (GPL-3.0), GNU LESSER GENERAL PUBLIC
LICENSE, version 3 (LGPL-3.0), Mozilla Public License Version 1.1
@@ -352,10 +352,6 @@ conditions of the following licenses.
* ojdbc10 (com.oracle.database.jdbc:ojdbc10:19.27.0.0 -
https://www.oracle.com/database/technologies/maven-central-guide.html)
- Plexus
-
- * dom4j (org.dom4j:dom4j:2.1.4 - http://dom4j.github.io/)
-
Public Domain
* jain-sip-ri (javax.sip:jain-sip-ri:1.2.307 -
http://code.google.com/p/jain-sip/)
@@ -500,8 +496,8 @@ conditions of the following licenses.
* Kurento JSON-RPC Client (org.kurento:kurento-jsonrpc-client:7.2.0 -
https://kurento.openvidu.io/kurento-jsonrpc/kurento-jsonrpc-client/)
* library (de.agilecoders.wicket.webjars:wicket-webjars:4.0.6 -
https://github.com/l0rdn1kk0n/wicket-webjars/wicket-webjars)
* Log4j Implemented Over SLF4J (org.slf4j:log4j-over-slf4j:2.0.17 -
http://www.slf4j.org)
- * micrometer-commons (io.micrometer:micrometer-commons:1.14.7 -
https://github.com/micrometer-metrics/micrometer)
- * micrometer-observation (io.micrometer:micrometer-observation:1.14.7
- https://github.com/micrometer-metrics/micrometer)
+ * micrometer-commons (io.micrometer:micrometer-commons:1.14.8 -
https://github.com/micrometer-metrics/micrometer)
+ * micrometer-observation (io.micrometer:micrometer-observation:1.14.8
- https://github.com/micrometer-metrics/micrometer)
* Netty/Buffer (io.netty:netty-buffer:4.1.85.Final -
https://netty.io/netty-buffer/)
* Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.85.Final -
https://netty.io/netty-codec-http/)
* Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.85.Final -
https://netty.io/netty-codec-socks/)
@@ -547,18 +543,18 @@ conditions of the following licenses.
* 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:6.2.7 -
https://github.com/spring-projects/spring-framework)
- * Spring Beans (org.springframework:spring-beans:6.2.7 -
https://github.com/spring-projects/spring-framework)
- * Spring Context (org.springframework:spring-context:6.2.7 -
https://github.com/spring-projects/spring-framework)
- * Spring Context Support
(org.springframework:spring-context-support:6.2.7 -
https://github.com/spring-projects/spring-framework)
- * Spring Core (org.springframework:spring-core:6.2.7 -
https://github.com/spring-projects/spring-framework)
- * Spring Expression Language (SpEL)
(org.springframework:spring-expression:6.2.7 -
https://github.com/spring-projects/spring-framework)
- * Spring JDBC (org.springframework:spring-jdbc:6.2.7 -
https://github.com/spring-projects/spring-framework)
- * Spring Object/Relational Mapping
(org.springframework:spring-orm:6.2.7 -
https://github.com/spring-projects/spring-framework)
- * Spring Transaction (org.springframework:spring-tx:6.2.7 -
https://github.com/spring-projects/spring-framework)
- * Spring Web (org.springframework:spring-web:6.2.7 -
https://github.com/spring-projects/spring-framework)
- * Spring Web MVC (org.springframework:spring-webmvc:6.2.7 -
https://github.com/spring-projects/spring-framework)
- * swagger-annotations (io.swagger.core.v3:swagger-annotations:2.2.33 -
https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
+ * Spring AOP (org.springframework:spring-aop:6.2.8 -
https://github.com/spring-projects/spring-framework)
+ * Spring Beans (org.springframework:spring-beans:6.2.8 -
https://github.com/spring-projects/spring-framework)
+ * Spring Context (org.springframework:spring-context:6.2.8 -
https://github.com/spring-projects/spring-framework)
+ * Spring Context Support
(org.springframework:spring-context-support:6.2.8 -
https://github.com/spring-projects/spring-framework)
+ * Spring Core (org.springframework:spring-core:6.2.8 -
https://github.com/spring-projects/spring-framework)
+ * Spring Expression Language (SpEL)
(org.springframework:spring-expression:6.2.8 -
https://github.com/spring-projects/spring-framework)
+ * Spring JDBC (org.springframework:spring-jdbc:6.2.8 -
https://github.com/spring-projects/spring-framework)
+ * Spring Object/Relational Mapping
(org.springframework:spring-orm:6.2.8 -
https://github.com/spring-projects/spring-framework)
+ * Spring Transaction (org.springframework:spring-tx:6.2.8 -
https://github.com/spring-projects/spring-framework)
+ * Spring Web (org.springframework:spring-web:6.2.8 -
https://github.com/spring-projects/spring-framework)
+ * Spring Web MVC (org.springframework:spring-webmvc:6.2.8 -
https://github.com/spring-projects/spring-framework)
+ * swagger-annotations (io.swagger.core.v3:swagger-annotations:2.2.34 -
https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
* 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.5.0 -
http://wicket.apache.org/wicket-auth-roles)
* Wicket Core (org.apache.wicket:wicket-core:10.5.0 -
http://wicket.apache.org/wicket-core)
@@ -592,6 +588,7 @@ conditions of the following licenses.
* Adobe XMPCore (com.adobe.xmp:xmpcore:6.1.11 -
https://www.adobe.com/devnet/xmp/library/eula-xmp-library-java.html)
* asm (org.ow2.asm:asm:9.8 - http://asm.ow2.io/)
* bootstrap-italia (org.webjars.npm:bootstrap-italia:2.14.0 -
https://www.webjars.org)
+ * dom4j (org.dom4j:dom4j:2.2.0 - http://dom4j.github.io/)
* ical4j (org.mnode.ical4j:ical4j:4.1.1 - http://ical4j.github.io)
* Java Advanced Imaging Image I/O Tools API core (standalone)
(com.github.jai-imageio:jai-imageio-core:1.4.0 -
https://github.com/jai-imageio/jai-imageio-core)
* Protocol Buffers [Core] (com.google.protobuf:protobuf-java:4.31.0 -
https://developers.google.com/protocol-buffers/protobuf-java/)
diff --git a/pom.xml b/pom.xml
index c2d0d1de6..337e8b976 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<version.maven-javadoc-plugin>3.11.2</version.maven-javadoc-plugin>
<version.maven-surefire>3.5.3</version.maven-surefire>
<version.maven-site-plugin>4.0.0-M9</version.maven-site-plugin>
-
<version.maven-enforcer-plugin>3.5.0</version.maven-enforcer-plugin>
+
<version.maven-enforcer-plugin>3.6.0</version.maven-enforcer-plugin>
<version.maven-source-plugin>3.3.1</version.maven-source-plugin>
<version.maven-compiler-plugin>3.14.0</version.maven-compiler-plugin>
<version.maven-project-info-reports-plugin>3.9.0</version.maven-project-info-reports-plugin>
@@ -58,7 +58,7 @@
<version.maven-clean-plugin>3.4.1</version.maven-clean-plugin>
<version.maven-antrun-plugin>3.1.0</version.maven-antrun-plugin>
<version.maven-resources-plugin>3.3.1</version.maven-resources-plugin>
- <version.maven-gpg-plugin>3.2.7</version.maven-gpg-plugin>
+ <version.maven-gpg-plugin>3.2.8</version.maven-gpg-plugin>
<version.apache-rat-plugin>0.16.1</version.apache-rat-plugin>
<version.checksum-maven-plugin>1.11</version.checksum-maven-plugin>
<version.maven-checkstyle-plugin>3.6.0</version.maven-checkstyle-plugin>
@@ -67,7 +67,7 @@
<maven-bundle-plugin.version>6.0.0</maven-bundle-plugin.version>
<exec-maven-plugin.version>3.5.1</exec-maven-plugin.version>
<minify-maven-plugin.version>1.7.6</minify-maven-plugin.version>
-
<license-maven-plugin.version>2.5.0</license-maven-plugin.version>
+
<license-maven-plugin.version>2.6.0</license-maven-plugin.version>
<reflow-maven-skin.version>2.3.4</reflow-maven-skin.version>
<reflow-theme>cerulean</reflow-theme>
<replacer.version>1.5.3</replacer.version>
@@ -86,12 +86,12 @@
<spdx.version>1.0.2</spdx.version>
<!-- dependency versions -->
- <junit.version>5.13.1</junit.version>
+ <junit.version>5.13.2</junit.version>
<wicket.version>10.5.0</wicket.version>
<wicketstuff.version>10.5.0</wicketstuff.version>
<wicket-bootstrap.version>7.0.10</wicket-bootstrap.version>
<fullcalendar.version>6.1.15</fullcalendar.version>
- <spring.version>6.2.7</spring.version>
+ <spring.version>6.2.8</spring.version>
<tomcat.version>11.0.8</tomcat.version>
<jetty.version>11.0.25</jetty.version>
<ical4j.version>4.1.1</ical4j.version>
@@ -119,7 +119,7 @@
<commons-io.version>2.19.0</commons-io.version>
<commons-text.version>1.13.1</commons-text.version>
<commons-net.version>3.11.1</commons-net.version>
- <dom4j.version>2.1.4</dom4j.version>
+ <dom4j.version>2.2.0</dom4j.version>
<postgresql.version>42.7.7</postgresql.version>
<mysql.version>9.3.0</mysql.version>
<mssql.version>12.10.0.jre11</mssql.version>
@@ -143,7 +143,7 @@
<jaxb-runtime.version>4.0.5</jaxb-runtime.version>
<jquery-ui-touch-punch.version>0.2.3-2</jquery-ui-touch-punch.version>
<apacheds-test-framework.version>2.0.0.AM27</apacheds-test-framework.version>
- <swagger.version>2.2.33</swagger.version>
+ <swagger.version>2.2.34</swagger.version>
<jsr305.version>3.0.2</jsr305.version>
<totp.version>1.7.1</totp.version>
<!-- Exclude all generated code -->
@@ -1667,6 +1667,7 @@
BSD 3-clause|
BSD-3-Clause|
BSD 3-Clause
License|
+ BSD 3-clause
New License|
BSD 3-clause
License w/nuclear disclaimer
</licenseMerge>
<licenseMerge>