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
commit b2c9d2ba628253535620ad2b010af51be8067c12 Author: Maxim Solodovnik <[email protected]> AuthorDate: Thu May 22 15:06:02 2025 +0700 [OPENMEETINGS-2790] spring, tomcat, prometheus, openjpa, ojdbc, jodconverter, swagger and plugins --- LICENSE | 59 ++++++++++++++++++++++++++++++----------------------------- pom.xml | 16 ++++++++-------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/LICENSE b/LICENSE index 62984832b..ded105b17 100644 --- a/LICENSE +++ b/LICENSE @@ -350,7 +350,7 @@ conditions of the following licenses. Oracle Free Use Terms and Conditions (FUTC) - * ojdbc10 (com.oracle.database.jdbc:ojdbc10:19.26.0.0 - https://www.oracle.com/database/technologies/maven-central-guide.html) + * ojdbc10 (com.oracle.database.jdbc:ojdbc10:19.27.0.0 - https://www.oracle.com/database/technologies/maven-central-guide.html) Plexus @@ -489,8 +489,8 @@ conditions of the following licenses. * jcommander (com.beust:jcommander:1.72 - http://jcommander.org) * JDOM (org.jdom:jdom2:2.0.6.1 - http://www.jdom.org) * Jettison (org.codehaus.jettison:jettison:1.5.4 - https://github.com/jettison-json/jettison) - * JODConverter Core (org.jodconverter:jodconverter-core:4.4.8 - https://github.com/jodconverter/jodconverter) - * JODConverter Local (org.jodconverter:jodconverter-local:4.4.8 - https://github.com/jodconverter/jodconverter) + * JODConverter Core (org.jodconverter:jodconverter-core:4.4.9 - https://github.com/jodconverter/jodconverter) + * JODConverter Local (org.jodconverter:jodconverter-local:4.4.9 - https://github.com/jodconverter/jodconverter) * jqplot4java (org.wicketstuff:jqplot4java:10.5.0 - http://maven.apache.org) * JqPlot Plugin Integration (org.wicketstuff:jqplot:10.5.0 - http://wicketstuff.org/jqplot-parent/jqplot) * jquery-selectors (de.agilecoders.wicket:jquery-selectors:4.0.9 - http://nexus.sonatype.org/oss-repository-hosting.html/jquery-selectors) @@ -500,8 +500,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.5 - https://github.com/micrometer-metrics/micrometer) - * micrometer-observation (io.micrometer:micrometer-observation:1.14.5 - https://github.com/micrometer-metrics/micrometer) + * 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) * 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/) @@ -513,7 +513,7 @@ conditions of the following licenses. * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.85.Final - https://netty.io/netty-transport-native-unix-common/) * Netty/Transport (io.netty:netty-transport:4.1.85.Final - https://netty.io/netty-transport/) * Ogg and Vorbis for Java, Core (org.gagravarr:vorbis-java-core:0.8 - https://github.com/Gagravarr/VorbisJava) - * OpenJPA Aggregate Jar (org.apache.openjpa:openjpa:4.1.0 - http://openjpa.apache.org/openjpa) + * OpenJPA Aggregate Jar (org.apache.openjpa:openjpa:4.1.1 - http://openjpa.apache.org/openjpa) * Open JSON (com.github.openjson:openjson:1.0.13 - https://github.com/openjson/openjson) * Openmeetings Core (org.apache.openmeetings:openmeetings-core:8.1.0-SNAPSHOT - https://openmeetings.apache.org/openmeetings-core) * Openmeetings DB (org.apache.openmeetings:openmeetings-db:8.1.0-SNAPSHOT - https://openmeetings.apache.org/openmeetings-db) @@ -530,34 +530,35 @@ 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.4 - https://www.apache.org/jbig2-imageio/) * picocli (info.picocli:picocli:4.7.6 - https://picocli.info) - * Prometheus Metrics Config (io.prometheus:prometheus-metrics-config:1.3.6 - http://github.com/prometheus/client_java/prometheus-metrics-config) - * Prometheus Metrics Core (io.prometheus:prometheus-metrics-core:1.3.6 - http://github.com/prometheus/client_java/prometheus-metrics-core) - * Prometheus Metrics Exporter - Common (io.prometheus:prometheus-metrics-exporter-common:1.3.6 - http://github.com/prometheus/client_java/prometheus-metrics-exporter-common) - * Prometheus Metrics Exporter - Servlet Jakarta (io.prometheus:prometheus-metrics-exporter-servlet-jakarta:1.3.6 - http://github.com/prometheus/client_java/prometheus-metrics-exporter-servlet-jakarta) - * Prometheus Metrics Exposition Formats (io.prometheus:prometheus-metrics-exposition-formats:1.3.6 - http://github.com/prometheus/client_java/prometheus-metrics-exposition-formats) - * Prometheus Metrics Exposition Text Formats (io.prometheus:prometheus-metrics-exposition-textformats:1.3.6 - http://github.com/prometheus/client_java/prometheus-metrics-exposition-textformats) - * Prometheus Metrics Model (io.prometheus:prometheus-metrics-model:1.3.6 - http://github.com/prometheus/client_java/prometheus-metrics-model) - * Prometheus Metrics Tracer Common (io.prometheus:prometheus-metrics-tracer-common:1.3.6 - http://github.com/prometheus/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-common) - * Prometheus Metrics Tracer Initializer (io.prometheus:prometheus-metrics-tracer-initializer:1.3.6 - http://github.com/prometheus/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer) - * Prometheus Metrics Tracer OpenTelemetry (io.prometheus:prometheus-metrics-tracer-otel:1.3.6 - http://github.com/prometheus/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel) - * Prometheus Metrics Tracer OpenTelemetry Agent (io.prometheus:prometheus-metrics-tracer-otel-agent:1.3.6 - http://github.com/prometheus/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent) + * Prometheus Metrics Config (io.prometheus:prometheus-metrics-config:1.3.7 - http://github.com/prometheus/client_java/prometheus-metrics-config) + * Prometheus Metrics Core (io.prometheus:prometheus-metrics-core:1.3.7 - http://github.com/prometheus/client_java/prometheus-metrics-core) + * Prometheus Metrics Exporter - Common (io.prometheus:prometheus-metrics-exporter-common:1.3.7 - http://github.com/prometheus/client_java/prometheus-metrics-exporter-common) + * Prometheus Metrics Exporter - Servlet Jakarta (io.prometheus:prometheus-metrics-exporter-servlet-jakarta:1.3.7 - http://github.com/prometheus/client_java/prometheus-metrics-exporter-servlet-jakarta) + * Prometheus Metrics Exposition Formats (io.prometheus:prometheus-metrics-exposition-formats:1.3.7 - http://github.com/prometheus/client_java/prometheus-metrics-exposition-formats) + * Prometheus Metrics Exposition Formats no protobuf (io.prometheus:prometheus-metrics-exposition-formats-no-protobuf:1.3.7 - http://github.com/prometheus/client_java/prometheus-metrics-exposition-formats-no-protobuf) + * Prometheus Metrics Exposition Text Formats (io.prometheus:prometheus-metrics-exposition-textformats:1.3.7 - http://github.com/prometheus/client_java/prometheus-metrics-exposition-textformats) + * Prometheus Metrics Model (io.prometheus:prometheus-metrics-model:1.3.7 - http://github.com/prometheus/client_java/prometheus-metrics-model) + * Prometheus Metrics Tracer Common (io.prometheus:prometheus-metrics-tracer-common:1.3.7 - http://github.com/prometheus/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-common) + * Prometheus Metrics Tracer Initializer (io.prometheus:prometheus-metrics-tracer-initializer:1.3.7 - http://github.com/prometheus/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer) + * Prometheus Metrics Tracer OpenTelemetry (io.prometheus:prometheus-metrics-tracer-otel:1.3.7 - http://github.com/prometheus/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel) + * Prometheus Metrics Tracer OpenTelemetry Agent (io.prometheus:prometheus-metrics-tracer-otel-agent:1.3.7 - http://github.com/prometheus/client_java/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent) * quartz (org.quartz-scheduler:quartz:2.5.0 - 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:6.2.6 - https://github.com/spring-projects/spring-framework) - * Spring Beans (org.springframework:spring-beans:6.2.6 - https://github.com/spring-projects/spring-framework) - * Spring Context (org.springframework:spring-context:6.2.6 - https://github.com/spring-projects/spring-framework) - * Spring Context Support (org.springframework:spring-context-support:6.2.6 - https://github.com/spring-projects/spring-framework) - * Spring Core (org.springframework:spring-core:6.2.6 - https://github.com/spring-projects/spring-framework) - * Spring Expression Language (SpEL) (org.springframework:spring-expression:6.2.6 - https://github.com/spring-projects/spring-framework) - * Spring JDBC (org.springframework:spring-jdbc:6.2.6 - https://github.com/spring-projects/spring-framework) - * Spring Object/Relational Mapping (org.springframework:spring-orm:6.2.6 - https://github.com/spring-projects/spring-framework) - * Spring Transaction (org.springframework:spring-tx:6.2.6 - https://github.com/spring-projects/spring-framework) - * Spring Web (org.springframework:spring-web:6.2.6 - https://github.com/spring-projects/spring-framework) - * Spring Web MVC (org.springframework:spring-webmvc:6.2.6 - https://github.com/spring-projects/spring-framework) - * swagger-annotations (io.swagger.core.v3:swagger-annotations:2.2.30 - https://github.com/swagger-api/swagger-core/modules/swagger-annotations) + * 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.32 - 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) diff --git a/pom.xml b/pom.xml index 8f5b3348c..faf3bf26d 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ <swagger-plugin.version>2.1.6</swagger-plugin.version> <plexus-utils.version>3.5.1</plexus-utils.version> <cyclonedx.version>2.9.1</cyclonedx.version> - <spdx.version>1.0.0</spdx.version> + <spdx.version>1.0.2</spdx.version> <!-- dependency versions --> <junit.version>5.12.0</junit.version> @@ -90,19 +90,19 @@ <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.6</spring.version> - <tomcat.version>11.0.6</tomcat.version> + <spring.version>6.2.7</spring.version> + <tomcat.version>11.0.7</tomcat.version> <jetty.version>11.0.25</jetty.version> <ical4j.version>4.1.1</ical4j.version> <cxf.version>4.1.1</cxf.version> - <io.prometheus.version>1.3.6</io.prometheus.version> + <io.prometheus.version>1.3.7</io.prometheus.version> <aspectjtools.version>1.9.24</aspectjtools.version> <simple-xml.version>2.7.1</simple-xml.version> <jettison.version>1.5.4</jettison.version> <site.basedir>${project.basedir}</site.basedir> <src.pack.skip>false</src.pack.skip> <h2.version>2.3.232</h2.version> - <openjpa.version>4.1.0</openjpa.version> + <openjpa.version>4.1.1</openjpa.version> <jakarta.mail.version>2.0.3</jakarta.mail.version> <jakarta.persistence.version>3.2.0</jakarta.persistence.version> <jakarta.transaction.version>2.0.1</jakarta.transaction.version> @@ -122,7 +122,7 @@ <postgresql.version>42.7.5</postgresql.version> <mysql.version>9.3.0</mysql.version> <mssql.version>12.10.0.jre11</mssql.version> - <ojdbc.version>19.26.0.0</ojdbc.version> + <ojdbc.version>19.27.0.0</ojdbc.version> <xstream.version>1.4.21</xstream.version> <api-all.version>2.1.7</api-all.version> <caldav4j.version>1.0.5</caldav4j.version> @@ -138,11 +138,11 @@ <gson.version>2.10</gson.version><!-- !!!! this whole dependency should be dropped !!!! --> <jain-sip.version>1.2.307</jain-sip.version><!-- other versions are broken! --> <jasny-bootstrap.version>3.1.3-2</jasny-bootstrap.version> - <jodconverter.version>4.4.8</jodconverter.version> + <jodconverter.version>4.4.9</jodconverter.version> <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.30</swagger.version> + <swagger.version>2.2.32</swagger.version> <jsr305.version>3.0.2</jsr305.version> <totp.version>1.7.1</totp.version> <!-- Exclude all generated code -->
