summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.xml7
-rw-r--r--src/main/java/com/gitblit/GitBlitServer.java4
2 files changed, 11 insertions, 0 deletions
diff --git a/build.xml b/build.xml
index 4db5d9f1..8787623b 100644
--- a/build.xml
+++ b/build.xml
@@ -53,6 +53,13 @@
<!-- Download links -->
<property name="gc.url" value="http://dl.bintray.com/gitblit/releases/" />
+
+ <!-- Report Java version -->
+ <echo>JDK version: ${ant.java.version}</echo>
+ <exec executable="javac">
+ <arg value="-version" />
+ </exec>
+ <echo>Java/JVM version: ${java.version}</echo>
</target>
diff --git a/src/main/java/com/gitblit/GitBlitServer.java b/src/main/java/com/gitblit/GitBlitServer.java
index acdc2c26..e006e2c8 100644
--- a/src/main/java/com/gitblit/GitBlitServer.java
+++ b/src/main/java/com/gitblit/GitBlitServer.java
@@ -225,6 +225,10 @@ public class GitBlitServer {
String osversion = System.getProperty("os.version");
logger.info("Running on " + osname + " (" + osversion + ")");
+ String javaversion = System.getProperty("java.version");
+ String javavendor = System.getProperty("java.vendor");
+ logger.info("JVM version " + javaversion + " (" + javavendor + ")");
+
QueuedThreadPool threadPool = new QueuedThreadPool();
int maxThreads = settings.getInteger(Keys.server.threadPoolSize, 50);
if (maxThreads > 0) {