This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new ec46eb60f1 Upgrade bundled BeanShell from 2.1.0 to 2.1.1
ec46eb60f1 is described below
commit ec46eb60f112fc4d30b8b1648fb1512654b336a4
Author: Jim Jagielski <[email protected]>
AuthorDate: Fri Jul 31 06:21:14 2026 -0400
Upgrade bundled BeanShell from 2.1.0 to 2.1.1
Port bsh-2.1.0-src.patch to bsh-2.1.1-src.patch (default Ant target and
makefile.mk stub, plus a source/target 1.6->1.8 bump since 2.1.1's
build.xml still hardcodes Java 6 bytecode levels, which JDK 21 rejects
outright). Update makefile.mk and prj/d.lst to reference 2.1.1.
Verified with a real build against the downloaded 2.1.1 source tarball.
---
main/beanshell/bsh-2.1.0-src.patch | 44 ------------------
main/beanshell/bsh-2.1.1-src.patch | 95 ++++++++++++++++++++++++++++++++++++++
main/beanshell/makefile.mk | 8 ++--
main/beanshell/prj/d.lst | 2 +-
main/external_deps.lst | 6 +--
5 files changed, 103 insertions(+), 52 deletions(-)
diff --git a/main/beanshell/bsh-2.1.0-src.patch
b/main/beanshell/bsh-2.1.0-src.patch
deleted file mode 100644
index 18e1fca242..0000000000
--- a/main/beanshell/bsh-2.1.0-src.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- misc/BeanShell-2.1.0/build.xml Fri Dec 19 17:14:27 2003
-+++ misc/build/BeanShell-2.1.0/build.xml Fri Mar 28 15:55:04 2008
-@@ -10,7 +10,7 @@
- - Why can't I nest filesets? This seems like it would be so
easy and
- useful...
- -->
--<project name="beanshell" default="compile-all" basedir=".">
-+<project name="beanshell" default="jarall" basedir=".">
-
- <!-- Project Configuration -->
-
---- misc/BeanShell-2.1.0/makefile.mk Fri Mar 28 15:56:40 2008
-+++ misc/build/BeanShell-2.1.0/makefile.mk Fri Mar 28 15:56:06 2008
-@@ -1 +1,29 @@
--dummy
-+#**************************************************************
-+#
-+# Licensed to the Apache Software Foundation (ASF) under one
-+# or more contributor license agreements. See the NOTICE file
-+# distributed with this work for additional information
-+# regarding copyright ownership. The ASF licenses this file
-+# to you under the Apache License, Version 2.0 (the
-+# "License"); you may not use this file except in compliance
-+# with the License. You may obtain a copy of the License at
-+#
-+# http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing,
-+# software distributed under the License is distributed on an
-+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-+# KIND, either express or implied. See the License for the
-+# specific language governing permissions and limitations
-+# under the License.
-+#
-+#**************************************************************
-+
-+PRJ=..$/..$/..$/..
-+PRJNAME=ooo_beanshell
-+TARGET=jarall
-+
-+.INCLUDE : ant.mk
-+
-+ALLTAR : ANTBUILD
-+
diff --git a/main/beanshell/bsh-2.1.1-src.patch
b/main/beanshell/bsh-2.1.1-src.patch
new file mode 100644
index 0000000000..c3d8d677b5
--- /dev/null
+++ b/main/beanshell/bsh-2.1.1-src.patch
@@ -0,0 +1,95 @@
+--- misc/BeanShell-2.1.1/build.xml Fri Dec 19 17:14:27 2003
++++ misc/build/BeanShell-2.1.1/build.xml Fri Mar 28 15:55:04 2008
+@@ -10,14 +10,14 @@
+ - Why can't I nest filesets? This seems like it would be so
easy and
+ useful...
+ -->
+-<project name="beanshell" default="compile-all" basedir=".">
++<project name="beanshell" default="jarall" basedir=".">
+
+ <!-- Project Configuration -->
+
+ <property name="file" value=""/>
+
+- <property name="ant.build.javac.target" value="1.6" />
+- <property name="ant.build.javac.source" value="1.6" />
++ <property name="ant.build.javac.target" value="1.8" />
++ <property name="ant.build.javac.source" value="1.8" />
+ <property name="version" value="2.1.1"/>
+ <property name="deprecation" value="on"/>
+ <property name="Specification-Title" value="BeanShell" />
+@@ -178,8 +178,8 @@
+ debug="on"
+ includes="**/*.java"
+ excludes="${excludes},**/bak/**"
+- source="1.6"
+- target="1.6"
++ source="1.8"
++ target="1.8"
+ >
+ <classpath>
+ <fileset refid="lib-fileset"/>
+@@ -213,8 +213,8 @@
+ debug="on"
+ includes="**/*.java"
+ excludes="${excludes},**/bak/**"
+- source="1.6"
+- target="1.6"
++ source="1.8"
++ target="1.8"
+ >
+ <classpath>
+ <fileset refid="lib-fileset"/>
+@@ -255,7 +255,7 @@
+ destdir="${javadoc-dir}"
+ author="true"
+ version="true"
+- source="1.6"
++ source="1.8"
+ use="true"
+ windowtitle="BeanShell ${version}"
+ doctitle="<h1>BeanShell ${version}<h1>"
+@@ -680,8 +680,8 @@
+ destdir="${build-dir}"
+ debug="on"
+ debuglevel="lines,vars,source"
+- source="1.6"
+- target="1.6"
++ source="1.8"
++ target="1.8"
+ >
+ <classpath>
+ <path refid="test-classpath"/>
+--- misc/BeanShell-2.1.1/makefile.mk Fri Mar 28 15:56:40 2008
++++ misc/build/BeanShell-2.1.1/makefile.mk Fri Mar 28 15:56:06 2008
+@@ -1 +1,29 @@
+-dummy
++#**************************************************************
++#
++# Licensed to the Apache Software Foundation (ASF) under one
++# or more contributor license agreements. See the NOTICE file
++# distributed with this work for additional information
++# regarding copyright ownership. The ASF licenses this file
++# to you under the Apache License, Version 2.0 (the
++# "License"); you may not use this file except in compliance
++# with the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing,
++# software distributed under the License is distributed on an
++# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# KIND, either express or implied. See the License for the
++# specific language governing permissions and limitations
++# under the License.
++#
++#**************************************************************
++
++PRJ=..$/..$/..$/..
++PRJNAME=ooo_beanshell
++TARGET=jarall
++
++.INCLUDE : ant.mk
++
++ALLTAR : ANTBUILD
++
diff --git a/main/beanshell/makefile.mk b/main/beanshell/makefile.mk
index 0ed772718b..2d9c472cdd 100644
--- a/main/beanshell/makefile.mk
+++ b/main/beanshell/makefile.mk
@@ -44,10 +44,10 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=bsh-2.1.0-src
-TARFILE_MD5=34c726044fc4e2c7c3cf489fc239cdd5
-TARFILE_ROOTDIR=BeanShell-2.1.0
-PATCH_FILES=bsh-2.1.0-src.patch
+TARFILE_NAME=bsh-2.1.1-src
+TARFILE_MD5=f75fbfe6d5ce3568704f89ec5c3b34a7
+TARFILE_ROOTDIR=BeanShell-2.1.1
+PATCH_FILES=bsh-2.1.1-src.patch
ADDITIONAL_FILES=makefile.mk
diff --git a/main/beanshell/prj/d.lst b/main/beanshell/prj/d.lst
index db570fb65b..7e8d69092d 100644
--- a/main/beanshell/prj/d.lst
+++ b/main/beanshell/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\misc\build\BeanShell-2.1.0\dist\bsh-2.1.0.jar
%_DEST%\bin%_EXT%\bsh.jar
+..\%__SRC%\misc\build\BeanShell-2.1.1\dist\bsh-2.1.1.jar
%_DEST%\bin%_EXT%\bsh.jar
diff --git a/main/external_deps.lst b/main/external_deps.lst
index 598f097564..c0a9dc0b26 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -255,9 +255,9 @@ if (RAT_JAR_HOME==BUILD)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SOLAR_JAVA==TRUE && SYSTEM_BSH!=YES)
- MD5 = 34c726044fc4e2c7c3cf489fc239cdd5
- name = bsh-2.1.0-src.zip
- URL1 =
https://github.com/beanshell/beanshell/releases/download/2.1.0/$(name)
+ MD5 = f75fbfe6d5ce3568704f89ec5c3b34a7
+ name = bsh-2.1.1-src.zip
+ URL1 =
https://github.com/beanshell/beanshell/releases/download/2.1.1/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
###############################################################################
