adjustments for Java 11 compatibility

This commit is contained in:
Fabio Valentini 2020-07-20 21:38:46 +02:00
parent 8ba2c233be
commit c218a3c73e
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF
3 changed files with 74 additions and 1 deletions

View File

@ -0,0 +1,35 @@
From 62ea7bb2656177fbb61d94b90d9a526990876cb8 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 20 Jul 2020 21:27:20 +0200
Subject: [PATCH 0/1] source / target 1.8
---
build.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 4f400dc..0d28a7f 100644
--- a/build.xml
+++ b/build.xml
@@ -170,7 +170,8 @@
deprecation="${deprecation}"
optimize="on"
debug="on"
- target="1.5"
+ source="1.8"
+ target="1.8"
includes="**/*.java"
excludes="${excludes},**/bak/**"
>
@@ -213,7 +214,7 @@
destdir="${javadoc-dir}"
author="true"
version="true"
- source="1.5"
+ source="1.8"
use="true"
windowtitle="BeanShell ${version}"
doctitle="&lt;h1&gt;BeanShell ${version}&lt;h1&gt;"
--
2.26.2

View File

@ -0,0 +1,27 @@
From 9b83372c64f30f44bd56696ae6adcbe6a83e1e2f Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 20 Jul 2020 21:28:13 +0200
Subject: [PATCH 1/1] java 11 compatibility
---
src/bsh/util/AWTConsole.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bsh/util/AWTConsole.java b/src/bsh/util/AWTConsole.java
index e88fbff..fbb237b 100644
--- a/src/bsh/util/AWTConsole.java
+++ b/src/bsh/util/AWTConsole.java
@@ -214,8 +214,8 @@ public class AWTConsole extends TextArea
Great. What a piece of crap.
*/
public void setCaretPosition( int pos ) {
- ((java.awt.peer.TextComponentPeer)getPeer()).setCaretPosition(
- pos + countNLs() );
+ //((java.awt.peer.TextComponentPeer)getPeer()).setCaretPosition(
+ // pos + countNLs() );
}
/*
--
2.26.2

View File

@ -33,7 +33,7 @@
Name: bsh Name: bsh
Version: 2.0 Version: 2.0
Release: 17.%{reltag}%{?dist} Release: 18.%{reltag}%{?dist}
Epoch: 0 Epoch: 0
Summary: Lightweight Scripting for Java Summary: Lightweight Scripting for Java
URL: http://www.beanshell.org/ URL: http://www.beanshell.org/
@ -48,6 +48,12 @@ Source1: %{name}-desktop.desktop
# Remove code marked as SUN PROPRIETARY/CONFIDENTAIL # Remove code marked as SUN PROPRIETARY/CONFIDENTAIL
Source2: generate-tarball.sh Source2: generate-tarball.sh
# compatibility with Java 11:
# - set javac / javadoc source and target values to 1.8
Patch0: 0000-source-target-1.8.patch
# - remove references to invisible symbols and methods
Patch1: 0001-java-11-compatibility.patch
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: ant BuildRequires: ant
BuildRequires: bsf BuildRequires: bsf
@ -109,6 +115,8 @@ This package provides %{summary}.
%prep %prep
%setup -q -n beanshell-%{version}%{reltag} %setup -q -n beanshell-%{version}%{reltag}
%patch0 -p1
%patch1 -p1
sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/redirect,' docs/manual/xsl/*.xsl sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/redirect,' docs/manual/xsl/*.xsl
@ -170,6 +178,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
%license LICENSE NOTICE %license LICENSE NOTICE
%changelog %changelog
* Mon Jul 20 2020 Fabio Valentini <decathorpe@gmail.com> - 0:2.0-18.b6
- Make adjustments for Java 11 compatibility.
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.0-17.b6 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.0-17.b6
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11