You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by st...@apache.org on 2026/02/10 11:19:53 UTC
(johnzon) branch johnzon-1.2.x updated (c77759f0 -> 615f31fc)
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a change to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
from c77759f0 JOHNZON-421 JsonbSerializer crashes when using primitives
new 7c4b4d14 JOHNZON-421 whoops checked in too early. need to fix imports
new 615f31fc JOHNZON-422 MapperConverterExceptionsTest fails on Windodws due to wrong line break
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/johnzon/jsonb/ExceptionAsserts.java | 2 +-
.../jsonb/serializer/SerialiseAsPrimitiveTest.java | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
(johnzon) 01/02: JOHNZON-421 whoops checked in too early. need to fix imports
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 7c4b4d1424c9edd61975211dba640c80288c7573
Author: Mark Struberg <st...@apache.org>
AuthorDate: Tue Feb 10 12:18:56 2026 +0100
JOHNZON-421 whoops checked in too early. need to fix imports
---
.../jsonb/serializer/SerialiseAsPrimitiveTest.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/serializer/SerialiseAsPrimitiveTest.java b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/serializer/SerialiseAsPrimitiveTest.java
index 8c2a1a63..df744992 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/serializer/SerialiseAsPrimitiveTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/serializer/SerialiseAsPrimitiveTest.java
@@ -20,16 +20,16 @@ import java.lang.reflect.Type;
import org.junit.Test;
-import jakarta.json.bind.Jsonb;
-import jakarta.json.bind.JsonbBuilder;
-import jakarta.json.bind.annotation.JsonbTypeDeserializer;
-import jakarta.json.bind.annotation.JsonbTypeSerializer;
-import jakarta.json.bind.serializer.DeserializationContext;
-import jakarta.json.bind.serializer.JsonbDeserializer;
-import jakarta.json.bind.serializer.JsonbSerializer;
-import jakarta.json.bind.serializer.SerializationContext;
-import jakarta.json.stream.JsonGenerator;
-import jakarta.json.stream.JsonParser;
+import javax.json.bind.Jsonb;
+import javax.json.bind.JsonbBuilder;
+import javax.json.bind.annotation.JsonbTypeDeserializer;
+import javax.json.bind.annotation.JsonbTypeSerializer;
+import javax.json.bind.serializer.DeserializationContext;
+import javax.json.bind.serializer.JsonbDeserializer;
+import javax.json.bind.serializer.JsonbSerializer;
+import javax.json.bind.serializer.SerializationContext;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonParser;
import static org.junit.Assert.assertTrue;
/**
(johnzon) 02/02: JOHNZON-422 MapperConverterExceptionsTest fails on Windodws due to wrong line break
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 615f31fc6ae719edc508b684b4cb387184823e59
Author: Mark Struberg <st...@apache.org>
AuthorDate: Tue Feb 10 12:19:32 2026 +0100
JOHNZON-422 MapperConverterExceptionsTest fails on Windodws due to wrong line break
---
.../src/test/java/org/apache/johnzon/jsonb/ExceptionAsserts.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/ExceptionAsserts.java b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/ExceptionAsserts.java
index 777ea0b8..e715ecae 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/ExceptionAsserts.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/ExceptionAsserts.java
@@ -62,7 +62,7 @@ public class ExceptionAsserts {
}
public ExceptionAsserts assertMessage(final String expected) {
- assertEquals(expected, throwable.getMessage());
+ assertEquals(expected.replace("\r\n", "\n"), throwable.getMessage().replace("\r\n", "\n"));
return this;
}