rpms/bsh
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix building with Java 17

Browse Source
This commit is contained in:
Hans de Goede 2021-12-02 12:06:57 +01:00
parent 3027811fce
commit b802988cc2
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0000-source-target-1.8.patch
View File

@ -2,6 +2,17 @@ diff --git a/build.xml b/build.xml
index 8542245..6179cfa 100644
--- a/build.xml
+++ b/build.xml
@@ -16,8 +16,8 @@
<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.0"/>
<property name="deprecation" value="on"/>
<property name="Specification-Title" value="BeanShell" />
@@ -178,8 +178,8 @@
debug="on"
includes="**/*.java"
@ -9,6 +20,17 @@ index 8542245..6179cfa 100644
- 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>
@ -22,3 +44,14 @@ index 8542245..6179cfa 100644
use="true"
windowtitle="BeanShell ${version}"
doctitle="&lt;h1&gt;BeanShell ${version}&lt;h1&gt;"
@@ -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"/>

5
bsh.spec
View File

@ -30,7 +30,7 @@
Name: bsh
Version: 2.1.0
Release: 2%{?dist}
Release: 3%{?dist}
Epoch: 0
Summary: Lightweight Scripting for Java
URL: http://www.beanshell.org/
@ -160,6 +160,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
%license LICENSE NOTICE
%changelog
* Thu Dec 2 2021 Hans de Goede <hdegoede@redhat.com> - 0:2.1.0-3
- Fix building with Java 17
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild