diff --git a/LICENSE.txt b/LICENSE.txt index c48b335163..06a2162ce2 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -179,7 +179,8 @@ Launchers: Copyright (c) 2002-2018 EPFL, Lausanne / Lightbend, Inc. , unless otherwise specified. See licenses/LICENSE-Scala.md -Java Service Wrapper Community Edition 32-bit 3.5.39: +Java Service Wrapper Community Edition 3.5.39: + (Windows: 3.5.25) (not included in most distribution packages) Copyright (C) 1999-2019 Tanuki Software, Ltd. All Rights Reserved. See licenses/LICENSE-Wrapper.txt diff --git a/core/java/src/net/i2p/time/BuildTime.java b/core/java/src/net/i2p/time/BuildTime.java index 42292e34f0..a827380bff 100644 --- a/core/java/src/net/i2p/time/BuildTime.java +++ b/core/java/src/net/i2p/time/BuildTime.java @@ -34,10 +34,10 @@ public class BuildTime { private static final long _latestTime; private static final long YEARS_25 = 25L*365*24*60*60*1000; /** update this periodically */ - private static final String EARLIEST = "2019-08-17 12:00:00 UTC"; + private static final String EARLIEST = "2019-11-25 12:00:00 UTC"; // fallback if parse fails ticket #1976 // date -d 201x-xx-xx +%s - private static final long EARLIEST_LONG = 1566014400 * 1000L; + private static final long EARLIEST_LONG = 1574658000 * 1000L; static { // this is the standard format of build.timestamp as set in the top-level build.xml diff --git a/installer/resources/GeoLite2-Country.mmdb.gz b/installer/resources/GeoLite2-Country.mmdb.gz index ea840df270..984cea960d 100644 Binary files a/installer/resources/GeoLite2-Country.mmdb.gz and b/installer/resources/GeoLite2-Country.mmdb.gz differ diff --git a/installer/resources/blocklist.txt b/installer/resources/blocklist.txt index 9a09b2d925..1f863ef65c 100644 --- a/installer/resources/blocklist.txt +++ b/installer/resources/blocklist.txt @@ -106,6 +106,7 @@ Sybil:150.95.134.159 Sybil:150.95.144.95 Sybil:150.95.147.89 Sybil:150.95.153.220 +Sybil:160.36.130.0/24 Sybil:163.44.149.31 Sybil:2001;df6;b800;1128;a163;44;149;310 Sybil:2001;19f0;4400;4376;5400;ff;fe47;bcbd diff --git a/installer/resources/checklist.md b/installer/resources/checklist.md index 725423821d..36cdecae87 100644 --- a/installer/resources/checklist.md +++ b/installer/resources/checklist.md @@ -31,7 +31,8 @@ - Trial Debian build: Build and test a preliminary Debian build with 'ant debian' and fix any issues -- Javadoc test: 'ant javadoc' and 'ant mavenCentral' with an Oracle JDK, fix any issues +- Javadoc test: 'ant javadoc' and 'ant mavenCentral.deps' + with a recent Oracle JDK (12+), and fix any issues. Oracle JDK will error on things that OpenJDK does not!