Compare commits
No commits in common. "52de5bdbdbd311f4c3bd4f815d67b2fe88ccf83d" and "fba1d197dbe8839db4ea9e1361485df6de698bc7" have entirely different histories.
52de5bdbdb
...
fba1d197db
2 changed files with 8 additions and 4 deletions
|
@ -172,7 +172,6 @@ tasks.register('processSource', Sync) {
|
||||||
line -> line
|
line -> line
|
||||||
.replaceAll('__builddate__', new Date().format("d MMM yyyy"))
|
.replaceAll('__builddate__', new Date().format("d MMM yyyy"))
|
||||||
.replaceAll('__commithash__', gitOutput.toString().trim())
|
.replaceAll('__commithash__', gitOutput.toString().trim())
|
||||||
.replaceAll('__version__', version)
|
|
||||||
} into "${project.buildDir}/src"
|
} into "${project.buildDir}/src"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ import helma.util.ResourceProperties;
|
||||||
*/
|
*/
|
||||||
public class Server implements Runnable {
|
public class Server implements Runnable {
|
||||||
// version string
|
// version string
|
||||||
public static final String version = "__version__";
|
public static final String version = "🐜";
|
||||||
|
|
||||||
// build date
|
// build date
|
||||||
public static final String buildDate = "__builddate__";
|
public static final String buildDate = "__builddate__";
|
||||||
|
@ -151,8 +151,13 @@ public class Server implements Runnable {
|
||||||
public static void checkJavaVersion() {
|
public static void checkJavaVersion() {
|
||||||
String javaVersion = System.getProperty("java.version");
|
String javaVersion = System.getProperty("java.version");
|
||||||
|
|
||||||
if ((javaVersion == null) || !javaVersion.startsWith("11")) {
|
if ((javaVersion == null) || javaVersion.startsWith("1.5")
|
||||||
System.err.println("This version of Helma requires Java 11 or greater.");
|
|| 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
|
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.");
|
System.err.println("Your Java Runtime did not provide a version number. Please update to a more recent version.");
|
||||||
|
|
Loading…
Add table
Reference in a new issue