Compare commits

..

No commits in common. "52de5bdbdbd311f4c3bd4f815d67b2fe88ccf83d" and "fba1d197dbe8839db4ea9e1361485df6de698bc7" have entirely different histories.

2 changed files with 8 additions and 4 deletions

View file

@ -172,7 +172,6 @@ tasks.register('processSource', Sync) {
line -> line
.replaceAll('__builddate__', new Date().format("d MMM yyyy"))
.replaceAll('__commithash__', gitOutput.toString().trim())
.replaceAll('__version__', version)
} into "${project.buildDir}/src"
}

View file

@ -36,7 +36,7 @@ import helma.util.ResourceProperties;
*/
public class Server implements Runnable {
// version string
public static final String version = "__version__";
public static final String version = "🐜";
// build date
public static final String buildDate = "__builddate__";
@ -151,8 +151,13 @@ public class Server implements Runnable {
public static void checkJavaVersion() {
String javaVersion = System.getProperty("java.version");
if ((javaVersion == null) || !javaVersion.startsWith("11")) {
System.err.println("This version of Helma requires Java 11 or greater.");
if ((javaVersion == null) || javaVersion.startsWith("1.5")
|| javaVersion.startsWith("1.4")
|| javaVersion.startsWith("1.3")
|| javaVersion.startsWith("1.2")
|| javaVersion.startsWith("1.1")
|| javaVersion.startsWith("1.0")) {
System.err.println("This version of Helma requires Java 1.6 or greater.");
if (javaVersion == null) { // don't think this will ever happen, but you never know
System.err.println("Your Java Runtime did not provide a version number. Please update to a more recent version.");