Commit db2620d0 authored by Emmanuel Bourg's avatar Emmanuel Bourg

Fixed the build failure with Java 9 (Closes: #893122)

parent 90bc51df
cronometer (0.9.9+dfsg-2) UNRELEASED; urgency=medium
* Team upload.
* Fixed the build failure with Java 9 (Closes: #893122)
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
* Use secure Vcs-* URLs
......
......@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Ryan Kavanagh <ryanakca@kubuntu.org>
Build-Depends: debhelper (>= 11), javahelper (>= 0.25)
Build-Depends-Indep: default-jdk,
Build-Depends-Indep: default-jdk (>= 2:1.8),
ant,
libjfreechart-java,
libswingx-java
......@@ -16,7 +16,7 @@ Homepage: http://cronometer.com/download/
Package: cronometer
Architecture: all
Depends: ${java:Depends}, ${misc:Depends},
default-jre | java6-runtime | java7-runtime
default-jre (>= 2.1.8) | java8-runtime
Recommends: ${java:Recommends}
Description: CRON-o-Meter - Exercise and nutrient intake tracker
Easy to use daily nutrient intake tracker that includes nutritional
......
Description: Use java 1.5; 1.4 causes a FTBFS
Author: Ryan Kavanagh <ryanakca@kubuntu.org>
Forwarded: not-needed
Origin: vendor
Last-Update: 2011-10-23
Index: cronometer/build.xml
===================================================================
--- cronometer.orig/build.xml 2011-10-23 11:01:29.521397378 -0400
+++ cronometer/build.xml 2011-10-23 11:02:07.289584660 -0400
@@ -23,7 +23,7 @@
<!-- Compile the java code from ${src} into ${build} -->
<target name="compile" description="compile the source">
- <javac source="1.4" srcdir="${source}" destdir="${build}">
+ <javac source="1.5" srcdir="${source}" destdir="${build}">
<classpath>
<fileset dir="${build}/lib">
<include name="*.jar"/>
Description: Sets the source encoding and replaces sun.misc.BASE64Encoder to fix the build failure with Java 9
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/build.xml
+++ b/build.xml
@@ -23,7 +23,7 @@
<!-- Compile the java code from ${src} into ${build} -->
<target name="compile" description="compile the source">
- <javac source="1.4" srcdir="${source}" destdir="${build}">
+ <javac source="1.4" srcdir="${source}" destdir="${build}" encoding="ISO-8859-1">
<classpath>
<fileset dir="${build}/lib">
<include name="*.jar"/>
--- a/src/ca/spaz/cron/ExportWizard.java
+++ b/src/ca/spaz/cron/ExportWizard.java
@@ -17,7 +17,7 @@
import org.w3c.dom.*;
-import sun.misc.BASE64Encoder;
+import java.util.Base64;
import ca.spaz.cron.datasource.Datasources;
import ca.spaz.cron.datasource.FoodProxy;
import ca.spaz.cron.metrics.Metric;
@@ -111,7 +111,7 @@
private String encodeCredentials() {
try {
- return new BASE64Encoder().encode((username.getText() + '\n' + new String(password.getPassword())).getBytes("UTF-8"));
+ return Base64.getEncoder().encodeToString((username.getText() + '\n' + new String(password.getPassword())).getBytes("UTF-8"));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
01_no_mswin_taskdefs.diff
03_use_java_1.5.diff
05_dont_check_for_updates.diff
06_java9_compatibility.diff
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment