Enforce min java version in build.xml

Bump Java version in docs and installer configs
2025-06-03 13:19:53 -04:00 · 2025-06-03 13:10:43 -04:00
9 changed files with 19 additions and 11 deletions
--- a/INSTALL-headless.txt
+++ b/INSTALL-headless.txt
@ -40,7 +40,7 @@ To uninstall I2P:
   rm -rf $I2PInstallDir ~/.i2p

 Supported JVMs:
-  All platforms: Java 1.8 or higher required
+  All platforms: Java 17 or higher required
  Windows: OpenJDK or Oracle from http://java.com/download
  Linux:   OpenJDK or Oracle from http://java.com/download
  FreeBSD: OpenJDK or Oracle from http://java.com/download
--- a/INSTALL.txt
+++ b/INSTALL.txt
@ -1,7 +1,7 @@
 I2P source installation instructions

 Prerequisites to build from source:
-	Java SDK (preferably Oracle or OpenJDK) 8 or higher
+	Java SDK (preferably Oracle or OpenJDK) 17 or higher
          Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
          Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel) require only Java 1.6
 	Apache Ant 1.9.8 or higher
@ -65,7 +65,7 @@ To uninstall I2P:
   rm -rf $I2PInstallDir ~/.i2p

 Supported JVMs:
-  All platforms: Java 1.8 or higher required
+  All platforms: Java 17 or higher required
  Windows: Latest available from http://java.com/download
  Linux:   Latest available from http://java.com/download
  Other operating systems and JVMs: See https://geti2p.net/download
--- a/README.md
+++ b/README.md
@ -27,7 +27,7 @@ To get development branch from source control: [https://geti2p.net/newdevelopers

 ### Prerequisites

- Java SDK (preferably Oracle or OpenJDK) 8 or higher
+- Java SDK (preferably Oracle or OpenJDK) 17 or higher
  - Non-linux operating systems and JVMs: See [https://trac.i2p2.de/wiki/java](https://trac.i2p2.de/wiki/java) 
  - Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel)
    require only Java 6
--- a/README.txt
+++ b/README.txt
@ -1,5 +1,5 @@
 Prerequisites to build from source:
-	Java SDK (preferably Oracle or OpenJDK) 8 or higher
+	Java SDK (preferably Oracle or OpenJDK) 17 or higher
          Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
          Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel) require only Java 6
 	Apache Ant 1.9.8 or higher
--- a/build.xml
+++ b/build.xml
@ -2,8 +2,9 @@
 <project basedir="." default="all" name="i2p"
    xmlns:artifact="antlib:org.apache.maven.artifact.ant">

-    <!-- for javac "release" parameter -->
-    <property name="ant.minimumVersion" value="1.9.8"/>
+    <!-- for javaversion condition -->
+    <property name="ant.minimumVersion" value="1.10.2"/>
+    <property name="java.minimumVersion" value="17"/>

    <!-- Include property files so that values can be easily overridden.
         Users should create an override.properties file to make changes.
@ -432,6 +433,13 @@
    </target>

    <target name="buildProperties" depends="getGitRev, getReleaseNumber, getBuildNumber, setBuildTimestamp, disableManifestClasspath" >
+        <fail message="FATAL: Minimum Java version is ${java.minimumVersion} - your Java version is ${java.version}">
+            <condition>
+                <not>
+                    <javaversion atleast="${java.minimumVersion}"/>
+                </not>
+            </condition>
+        </fail>
        <antversion property="antversion"/>
        <fail message="FATAL: Minimum Ant version is ${ant.minimumVersion} - your Ant version is ${antversion}">
            <condition>
--- a/installer/i2pinstaller.xml
+++ b/installer/i2pinstaller.xml
@ -7,7 +7,7 @@
  <customProcName>false</customProcName>
  <icon>resources/console.ico</icon>
  <jre>
-    <minVersion>1.8.0</minVersion>
+    <minVersion>17</minVersion>
  </jre>
  <!--
  <splash>
--- a/installer/i2pstandalone.xml
+++ b/installer/i2pstandalone.xml
@ -7,7 +7,7 @@
  <customProcName>false</customProcName>
  <icon>resources/start.ico</icon>
  <jre>
-    <minVersion>1.8.0</minVersion>
+    <minVersion>17</minVersion>
    <!--
    <minHeapSize>64</minHeapSize>
    -->
--- a/installer/install.xml
+++ b/installer/install.xml
@ -9,7 +9,7 @@
            <author name="I2P" email="https://geti2p.net/"/>
        </authors>
        <url>https://geti2p.net/</url>
-        <javaversion>1.8</javaversion>
+        <javaversion>17</javaversion>

        <!-- use pack200 compression, saves about 33%
             see http://java.sun.com/j2se/1.5.0/docs/guide/deployment/deployment-guide/pack200.html
--- a/installer/install5.xml
+++ b/installer/install5.xml
@ -15,7 +15,7 @@
            <author name="I2P" email="https://geti2p.net/"/>
        </authors>
        <url>https://geti2p.net/</url>
-        <javaversion>1.8</javaversion>
+        <javaversion>17</javaversion>

        <!-- adding this element will make the installer attempt to launch itself with administrator permissions,
         -->
Author	SHA1	Message	Date
zzz	d0d7d1775f	Enforce min java version in build.xml Some checks failed Java CI / build (push) Has been cancelled Details Java CI / javadoc-latest (push) Has been cancelled Details Java CI / build-java7 (push) Has been cancelled Details Java with IzPack Snapshot Setup / setup (push) Has been cancelled Details Sync Primary Repository to GitHub Mirror / sync (push) Has been cancelled Details	2025-06-03 13:19:53 -04:00
zzz	fa9f1fd07c	Bump Java version in docs and installer configs	2025-06-03 13:10:43 -04:00