public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Hans de Goede <hdegoede@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/bsh] epel10: Fix building with Java 17
Date: Wed, 15 Jul 2026 09:36:43 GMT [thread overview]
Message-ID: <178410820360.1.464876712378893148.rpms-bsh-b802988cc26c@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/bsh
Branch : epel10
Commit : b802988cc26cf929953d7ff5ebd5e4d0626e0cb8
Author : Hans de Goede <hdegoede@redhat.com>
Date : 2021-12-02T12:06:57+01:00
Stats : +37/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/bsh/c/b802988cc26cf929953d7ff5ebd5e4d0626e0cb8?branch=epel10
Log:
Fix building with Java 17
---
diff --git a/0000-source-target-1.8.patch b/0000-source-target-1.8.patch
index 87cbb32..5fb7dfd 100644
--- a/0000-source-target-1.8.patch
+++ b/0000-source-target-1.8.patch
@@ -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"
@@ -13,6 +24,17 @@ index 8542245..6179cfa 100644
>
<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"
@@ -22,3 +44,14 @@ index 8542245..6179cfa 100644
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"/>
diff --git a/bsh.spec b/bsh.spec
index 9b753b8..3cc46eb 100644
--- a/bsh.spec
+++ b/bsh.spec
@@ -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
reply other threads:[~2026-07-15 9:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178410820360.1.464876712378893148.rpms-bsh-b802988cc26c@fedoraproject.org \
--to=hdegoede@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox