diff options
| author | Florian Zschocke <zschocke@gmx.de> | 2019-11-07 19:54:41 +0100 |
|---|---|---|
| committer | Florian Zschocke <florian.zschocke@devolo.de> | 2019-11-07 22:36:25 +0100 |
| commit | 1140536f6d2f97658c97cadb0c9546df8061d541 (patch) | |
| tree | bd8cc26b5bf7ba6a00385f99f9e2563771662545 | |
| parent | c9fe2b18f0f4894b92cae9c89f6b9a79e8aab986 (diff) | |
| download | gitblit-1140536f6d2f97658c97cadb0c9546df8061d541.tar.gz gitblit-1140536f6d2f97658c97cadb0c9546df8061d541.zip | |
Report Java versions used during build and server start.
With three versions about to be supported right now
it is getting more important to know which Java version is
used when building and testing Gitblit, and which Java
version is used to run Gitblit.
So have the Moxie build report the javac version, and the
JVM version that Moxie is running on. These might be
different.
The `GitBlitServer` will print the Java version and vendor,
so that it gets visible if a user would paste a log output
for analysis.
| -rw-r--r-- | build.xml | 7 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/GitBlitServer.java | 4 |
2 files changed, 11 insertions, 0 deletions
@@ -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) { |