From d9ea6b1f9cc64b88d66b4b9a0d3797b350953ca9 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 25 Feb 2020 14:14:34 +0000
Subject: [PATCH] rrd4j patch (ticket #2684) So that DejaVu fonts are not
 required in the classpath. We set the default font to Monospaced. All fonts
 are then set in SummaryRenderer.

---
 apps/jrobin/java/src/org/rrd4j/graph/RrdGraphConstants.java | 3 +++
 history.txt                                                 | 3 +++
 router/java/src/net/i2p/router/RouterVersion.java           | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/jrobin/java/src/org/rrd4j/graph/RrdGraphConstants.java b/apps/jrobin/java/src/org/rrd4j/graph/RrdGraphConstants.java
index 04d088ddf..c27f7adea 100644
--- a/apps/jrobin/java/src/org/rrd4j/graph/RrdGraphConstants.java
+++ b/apps/jrobin/java/src/org/rrd4j/graph/RrdGraphConstants.java
@@ -277,6 +277,7 @@ public interface RrdGraphConstants {
          * @return a new {@link java.awt.Font} instance
          */
         public static Font getFont(int type, int size) {
+/*
             String fontPath;
             if (type == Font.BOLD)
                 fontPath = "/DejaVuSansMono-Bold.ttf";
@@ -288,6 +289,8 @@ public interface RrdGraphConstants {
             } catch (FontFormatException | IOException e) {
                 throw new RuntimeException(e);
             }
+*/
+            return new Font("Monospaced", type, size);
         }
     }
 
diff --git a/history.txt b/history.txt
index 4cf885ebe..2273d91db 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2020-02-25 zzz
+ * Replace jrobin with rrd4j 3.5 (ticket #2684)
+
 * 2020-02-25 0.9.45 released
 
 2020-02-21 zzz
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a411b0099..87e5bffca 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
 
     /** for example "-test" */
     public final static String EXTRA = "";