You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2024/09/26 07:07:31 UTC
(openmeetings) branch master updated: [OPENMEETINGS-2780] apache-parent, junit, wicket, wicketstuff, wicket-bootstrap, spring, tomcat, jetty, ical4j, openjpa, asterisk-java, commons-lang3, commons-io, logback, kurento, jodconverter, swagger and plugins
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 22d082522 [OPENMEETINGS-2780] apache-parent, junit, wicket, wicketstuff, wicket-bootstrap, spring, tomcat, jetty, ical4j, openjpa, asterisk-java, commons-lang3, commons-io, logback, kurento, jodconverter, swagger and plugins
22d082522 is described below
commit 22d082522e79a96e5cf84f27bc5e935ae8cbd906
Author: Maxim Solodovnik <so...@apache.org>
AuthorDate: Thu Sep 26 14:07:20 2024 +0700
[OPENMEETINGS-2780] apache-parent, junit, wicket, wicketstuff, wicket-bootstrap, spring, tomcat, jetty, ical4j, openjpa, asterisk-java, commons-lang3, commons-io, logback, kurento, jodconverter, swagger and plugins
---
.../webdav/version/report/ReportType.java | 9 ++--
.../src/main/webapp/WEB-INF/classes/hazelcast.xml | 2 +-
pom.xml | 61 +++++++++++++---------
3 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/openmeetings-service/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java b/openmeetings-service/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java
index 36bbe30b6..33035bfa5 100644
--- a/openmeetings-service/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java
+++ b/openmeetings-service/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
/**
@@ -68,10 +69,10 @@ public class ReportType implements DeltaVConstants, XmlSerializable {
*/
public Report createReport(DeltaVResource resource, ReportInfo info) throws DavException {
try {
- Report report = reportClass.newInstance();
+ Report report = reportClass.getConstructor().newInstance();
report.init(resource, info);
return report;
- } catch (IllegalAccessException e) {
+ } catch (IllegalAccessException|NoSuchMethodException|InvocationTargetException e) {
// should never occur
throw new DavException(DavServletResponse.SC_INTERNAL_SERVER_ERROR, "Failed to create new report (" + reportClass.getName() + ") from class: " + e.getMessage());
} catch (InstantiationException e) {
@@ -152,11 +153,11 @@ public class ReportType implements DeltaVConstants, XmlSerializable {
return types.get(key);
} else {
try {
- Object report = reportClass.newInstance();
+ Object report = reportClass.getConstructor().newInstance();
if (!(report instanceof Report)) {
throw new IllegalArgumentException("Unable to register Report class: " + reportClass + " does not implement the Report interface.");
}
- } catch (IllegalAccessException e) {
+ } catch (IllegalAccessException|NoSuchMethodException|InvocationTargetException e) {
throw new IllegalArgumentException("Error while validating Report class: " + e.getMessage());
} catch (InstantiationException e) {
throw new IllegalArgumentException("Error while validating Report class.: " + e.getMessage());
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
index 5baae1858..418385cbf 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
@@ -21,7 +21,7 @@
<hazelcast
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://www.hazelcast.com/schema/config"
- xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-5.4.xsd"
+ xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-5.5.xsd"
>
<map name="ONLINE_USERS_KEY">
<near-cache>
diff --git a/pom.xml b/pom.xml
index a225fee16..4422748bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>31</version>
+ <version>33</version>
</parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
@@ -43,8 +43,8 @@
<minimalJavaBuildVersion>${jdk.version}</minimalJavaBuildVersion>
<!-- plugin versions -->
- <version.maven-javadoc-plugin>3.8.0</version.maven-javadoc-plugin>
- <version.maven-surefire>3.4.0</version.maven-surefire>
+ <version.maven-javadoc-plugin>3.10.0</version.maven-javadoc-plugin>
+ <version.maven-surefire>3.5.0</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-source-plugin>3.3.1</version.maven-source-plugin>
@@ -57,10 +57,11 @@
<version.maven-clean-plugin>3.4.0</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.5</version.maven-gpg-plugin>
+ <version.maven-gpg-plugin>3.2.6</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.5.0</version.maven-checkstyle-plugin>
+ <maven.compiler.target>${jdk.version}</maven.compiler.target>
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>
@@ -71,26 +72,26 @@
<replacer.version>1.5.3</replacer.version>
<xml-maven-plugin.version>1.1.0</xml-maven-plugin.version>
<saxon.version>8.7</saxon.version>
- <buildnumber-maven-plugin.version>3.2.0</buildnumber-maven-plugin.version>
+ <buildnumber-maven-plugin.version>3.2.1</buildnumber-maven-plugin.version>
<keytool-maven-plugin.version>1.7</keytool-maven-plugin.version>
- <maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-plugin.version>
+ <maven-jarsigner-plugin.version>3.1.0</maven-jarsigner-plugin.version>
<sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.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>
+ <frontend-maven-plugin.version>1.15.1</frontend-maven-plugin.version>
<swagger-plugin.version>2.1.6</swagger-plugin.version>
<plexus-utils.version>3.5.1</plexus-utils.version>
<!-- dependency versions -->
- <junit.version>5.11.0</junit.version>
- <wicket.version>10.1.0</wicket.version>
- <wicketstuff.version>10.2.0-SNAPSHOT</wicketstuff.version>
- <wicket-bootstrap.version>7.0.7-SNAPSHOT</wicket-bootstrap.version>
+ <junit.version>5.11.1</junit.version>
+ <wicket.version>10.2.0</wicket.version>
+ <wicketstuff.version>10.2.0</wicketstuff.version>
+ <wicket-bootstrap.version>7.0.8</wicket-bootstrap.version>
<fullcalendar.version>6.1.14</fullcalendar.version>
- <spring.version>6.1.12</spring.version>
- <tomcat.version>10.1.28</tomcat.version>
- <jetty.version>11.0.23</jetty.version>
- <ical4j.version>4.0.2</ical4j.version>
+ <spring.version>6.1.13</spring.version>
+ <tomcat.version>10.1.30</tomcat.version>
+ <jetty.version>11.0.24</jetty.version>
+ <ical4j.version>4.0.4</ical4j.version>
<cxf.version>4.0.5</cxf.version>
<io.prometheus.version>1.3.1</io.prometheus.version>
<aspectjtools.version>1.9.22.1</aspectjtools.version>
@@ -100,19 +101,19 @@
<src.pack.skip>false</src.pack.skip>
<h2.version>2.3.232</h2.version>
<jakarta.mail.version>2.0.1</jakarta.mail.version>
- <openjpa.version>4.0.0</openjpa.version>
+ <openjpa.version>4.0.1</openjpa.version>
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
<jakarta.transaction.version>2.0.1</jakarta.transaction.version>
<jakarta.annotation.version>3.0.0</jakarta.annotation.version>
<jakarta.websocket-api.version>2.2.0</jakarta.websocket-api.version>
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
- <asterisk-java.version>3.39.0</asterisk-java.version>
- <commons-lang3.version>3.16.0</commons-lang3.version>
+ <asterisk-java.version>3.40.1</asterisk-java.version>
+ <commons-lang3.version>3.17.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.9.0</commons-cli.version>
<commons-codec.version>1.17.1</commons-codec.version>
- <commons-io.version>2.16.1</commons-io.version>
+ <commons-io.version>2.17.0</commons-io.version>
<commons-text.version>1.12.0</commons-text.version>
<commons-net.version>3.11.1</commons-net.version>
<dom4j.version>2.1.4</dom4j.version>
@@ -126,19 +127,19 @@
<jackrabbit-webdav.version>2.21.22</jackrabbit-webdav.version>
<tika-parsers.version>3.0.0-BETA2</tika-parsers.version>
<slf4j.version>2.0.16</slf4j.version>
- <logback.version>1.5.7</logback.version>
+ <logback.version>1.5.8</logback.version>
<license.excludedScopes>test</license.excludedScopes>
<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>
+ <kurento.version>7.1.0</kurento.version>
<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.7</jodconverter.version>
+ <jodconverter.version>4.4.8</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.22</swagger.version>
+ <swagger.version>2.2.24</swagger.version>
<jsr305.version>3.0.2</jsr305.version>
<totp.version>1.7.1</totp.version>
<!-- Exclude all generated code -->
@@ -931,6 +932,12 @@
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jquery-ui-calendar</artifactId>
<version>${wicketstuff.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>preact</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
@@ -961,6 +968,12 @@
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-themes</artifactId>
<version>${wicket-bootstrap.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>preact</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
@@ -1221,8 +1234,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>${jdk.version}</source>
- <target>${jdk.version}</target>
<debug>true</debug>
<showDeprecation>true</showDeprecation>
<encoding>UTF-8</encoding>