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 5ccf3e819 [OPENMEETINGS-2780] spring, tomcat, prometheus, aspectj,
commons-cli, commons-io, commons-collections, commons-text, slf4j, logback,
bcprov and plugins
5ccf3e819 is described below
commit 5ccf3e819c699327a3efe244c91d71f4dc6fca57
Author: Maxim Solodovnik <solo...@apache.org>
AuthorDate: Mon Apr 22 12:07:27 2024 +0700
[OPENMEETINGS-2780] spring, tomcat, prometheus, aspectj, commons-cli,
commons-io, commons-collections, commons-text, slf4j, logback, bcprov and
plugins
---
.../java/org/apache/openmeetings/cli/Admin.java | 8 +++---
pom.xml | 32 +++++++++++-----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
index af06ca5b1..0aab1a646 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
@@ -324,10 +324,10 @@ public class Admin {
String dbType = cmdl.getOptionValue(OPTION_DB_TYPE);
connectionProperties =
ConnectionPropertiesPatcher.patch(DbType.of(dbType)
, cmdl.getOptionValue(OPTION_DB_HOST,
"localhost")
- , cmdl.getOptionValue(OPTION_DB_PORT,
null)
- , cmdl.getOptionValue(OPTION_DB_NAME,
null)
- , cmdl.getOptionValue(OPTION_DB_USER,
null)
- , cmdl.getOptionValue(OPTION_DB_PASS,
null)
+ , cmdl.getOptionValue(OPTION_DB_PORT,
(String)null)
+ , cmdl.getOptionValue(OPTION_DB_NAME,
(String)null)
+ , cmdl.getOptionValue(OPTION_DB_USER,
(String)null)
+ , cmdl.getOptionValue(OPTION_DB_PASS,
(String)null)
);
} else {
//get properties from existent persistence.xml
diff --git a/pom.xml b/pom.xml
index 923cd89cc..0cd7b1e16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,17 +47,17 @@
<version.maven-surefire>3.2.5</version.maven-surefire>
<version.maven-site-plugin>4.0.0-M9</version.maven-site-plugin>
<version.maven-enforcer-plugin>3.4.1</version.maven-enforcer-plugin>
- <version.maven-source-plugin>3.3.0</version.maven-source-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.5.0</version.maven-project-info-reports-plugin>
- <version.maven-jar-plugin>3.3.0</version.maven-jar-plugin>
+ <version.maven-jar-plugin>3.4.1</version.maven-jar-plugin>
<version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
<version.maven-dependency-plugin>3.6.1</version.maven-dependency-plugin>
<version.maven-war-plugin>3.4.0</version.maven-war-plugin>
<version.maven-clean-plugin>3.3.2</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.1</version.maven-gpg-plugin>
+ <version.maven-gpg-plugin>3.2.4</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>
@@ -75,8 +75,8 @@
<keytool-maven-plugin.version>1.7</keytool-maven-plugin.version>
<maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-plugin.version>
<sonar-maven-plugin.version>3.11.0.3922</sonar-maven-plugin.version>
-
<jacoco-maven-plugin.versoin>0.8.11</jacoco-maven-plugin.versoin>
- <forbiddenapis.version>3.6</forbiddenapis.version>
+
<jacoco-maven-plugin.versoin>0.8.12</jacoco-maven-plugin.versoin>
+ <forbiddenapis.version>3.7</forbiddenapis.version>
<frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
<swagger-plugin.version>2.1.6</swagger-plugin.version>
<plexus-utils.version>3.5.1</plexus-utils.version>
@@ -87,13 +87,13 @@
<wicket-jquery-ui.version>10.0.0-M1</wicket-jquery-ui.version>
<wicketstuff.version>10.0.0</wicketstuff.version>
<wicket-bootstrap.version>7.0.3</wicket-bootstrap.version>
- <spring.version>6.1.5</spring.version>
- <tomcat.version>10.1.19</tomcat.version>
+ <spring.version>6.1.6</spring.version>
+ <tomcat.version>10.1.20</tomcat.version>
<jetty.version>11.0.20</jetty.version>
<ical4j.version>4.0.0-rc5</ical4j.version>
<cxf.version>4.0.4</cxf.version>
- <io.prometheus.version>1.1.0</io.prometheus.version>
- <aspectjtools.version>1.9.21.2</aspectjtools.version>
+ <io.prometheus.version>1.2.1</io.prometheus.version>
+ <aspectjtools.version>1.9.22</aspectjtools.version>
<simple-xml.version>2.7.1</simple-xml.version>
<jettison.version>1.5.4</jettison.version>
<site.basedir>${project.basedir}</site.basedir>
@@ -109,11 +109,11 @@
<commons-lang3.version>3.14.0</commons-lang3.version>
<commons-dbcp.version>2.12.0</commons-dbcp.version>
<commons-pool2.version>2.12.0</commons-pool2.version>
- <commons-cli.version>1.6.0</commons-cli.version>
+ <commons-cli.version>1.7.0</commons-cli.version>
<commons-codec.version>1.16.1</commons-codec.version>
- <commons-io.version>2.15.1</commons-io.version>
- <commons-collections4.version>4.4</commons-collections4.version>
- <commons-text.version>1.11.0</commons-text.version>
+ <commons-io.version>2.16.1</commons-io.version>
+
<commons-collections4.version>4.5.0-M1</commons-collections4.version>
+ <commons-text.version>1.12.0</commons-text.version>
<commons-net.version>3.10.0</commons-net.version>
<dom4j.version>2.1.4</dom4j.version>
<postgresql.version>42.7.3</postgresql.version>
@@ -125,10 +125,10 @@
<caldav4j.version>1.0.5</caldav4j.version>
<jackrabbit-webdav.version>2.21.22</jackrabbit-webdav.version>
<tika-parsers.version>3.0.0-BETA</tika-parsers.version>
- <slf4j.version>2.0.9</slf4j.version>
- <logback.version>1.5.3</logback.version>
+ <slf4j.version>2.0.13</slf4j.version>
+ <logback.version>1.5.6</logback.version>
<license.excludedScopes>test</license.excludedScopes>
- <bcprov.version>1.77</bcprov.version>
+ <bcprov.version>1.78.1</bcprov.version>
<mockito.version>5.2.0</mockito.version>
<quartz.version>2.3.2</quartz.version>
<kurento.version>7.0.0</kurento.version>
