This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository avalon-framework.
commit ce8719cbba3f63846f8bda79ca4e800a391c97aa
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Mon Oct 30 22:06:51 2017 +0100
Fixed the build failure with Java 9 (Closes: #872797)
---
debian/build.xml | 6 +++---
debian/changelog | 1 +
debian/patches/01-java5-compatibility.patch | 20 ++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/debian/build.xml b/debian/build.xml
index 98b1971..7933125 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -25,9 +25,9 @@
<target name="compile" depends="prepare">
<javac srcdir="${api.dir}"
- destdir="${build.dir}" debug="true" nowarn="true" source="1.3"
target="1.3"/>
+ destdir="${build.dir}" debug="true" nowarn="true" source="1.7"
target="1.7"/>
<javac srcdir="${impl.dir}"
- destdir="${build.dir}" debug="true" nowarn="true" source="1.3"
target="1.3"/>
+ destdir="${build.dir}" debug="true" nowarn="true" source="1.7"
target="1.7"/>
</target>
<target name="compile-tests" depends="compile">
@@ -44,7 +44,7 @@
</target>
<target name="doc">
- <javadoc destdir="${doc.dir}" source="1.3">
+ <javadoc destdir="${doc.dir}" source="1.7">
<fileset dir="${api.dir}"/>
<fileset dir="${impl.dir}"/>
</javadoc>
diff --git a/debian/changelog b/debian/changelog
index aaf16a3..d81160a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
avalon-framework (4.2.0-10) UNRELEASED; urgency=medium
* Team upload.
+ * Fixed the build failure with Java 9 (Closes: #872797)
* Removed Niels Thykier from the uploaders (Closes: #770574)
* Moved the package to Git
* Standards-Version updated to 4.1.1
diff --git a/debian/patches/01-java5-compatibility.patch
b/debian/patches/01-java5-compatibility.patch
new file mode 100644
index 0000000..d60b3ec
--- /dev/null
+++ b/debian/patches/01-java5-compatibility.patch
@@ -0,0 +1,20 @@
+Description: Fixes the compatibility with Java 5
+Author: Emmanuel Bourg <ebo...@apache.org>
+Forwarded: no
+--- a/api/src/java/org/apache/avalon/framework/Enum.java
++++ b/api/src/java/org/apache/avalon/framework/Enum.java
+@@ -126,11 +126,11 @@
+ if( !(o instanceof Enum) )
+ return false;
+
+- final Enum enum = (Enum)o;
++ final Enum enum_ = (Enum)o;
+
+- if( !getClass().equals( enum.getClass() ) )
++ if( !getClass().equals( enum_.getClass() ) )
+ return false;
+- if( m_name != null ? !m_name.equals( enum.m_name ) : enum.m_name !=
null )
++ if( m_name != null ? !m_name.equals( enum_.m_name ) : enum_.m_name !=
null )
+ return false;
+
+ return true;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7dfa1ca
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-java5-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/avalon-framework.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
