From 86f5f598a2bdd71f95921c20e0361dee54b266c1 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Wed, 5 Dec 2018 15:53:41 +0100 Subject: Drop juh.jar dependency from Java UNO tests Since upstream Java reverted the strict classpath checks, it's not needed anymore. See discussion in https://gerrit.libreoffice.org/#/c/63118 and http://hg.openjdk.java.net/jdk-updates/jdk11u/rev/8513ac27b651 Change-Id: Iff863702b1aeda157c8e230ab36372a71dcfb4bb Todo: tdf#121925 Reviewed-on: https://gerrit.libreoffice.org/64634 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- dbaccess/JunitTest_dbaccess_complex.mk | 1 + solenv/gbuild/JunitTest.mk | 1 - svl/JunitTest_svl_complex.mk | 1 + toolkit/JunitTest_toolkit_complex.mk | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk index 947d9c3ab3c0..ba333cbf3b27 100644 --- a/dbaccess/JunitTest_dbaccess_complex.mk +++ b/dbaccess/JunitTest_dbaccess_complex.mk @@ -13,6 +13,7 @@ $(eval $(call gb_JunitTest_use_unoapi_jars,dbaccess_complex)) $(eval $(call gb_JunitTest_use_jars,dbaccess_complex,\ ConnectivityTools \ + juh \ )) $(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\ diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 7af730567d62..5a584e06895b 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -155,7 +155,6 @@ endef define gb_JunitTest_use_unoapi_jars $(eval $(call gb_JunitTest_use_jars,$(1),\ OOoRunner \ - juh \ jurt \ ridl \ test \ diff --git a/svl/JunitTest_svl_complex.mk b/svl/JunitTest_svl_complex.mk index 097cfad9b53f..eb28ac3af596 100644 --- a/svl/JunitTest_svl_complex.mk +++ b/svl/JunitTest_svl_complex.mk @@ -28,6 +28,7 @@ $(eval $(call gb_JunitTest_use_unoapi_jars,svl_complex)) $(eval $(call gb_JunitTest_use_jars,svl_complex,\ ConnectivityTools \ + juh \ )) $(eval $(call gb_JunitTest_add_sourcefiles,svl_complex,\ diff --git a/toolkit/JunitTest_toolkit_complex.mk b/toolkit/JunitTest_toolkit_complex.mk index 2c79bd0e40e3..6f9b069902ec 100644 --- a/toolkit/JunitTest_toolkit_complex.mk +++ b/toolkit/JunitTest_toolkit_complex.mk @@ -20,7 +20,6 @@ $(eval $(call gb_JunitTest_JunitTest,toolkit_complex)) $(eval $(call gb_JunitTest_use_jars,toolkit_complex,\ OOoRunner \ - juh \ ridl \ test \ unoil \ -- cgit