Skip to content

Commit 15128cf

Browse files
Changes before error encountered
Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com>
1 parent 396728e commit 15128cf

59 files changed

Lines changed: 141 additions & 139 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package dev.learning.xapi.samples.xapiserver;
66

7-
import com.fasterxml.jackson.databind.JsonNode;
7+
import tools.jackson.databind.JsonNode;
88
import io.hypersistence.utils.hibernate.type.json.JsonType;
99
import jakarta.persistence.Column;
1010
import jakarta.persistence.Entity;

samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
package dev.learning.xapi.samples.xapiserver;
66

7-
import com.fasterxml.jackson.core.JsonProcessingException;
8-
import com.fasterxml.jackson.databind.ObjectMapper;
7+
import tools.jackson.core.JsonProcessingException;
8+
import tools.jackson.databind.ObjectMapper;
99
import dev.learning.xapi.model.Statement;
1010
import dev.learning.xapi.model.StatementResult;
1111
import java.net.URI;

xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package dev.learning.xapi.client;
66

7-
import com.fasterxml.jackson.databind.ObjectMapper;
7+
import tools.jackson.databind.ObjectMapper;
88
import dev.learning.xapi.model.Agent;
99
import java.util.Map;
1010
import java.util.function.Consumer;

xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package dev.learning.xapi.client;
66

7-
import com.fasterxml.jackson.databind.ObjectMapper;
7+
import tools.jackson.databind.ObjectMapper;
88
import dev.learning.xapi.model.Agent;
99
import java.time.Instant;
1010
import java.util.Map;

xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package dev.learning.xapi.client;
66

7-
import com.fasterxml.jackson.databind.ObjectMapper;
7+
import tools.jackson.databind.ObjectMapper;
88
import dev.learning.xapi.model.Agent;
99
import java.util.Map;
1010
import java.util.function.Consumer;

xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package dev.learning.xapi.client;
66

7-
import com.fasterxml.jackson.databind.ObjectMapper;
7+
import tools.jackson.databind.ObjectMapper;
88
import dev.learning.xapi.model.Agent;
99
import dev.learning.xapi.model.StatementFormat;
1010
import dev.learning.xapi.model.Verb;

xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package dev.learning.xapi.client;
66

7-
import com.fasterxml.jackson.databind.ObjectMapper;
7+
import tools.jackson.databind.ObjectMapper;
88
import dev.learning.xapi.model.Agent;
99
import java.net.URI;
1010
import java.util.Map;

xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
package dev.learning.xapi.autoconfigure.model;
66

7-
import com.fasterxml.jackson.databind.DeserializationFeature;
8-
import com.fasterxml.jackson.databind.cfg.CoercionAction;
9-
import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
10-
import com.fasterxml.jackson.databind.type.LogicalType;
7+
import tools.jackson.databind.DeserializationFeature;
8+
import tools.jackson.databind.cfg.CoercionAction;
9+
import tools.jackson.databind.cfg.CoercionInputShape;
10+
import tools.jackson.databind.type.LogicalType;
1111
import dev.learning.xapi.jackson.XapiStrictLocaleModule;
1212
import dev.learning.xapi.jackson.XapiStrictNullValuesModule;
1313
import dev.learning.xapi.jackson.XapiStrictObjectTypeModule;

xapi-model/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,19 @@
3434
</exclusions>
3535
</dependency>
3636
<dependency>
37-
<groupId>com.fasterxml.jackson.core</groupId>
37+
<groupId>tools.jackson.core</groupId>
3838
<artifactId>jackson-databind</artifactId>
39+
<version>3.0.2</version>
3940
</dependency>
4041
<dependency>
4142
<groupId>org.projectlombok</groupId>
4243
<artifactId>lombok</artifactId>
4344
<scope>provided</scope>
4445
</dependency>
4546
<dependency>
46-
<groupId>com.fasterxml.jackson.datatype</groupId>
47+
<groupId>tools.jackson.datatype</groupId>
4748
<artifactId>jackson-datatype-jsr310</artifactId>
49+
<version>3.0.2</version>
4850
</dependency>
4951
<dependency>
5052
<groupId>jakarta.validation</groupId>

xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
package dev.learning.xapi.jackson;
66

7-
import com.fasterxml.jackson.core.JsonGenerator;
8-
import com.fasterxml.jackson.databind.SerializerProvider;
9-
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
7+
import tools.jackson.core.JsonGenerator;
8+
import tools.jackson.databind.SerializerProvider;
9+
import tools.jackson.databind.ser.std.StdSerializer;
1010
import java.io.IOException;
1111
import java.util.Locale;
1212
import java.util.Map;

0 commit comments

Comments
 (0)