BUCK | 6 ++++++
download.lst | 1 +
ridljar/BUCK | 1 +
ridljar/pom.libreoffice.xml | 10 ++++++++++
4 files changed, 18 insertions(+)
New commits:
commit bb26aa320fd8230f4105e8872b81612425400cc1
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri Feb 7 11:53:12 2025 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Mon Jun 9 12:39:29 2025 +0200
add Java-WebSocket to deps to the ridljar/libreoffice pom
The dependency was introduced in
8e246331f6f71320cfcc8defdd04e756a75f71cf but never was added to the
maven pom
Change-Id: Id12036c82ecf803a817054a618316a95a4c738ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181240
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/download.lst b/download.lst
index eff4666c8496..1ae54eefe360 100644
--- a/download.lst
+++ b/download.lst
@@ -360,6 +360,7 @@ ICU_DATA_TARBALL := icu4c-77_1-data.zip
# so that git cherry-pick
# will not run into conflicts
JAVA_WEBSOCKET_SHA256SUM :=
f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728
+# please also adjust the version in ridljar/pom.libreoffice.xml
JAVA_WEBSOCKET_TARBALL := Java-WebSocket-1.6.0.tar.gz
# three static lines
# so that git cherry-pick
diff --git a/ridljar/pom.libreoffice.xml b/ridljar/pom.libreoffice.xml
index ca6438ebe3b0..b7c4273ad843 100644
--- a/ridljar/pom.libreoffice.xml
+++ b/ridljar/pom.libreoffice.xml
@@ -8,6 +8,16 @@
<description>Public UNO Java Classes (formerly
jurt,juh,ridl,unoil)</description>
<url>https://www.libreoffice.org</url>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.java-websocket</groupId>
+ <artifactId>Java-WebSocket</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<licenses>
<license>
<name>Mozilla Public License, Version 2.0</name>
commit deae13d5a2ac2c6c29d1a97a606fecb495445289
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri Feb 7 11:43:16 2025 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Mon Jun 9 12:39:19 2025 +0200
make buck/javadoc happy on JDK 17
previous versions just did print a warning, just like for other javadoc
issues, but current versions of javadoc cause a hard failure
Change-Id: Ib880128f75f44fab5f7570eb68ae32639453504a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181239
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
diff --git a/BUCK b/BUCK
index 18f5cf488e4f..b1c98c3540d6 100644
--- a/BUCK
+++ b/BUCK
@@ -40,6 +40,12 @@ prebuilt_jar(
visibility = ['PUBLIC'],
)
+prebuilt_jar(
+ name = 'java-websocket',
+ binary_jar = 'instdir/program/classes/java_websocket.jar',
+ visibility = ['PUBLIC'],
+)
+
zip_file(
name = 'api',
srcs = [
diff --git a/ridljar/BUCK b/ridljar/BUCK
index b67d1c6a1166..e3f3f496b29d 100644
--- a/ridljar/BUCK
+++ b/ridljar/BUCK
@@ -41,6 +41,7 @@ java_doc(
deps = [
'//:unoloader',
'//:libreoffice',
+ '//:java-websocket',
],
visibility = ['PUBLIC'],
)
