diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-02-17 16:12:38 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-02-17 16:12:38 +0200 |
| commit | 2ee893f4c5f182d5b0538c3c6f6ca0af2e6f7950 (patch) | |
| tree | 5a2ab8ff0b91eb0fc3564e7318e409d05a9c5f83 | |
| parent | 70b9da2a6d5fe13ed1880038201337ede9a71dfb (diff) | |
| download | jato-2ee893f4c5f182d5b0538c3c6f6ca0af2e6f7950.tar.gz | |
vm: Fix JVM defined system properties
We advertise Java 1.6 version with "jato -version" but we also need to do that
for JVM defined system properties. This fixes Jenkins early startup
java.lang.UnsupportedClassVersionError exception.
Signed-off-by: Pekka Enberg <penberg@kernel.org>
| -rw-r--r-- | include/vm/java-version.h | 3 | ||||
| -rw-r--r-- | vm/jato.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/vm/java-version.h b/include/vm/java-version.h index 6bb70c21..8272ccf6 100644 --- a/include/vm/java-version.h +++ b/include/vm/java-version.h @@ -4,6 +4,9 @@ #include "vm/jni.h" #define JAVA_VERSION "1.6.0" +#define CLASSFILE_VERSION "50.0" +#define JAVA_SPEC_VERSION "1.6" +#define JAVA_VM_SPEC_VERSION "1.0" #define JNI_VERSION JNI_VERSION_1_6 #endif @@ -256,7 +256,7 @@ struct system_property { static struct system_property system_properties[] = { { "java.vm.name", "jato" }, { "java.vm.vendor", "Pekka Enberg" }, - { "java.vm.vendor.url", "http://jatovm.sourceforge.net/"}, + { "java.vm.vendor.url", "http://www.jatovm.org/" }, { "java.io.tmpdir", "/tmp" }, { "java.home", "/usr" }, { "file.separator", "/" }, @@ -264,14 +264,14 @@ static struct system_property system_properties[] = { { "line.separator", "\n" }, { "java.version", JAVA_VERSION }, { "java.vendor", "GNU Classpath" }, - { "java.vendor.url", "http://www.classpath.org" }, - { "java.vm.specification.version", "1.0" }, + { "java.vendor.url", "http://www.classpath.org/" }, + { "java.vm.specification.version", JAVA_VM_SPEC_VERSION }, { "java.vm.specification.vendor", "Sun Microsystems, Inc." }, { "java.vm.specification.name", "Java Virtual Machine Specification"}, - { "java.specification.version", "1.5" }, + { "java.specification.version", JAVA_SPEC_VERSION }, { "java.specification.vendor", "Sun Microsystems, Inc." }, { "java.specification.name", "Java Platform API Specification"}, - { "java.class.version", "48.0" }, + { "java.class.version", CLASSFILE_VERSION }, { "java.compiler", "jato" }, { "java.ext.dirs", "" }, }; |