Merge pull request #101 from i2p/release-0.4.7

I2P-Bote 0.4.7
i2p · Apr 9, 2018 · 9ed3867 · 9ed3867
2 parents 2925170 + ec526cc
commit 9ed3867
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -15,10 +15,10 @@ allprojects {
     }
 }
 
-project.ext.i2pVersion = '0.9.32'
+project.ext.i2pVersion = '0.9.33'
 
 configure([project(':core'), project(':webapp')]) {
-    project.version = '0.4.6'
+    project.version = '0.4.7'
 
     project.afterEvaluate {
         jar {

diff --git a/core/src/main/java/i2p/bote/Configuration.java b/core/src/main/java/i2p/bote/Configuration.java
@@ -130,7 +130,7 @@ public class Configuration implements IdentityConfig {
     private static final int DEFAULT_RELAY_REDUNDANCY = 5;   // lower than the DHT redundancy because only the highest-uptime peers are used for relaying
     private static final int DEFAULT_RELAY_MIN_DELAY = 5;   // in minutes
     private static final int DEFAULT_RELAY_MAX_DELAY = 40;   // in minutes
-    private static final int DEFAULT_NUM_STORE_HOPS = 0;
+    private static final int DEFAULT_NUM_STORE_HOPS = 2;
     private static final String DEFAULT_GATEWAY_DESTINATION = "";
     private static final boolean DEFAULT_GATEWAY_ENABLED = true;
     private static final int DEFAULT_PASSWORD_CACHE_DURATION = 10;   // in minutes

diff --git a/core/src/main/java/i2p/bote/I2PBote.java b/core/src/main/java/i2p/bote/I2PBote.java
@@ -131,7 +131,7 @@
  */
 public class I2PBote implements NetworkStatusSource, EmailFolderManager, MailSender, PasswordVerifier {
     public static final int PROTOCOL_VERSION = 4;
-    private static final String APP_VERSION = "0.4.6";
+    private static final String APP_VERSION = "0.4.7";
     private static final int STARTUP_DELAY = 3;   // the number of minutes to wait before connecting to I2P (this gives the router time to get ready)
     private static volatile I2PBote instance;
 

diff --git a/history.txt b/history.txt
@@ -1,6 +1,12 @@
 I2P-Bote Version History
 ------------------------
 
+0.4.7 (Released on April 9, 2018)
+  * Set default number of relay hops to 2
+  * IMAP and SMTP APIs now start immediately instead of waiting for tunnels
+  * Upgraded IMAP backend
+    * Known bug: attachments may not appear in IMAP
+
 0.4.6 (Released on May 3, 2017)
   * Merged I2P-Bote and Bote Android codebases
   * Migrate plugin to Jetty 9

diff --git a/webapp/build.gradle b/webapp/build.gradle
@@ -53,15 +53,15 @@ precompileJsp.dependsOn compileJava
 compileJspJava.dependsOn precompileJsp
 
 dependencies {
-    jasper 'org.mortbay.jasper:apache-el:8.0.33'
-    jasper 'org.mortbay.jasper:apache-jsp:8.0.33'
+    jasper 'org.mortbay.jasper:apache-el:8.5.23'
+    jasper 'org.mortbay.jasper:apache-jsp:8.5.23'
 
     compile project(':core')
 
     implementation "net.i2p.client:mstreaming:$rootProject.i2pVersion"
 
-    implementation 'org.apache.tomcat:tomcat-jsp-api:8.0.33'
-    implementation 'org.apache.tomcat:tomcat-servlet-api:8.0.33'
+    implementation 'org.apache.tomcat:tomcat-jsp-api:8.5.23'
+    implementation 'org.apache.tomcat:tomcat-servlet-api:8.5.23'
     compile 'org.jfree:jcommon:1.0.23'
     compile 'org.jfree:jfreechart:1.0.19'
     compile 'org.owasp:csrfguard:3.1.0'
@@ -78,7 +78,7 @@ dependencies {
     compile 'org.apache.james:apache-james-mailbox-store:3.0.1'
     compile 'org.apache.james:james-server-protocols-imap4:3.0.1'
 
-    runtime 'net.i2p:servlet-i2p:0.9.30'
+    runtime "net.i2p:servlet-i2p:$rootProject.i2pVersion"
 }
 
 def stringsDir = project.file("$buildDir/strings")