[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/hsqldb
config_host.mk.in |1 - configure.ac | 11 --- external/hsqldb/UnpackedTarball_hsqldb.mk |6 ++ 3 files changed, 2 insertions(+), 16 deletions(-) New commits: commit cedf0b23542a06cd31440dd1deb450d03191a1b9 Author: Stephan Bergmann AuthorDate: Wed Apr 6 08:20:14 2022 +0200 Commit: Stephan Bergmann CommitDate: Wed Apr 6 10:46:47 2022 +0200 Remove obsolete HSQLDB_USE_JDBC_4_1 ...that must always be true ever since 1b8c61d5ca8e2a7ae7a0bcd189b7a87defecea03 "Bump JDK buildtime requirement to 1.6" Change-Id: I9432ac9d0a0e2c4999a80b6f144099d0e4dc15bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132616 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/config_host.mk.in b/config_host.mk.in index c412a0b99895..cc05b3448d0b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -311,7 +311,6 @@ export HELP_ONLINE=@HELP_ONLINE@ export HELP_OMINDEX_PAGE=@HELP_OMINDEX_PAGE@ export HOST_PLATFORM=@HOST_PLATFORM@ export HSQLDB_JAR=@HSQLDB_JAR@ -export HSQLDB_USE_JDBC_4_1=@HSQLDB_USE_JDBC_4_1@ export HUNSPELL_CFLAGS=$(gb_SPACE)@HUNSPELL_CFLAGS@ export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@ export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@ diff --git a/configure.ac b/configure.ac index af0c9937d865..1cdd22b0ae66 100644 --- a/configure.ac +++ b/configure.ac @@ -5789,7 +5789,6 @@ if test "$cross_compiling" = "yes"; then ANT ANT_HOME ANT_LIB -HSQLDB_USE_JDBC_4_1 JAVA_CLASSPATH_NOT_SET JAVA_SOURCE_VER JAVA_TARGET_VER @@ -10159,7 +10158,6 @@ dnl === dnl Check for system hsqldb dnl === if test "$with_java" != "no" -a "$cross_compiling" != "yes"; then -HSQLDB_USE_JDBC_4_1= AC_MSG_CHECKING([which hsqldb to use]) if test "$with_system_hsqldb" = "yes"; then AC_MSG_RESULT([external]) @@ -10211,14 +10209,6 @@ if test "$with_java" != "no" -a "$cross_compiling" != "yes"; then SYSTEM_HSQLDB= BUILD_TYPE="$BUILD_TYPE HSQLDB" NEED_ANT=TRUE -AC_MSG_CHECKING([whether hsqldb should be built with JDBC 4.1]) -javanumver=`$JAVAINTERPRETER -version 2>&1 | $AWK -v num=true -f $SRC_ROOT/solenv/bin/getcompver.awk` -if expr "$javanumver" '>=' 00010006 > /dev/null; then -AC_MSG_RESULT([yes]) -HSQLDB_USE_JDBC_4_1=TRUE -else -AC_MSG_RESULT([no]) -fi fi else if test "$with_java" != "no" -a -z "$HSQLDB_JAR"; then @@ -10227,7 +10217,6 @@ else fi AC_SUBST(SYSTEM_HSQLDB) AC_SUBST(HSQLDB_JAR) -AC_SUBST([HSQLDB_USE_JDBC_4_1]) dnl === dnl Check for PostgreSQL stuff diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk index cbba770f19a0..389572377fa6 100644 --- a/external/hsqldb/UnpackedTarball_hsqldb.mk +++ b/external/hsqldb/UnpackedTarball_hsqldb.mk @@ -25,10 +25,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\ external/hsqldb/patches/fdo36824.patch \ external/hsqldb/patches/limit_as_table_alias.patch \ external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch \ - $(if $(HSQLDB_USE_JDBC_4_1),\ - external/hsqldb/patches/jdbc-4.1.patch \ - external/hsqldb/patches/multipleResultSets.patch \ - ) \ + external/hsqldb/patches/jdbc-4.1.patch \ + external/hsqldb/patches/multipleResultSets.patch \ )) # vim: set noet sw=4 ts=4:
[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/hsqldb
config_host.mk.in |1 + configure.ac | 10 ++ external/hsqldb/ExternalProject_hsqldb.mk |7 +++ 3 files changed, 18 insertions(+) New commits: commit 19de5d97efbb80e9767bc6b873bcc2c263a721de Author: Stephan Bergmann AuthorDate: Tue Apr 5 08:09:59 2022 +0200 Commit: Stephan Bergmann CommitDate: Tue Apr 5 17:50:48 2022 +0200 Allow building against JDK 18 ...where ExternalProject_hsqldb failed with > [java] java.lang.UnsupportedOperationException: The Security Manager is deprecated and will be removed in a future release > [java] at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:194) > [java] at org.apache.tools.ant.taskdefs.Java.run(Java.java:891) > [java] at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:231) > [java] at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:135) > [java] at org.apache.tools.ant.taskdefs.Java.execute(Java.java:108) > [java] at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299) > [java] at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104) > [java] at java.base/java.lang.reflect.Method.invoke(Method.java:577) > [java] at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99) > [java] at org.apache.tools.ant.Task.perform(Task.java:350) > [java] at org.apache.tools.ant.Target.execute(Target.java:449) > [java] at org.apache.tools.ant.Target.performTasks(Target.java:470) > [java] at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401) > [java] at org.apache.tools.ant.Project.executeTarget(Project.java:1374) > [java] at org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41) > [java] at org.apache.tools.ant.Project.executeTargets(Project.java:1264) > [java] at org.apache.tools.ant.Main.runBuild(Main.java:818) > [java] at org.apache.tools.ant.Main.startAnt(Main.java:223) > [java] at org.apache.tools.ant.launch.Launcher.run(Launcher.java:284) > [java] at org.apache.tools.ant.launch.Launcher.main(Launcher.java:101) > [java] Caused by: java.lang.UnsupportedOperationException: The Security Manager is deprecated and will be removed in a future release > [java] at java.base/java.lang.System.setSecurityManager(System.java:416) > [java] at org.apache.tools.ant.types.Permissions.setSecurityManager(Permissions.java:103) > [java] at org.apache.tools.ant.taskdefs.ExecuteJava.run(ExecuteJava.java:216) > [java] at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:155) > [java] ... 19 more while building target switchtojdk17 (but then unfortunately carried on, without the source modifications that should have been done by that target, leading to confusing errors like > [javac] workdir/UnpackedTarball/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java:426: error: jdbcConnection is not abstract and does not override abstract method createStruct(String,Object[]) in Connection that should have been under control at least ever since 7dbfc0012cc75e7dac9a416b53149ad8ec33f071 "make hsqldb build with java 1.7".) Unconditionally passing ANT_OPTS -Djava.security.manager=allow would cause older JDK versions (like Java 11) to fail with a java.lang.Error "Could not create SecurityManager" caused by a java.lang.ClassNotFoundException "allow", so introduce JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD. This should allow us to keep building against at least JDK 18, even though later versions of Java may remove the Security Manager completely, but in which case hopefully an updated version of Apache Ant will become available. Change-Id: I9d143d8bcfff67870017bb1c874eec53e0ff9672 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132558 Reviewed-by: Jan-Marek Glogowski Reviewed-by: Stephan Bergmann Tested-by: Jenkins diff --git a/config_host.mk.in b/config_host.mk.in index ee5d0326c981..c412a0b99895 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -353,6 +353,7 @@ export JAVA_TARGET_VER=@JAVA_TARGET_VER@ export JAWTLIB=@JAWTLIB@ export JDK=@JDK@ export JDK_FOR_BUILD=@JDK_FOR_BUILD@ +export JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD=@JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD@ export JFREEREPORT_JAR=@JFREEREPORT_JAR@ export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@ export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@ diff --git a/configure.ac b/configure.ac index 91fb52cb1a2c..af0c9937d865 100644 --- a/configure.ac +++ b/configure.ac @@ -5774,6 +5774,7 @@ if test "$cross_compiling" = "yes"; then
