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 2026/03/25 00:58:38 UTC

(openmeetings) branch master updated: [OPENMEETINGS-2800] gson dependency is dropped, apache-rat-plugin

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 270ed504f [OPENMEETINGS-2800] gson dependency is dropped, apache-rat-plugin
270ed504f is described below

commit 270ed504fe2962fd6710d9e0fcaff2f43befbfcc
Author: Maxim Solodovnik <so...@apache.org>
AuthorDate: Wed Mar 25 07:58:28 2026 +0700

    [OPENMEETINGS-2800] gson dependency is dropped, apache-rat-plugin
---
 LICENSE                                                     | 10 ++++++----
 openmeetings-mediaserver/src/main/java/module-info.java     |  1 -
 .../java/org/apache/openmeetings/mediaserver/KStream.java   |  7 +------
 pom.xml                                                     | 13 +------------
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/LICENSE b/LICENSE
index 1c399ce20..7c85e15f9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -443,9 +443,11 @@ conditions of the following licenses.
         * core (org.kurento:kms-api-core:7.3.0 - https://kurento.openvidu.io/)
         * elements (org.kurento:kms-api-elements:7.3.0 - https://kurento.openvidu.io/)
         * error-prone annotations (com.google.errorprone:error_prone_annotations:2.28.0 - https://errorprone.info/error_prone_annotations)
+        * error-prone annotations (com.google.errorprone:error_prone_annotations:2.41.0 - https://errorprone.info/error_prone_annotations)
         * filters (org.kurento:kms-api-filters:7.3.0 - https://kurento.openvidu.io/)
         * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
-        * Gson (com.google.code.gson:gson:2.10 - https://github.com/google/gson/gson)
+        * Gson (com.google.code.gson:gson:2.13.2 - https://github.com/google/gson)
+        * Gson (com.google.code.gson:gson:2.9.1 - https://github.com/google/gson/gson)
         * Guava: Google Core Libraries for Java (com.google.guava:guava:33.3.1-jre - https://github.com/google/guava)
         * Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.2 - https://github.com/google/guava/failureaccess)
         * Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
@@ -461,8 +463,8 @@ conditions of the following licenses.
         * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.20.0 - https://github.com/FasterXML/jackson)
         * Jakarta Dependency Injection (jakarta.inject:jakarta.inject-api:2.0.1.MR - https://github.com/eclipse-ee4j/injection-api)
         * Jasney Bootstrap Extensions (org.webjars:jasny-bootstrap:3.1.3-2 - http://webjars.org)
-        * Java 10 Shim (com.googlecode.owasp-java-html-sanitizer:java10-shim:20260102.1 - https://github.com/OWASP/java-html-sanitizer)
-        * Java 8 Shim (com.googlecode.owasp-java-html-sanitizer:java8-shim:20260102.1 - https://github.com/OWASP/java-html-sanitizer)
+        * Java 10 Shim (com.googlecode.owasp-java-html-sanitizer:java10-shim:20260313.1 - https://github.com/OWASP/java-html-sanitizer)
+        * Java 8 Shim (com.googlecode.owasp-java-html-sanitizer:java8-shim:20260313.1 - https://github.com/OWASP/java-html-sanitizer)
         * java-libpst (com.pff:java-libpst:0.9.3 - https://github.com/rjohnsondev/java-libpst)
         * Java Runtime Interface Definition Library (org.openoffice:ridl:4.1.2 - https://wiki.openoffice.org/wiki/Uno)
         * Javassist (org.javassist:javassist:3.28.0-GA - http://www.javassist.org/)
@@ -511,7 +513,7 @@ conditions of the following licenses.
         * Openmeetings Webservices (org.apache.openmeetings:openmeetings-webservice:9.0.0-SNAPSHOT - https://openmeetings.apache.org/openmeetings-webservice)
         * org.apiguardian:apiguardian-api (org.apiguardian:apiguardian-api:1.1.2 - https://github.com/apiguardian-team/apiguardian)
         * org.opentest4j:opentest4j (org.opentest4j:opentest4j:1.3.0 - https://github.com/ota4j-team/opentest4j)
-        * OWASP Java HTML Sanitizer (com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20260102.1 - https://github.com/OWASP/java-html-sanitizer)
+        * OWASP Java HTML Sanitizer (com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20260313.1 - https://github.com/OWASP/java-html-sanitizer)
         * 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)
diff --git a/openmeetings-mediaserver/src/main/java/module-info.java b/openmeetings-mediaserver/src/main/java/module-info.java
index 13752f047..9db4210d3 100644
--- a/openmeetings-mediaserver/src/main/java/module-info.java
+++ b/openmeetings-mediaserver/src/main/java/module-info.java
@@ -41,7 +41,6 @@ module org.apache.openmeetings.mediaserver {
 	requires transitive kurento.client;
 	requires kurento.jsonrpc.client;
 	requires kurento.commons;
-	requires com.google.gson;
 
 	requires org.slf4j;
 }
diff --git a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KStream.java b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KStream.java
index 9aaff56bd..d13aaa6ec 100644
--- a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KStream.java
+++ b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KStream.java
@@ -71,7 +71,6 @@ import org.kurento.client.MediaType;
 import org.kurento.client.RecorderEndpoint;
 import org.kurento.client.RtpEndpoint;
 import org.kurento.client.WebRtcEndpoint;
-import org.kurento.jsonrpc.JsonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -324,7 +323,7 @@ public class KStream extends AbstractStream implements ISipCallbacks {
 				, newKurentoMsg()
 					.put("id", "iceCandidate")
 					.put("uid", KStream.this.uid)
-					.put(PARAM_CANDIDATE, convert(JsonUtils.toJsonObject(evt.getCandidate()))))
+					.put(PARAM_CANDIDATE, new JSONObject(evt.getCandidate())))
 				);
 		return endpoint;
 	}
@@ -565,10 +564,6 @@ public class KStream extends AbstractStream implements ISipCallbacks {
 		}
 	}
 
-	private static JSONObject convert(com.google.gson.JsonObject o) {
-		return new JSONObject(o.toString());
-	}
-
 	public Date getConnectedSince() {
 		return connectedSince;
 	}
diff --git a/pom.xml b/pom.xml
index 8a006184d..155c4906d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
 		<version.maven-antrun-plugin>3.2.0</version.maven-antrun-plugin>
 		<version.maven-resources-plugin>3.4.0</version.maven-resources-plugin>
 		<version.maven-gpg-plugin>3.2.8</version.maven-gpg-plugin>
-		<version.apache-rat-plugin>0.17</version.apache-rat-plugin>
+		<version.apache-rat-plugin>0.18</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>
 		<maven.compiler.source>${javaVersion}</maven.compiler.source>
@@ -136,7 +136,6 @@
 		<mockito.version>5.23.0</mockito.version>
 		<quartz.version>2.5.2</quartz.version>
 		<kurento.version>7.3.0</kurento.version>
-		<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.11</jodconverter.version>
@@ -761,16 +760,6 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			<!-- FIXME TODO GSON API has been changed
-				So here we are fixing working version for kurento-client
-
-				!!!! this whole dependency should be dropped !!!!
-			-->
-			<dependency>
-				<groupId>com.google.code.gson</groupId>
-				<artifactId>gson</artifactId>
-				<version>${gson.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.jodconverter</groupId>
 				<artifactId>jodconverter-local</artifactId>