Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 1 commit into
base: 7.5
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ...t-logging-impl/src/main/java/stroom/event/logging/impl/StroomEventLoggingServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
3 changes: 1 addition & 2 deletions ...-proxy/stroom-proxy-app/src/test/java/stroom/proxy/app/event/TestSchemaEventResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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");
Expand Down
Loading