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 b95a088da [OPENMEETINGS-2790] tomcat, junit, postgresql, swagger and
parent pom
b95a088da is described below
commit b95a088dadc35d46ccae96f278ef7b9b775c6562
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Mon Jun 16 13:08:16 2025 +0700
[OPENMEETINGS-2790] tomcat, junit, postgresql, swagger and parent pom
---
LICENSE | 16 ++++++++++------
pom.xml | 10 +++++-----
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/LICENSE b/LICENSE
index 6c50d8e1a..0bd126517 100644
--- a/LICENSE
+++ b/LICENSE
@@ -230,7 +230,7 @@ conditions of the following licenses.
BSD-2-Clause
- * PostgreSQL JDBC Driver (org.postgresql:postgresql:42.7.6 -
https://jdbc.postgresql.org)
+ * PostgreSQL JDBC Driver (org.postgresql:postgresql:42.7.7 -
https://jdbc.postgresql.org)
CC BY 3.0
@@ -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.0 -
https://junit.org/junit5/)
- * JUnit Platform Commons
(org.junit.platform:junit-platform-commons:1.13.0 - https://junit.org/junit5/)
- * JUnit Platform Engine API
(org.junit.platform:junit-platform-engine:1.13.0 - 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 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
@@ -558,7 +558,7 @@ conditions of the following licenses.
* 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.32 -
https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
+ * swagger-annotations (io.swagger.core.v3:swagger-annotations:2.2.33 -
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)
@@ -594,7 +594,7 @@ conditions of the following licenses.
* bootstrap-italia (org.webjars.npm:bootstrap-italia:2.14.0 -
https://www.webjars.org)
* 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/)
+ * Protocol Buffers [Core] (com.google.protobuf:protobuf-java:4.29.0 -
https://developers.google.com/protocol-buffers/protobuf-java/)
* ThreeTen-Extra (org.threeten:threeten-extra:1.8.0 -
https://www.threeten.org/threeten-extra)
* XStream Core (com.thoughtworks.xstream:xstream:1.4.21 -
http://x-stream.github.io/xstream)
@@ -604,6 +604,10 @@ conditions of the following licenses.
* JMatIO (org.tallison:jmatio:1.5 -
https://github.com/tballison/jmatio)
* ParaNamer Core (com.thoughtworks.paranamer:paranamer:2.8 -
https://github.com/paul-hammant/paranamer/paranamer)
+ The GNU General Public License, v2 with Universal FOSS Exception, v1.0
+
+ * MySQL Connector/J (com.mysql:mysql-connector-j:9.3.0 -
http://dev.mysql.com/doc/connector-j/en/)
+
UnRar License
* Java Unrar (com.github.junrar:junrar:7.5.5 -
https://github.com/junrar/junrar)
diff --git a/pom.xml b/pom.xml
index 7caf6ded4..c2d0d1de6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>34</version>
+ <version>35</version>
</parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
@@ -86,13 +86,13 @@
<spdx.version>1.0.2</spdx.version>
<!-- dependency versions -->
- <junit.version>5.13.0</junit.version>
+ <junit.version>5.13.1</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>
- <tomcat.version>11.0.7</tomcat.version>
+ <tomcat.version>11.0.8</tomcat.version>
<jetty.version>11.0.25</jetty.version>
<ical4j.version>4.1.1</ical4j.version>
<cxf.version>4.1.2</cxf.version>
@@ -120,7 +120,7 @@
<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>
- <postgresql.version>42.7.6</postgresql.version>
+ <postgresql.version>42.7.7</postgresql.version>
<mysql.version>9.3.0</mysql.version>
<mssql.version>12.10.0.jre11</mssql.version>
<ojdbc.version>19.27.0.0</ojdbc.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.32</swagger.version>
+ <swagger.version>2.2.33</swagger.version>
<jsr305.version>3.0.2</jsr305.version>
<totp.version>1.7.1</totp.version>
<!-- Exclude all generated code -->
