eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-23 14:08:40 +00:00
Code Activity

bug4811: renamed commit_date to build_date; copy all properties of version.json into /gwt/status output

Browse Source
This commit is contained in:
Axel Uhl
2021-02-23 23:29:25 +01:00
parent 2adc9df710
commit 2fe9b1a6df
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configuration/buildAndUpdateProduct.sh
+1 -1
View File
@@ -49,7 +49,7 @@ create_version_info_files ()
echo "{
\"commit_id\":\"$HEAD_SHA\",
\"active_branch\":\"$active_branch\",
\"commit_date\":\"$HEAD_DATE\",
\"build_date\":\"$HEAD_DATE\",
\"release\":\"$SIMPLE_VERSION_INFO\"
}" > "${VERSION_JSON}"
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/StatusServlet.java
+2 -5
View File
@@ -52,10 +52,7 @@ public class StatusServlet extends HttpServlet {
result.put("buildversion", ServerInfo.getBuildVersion());
try {
final JSONObject versionAsJson = ServerInfo.getBuildVersionJson();
result.put("commit_id", versionAsJson.get("commit_id"));
result.put("active_branch", versionAsJson.get("active_branch"));
result.put("commit_date", versionAsJson.get("commit_date"));
result.put("release", versionAsJson.get("release"));
result.putAll(versionAsJson);
final long numberOfTrackedRacesToRestore = service.getNumberOfTrackedRacesToRestore();
result.put("numberofracestorestore", numberOfTrackedRacesToRestore);
final int numberOfTrackedRacesRestored = service.getNumberOfTrackedRacesRestored();
@@ -84,4 +81,4 @@ public class StatusServlet extends HttpServlet {
throw new RuntimeException(e);
}
}
}
}