Uplift event-logging to 6.0-beta.1_schema-v4.1.0

gchq · Jun 20, 2024 · a91f56a · a91f56a
1 parent 36bde48
commit a91f56a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -98,7 +98,7 @@ ext.versions = [
 
         //------Stroom-repos---------------
         //    stroomProxyRepo: 'v5.1-beta.8',
-        eventLogging      : '5.0-beta.31_schema-v4.0-beta.3',
+        eventLogging      : '6.0-beta.1_schema-v4.1.0',
         hadoopCommonShaded: '2.6.4-9',
         hadoopHdfsShaded  : '2.6.4-7',
         stroomStats       : '1.0-alpha.6',
@@ -241,7 +241,7 @@ ext.libs = [
         javassist                           : "org.javassist:javassist", // version controlled by dropwizard-dependencies
         javax_inject__gwt                   : "javax.inject:javax.inject:1",
         jakarta_inject                      : "jakarta.inject:jakarta.inject-api:2.0.1",
-        jaxb_api                            : "jakarta.xml.bind:jakarta.xml.bind-api:4.0.1",
+        jaxb_api                            : "jakarta.xml.bind:jakarta.xml.bind-api:4.0.2",
         jaxb_api__gwt                       : "javax.xml.bind:jaxb-api:2.3.1",//"jakarta.xml.bind:jakarta.xml.bind-api:3.0.1", // Using beta versions of jaxb libs as they resolve the split pkg problem between jaxb-core and jaxb-runtime
         jaxb_impl                           : "com.sun.xml.bind:jaxb-impl:4.0.4",
         //jaxb_impl__gwt                      : "org.glassfish.jaxb:jaxb-runtime:2.3.1",//"com.sun.xml.bind:jaxb-impl:3.0.2",

diff --git a/...t-logging-impl/src/main/java/stroom/event/logging/impl/StroomEventLoggingServiceImpl.java b/...t-logging-impl/src/main/java/stroom/event/logging/impl/StroomEventLoggingServiceImpl.java
@@ -161,7 +161,7 @@ public Event createEvent(final String typeId,
 
         return Event.builder()
                 .withEventTime(EventTime.builder()
-                        .withTimeCreated(new Date())
+                        .withTimeCreated(Instant.now())
                         .build())
                 .withEventSource(EventSource.builder()
                         .withSystem(SystemDetail.builder()

diff --git a/...-proxy/stroom-proxy-app/src/test/java/stroom/proxy/app/event/TestSchemaEventResource.java b/...-proxy/stroom-proxy-app/src/test/java/stroom/proxy/app/event/TestSchemaEventResource.java
@@ -22,7 +22,6 @@
 import org.apache.hc.core5.http.HttpStatus;
 
 import java.time.Instant;
-import java.util.Date;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.LongAdder;
 
@@ -84,7 +83,7 @@ public static void main(final String[] args) {
     private static boolean post(final HttpClient httpClient) {
         try {
             final EventTime eventTime = new EventTime();
-            eventTime.setTimeCreated(Date.from(Instant.now()));
+            eventTime.setTimeCreated(Instant.now());
 
             final User user = new User();
             user.setName("Fred");