Skip to content

Commit 091bad7

Browse files
committed
Move from yasson to johnzon
1 parent de63cc0 commit 091bad7

File tree

4 files changed

+12
-32
lines changed

4 files changed

+12
-32
lines changed

spring-boot-autoconfigure/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,6 @@
279279
<artifactId>javax-websocket-server-impl</artifactId>
280280
<optional>true</optional>
281281
</dependency>
282-
<dependency>
283-
<groupId>org.glassfish</groupId>
284-
<artifactId>javax.json</artifactId>
285-
<optional>true</optional>
286-
</dependency>
287282
<dependency>
288283
<groupId>io.undertow</groupId>
289284
<artifactId>undertow-servlet</artifactId>
@@ -739,8 +734,8 @@
739734
<scope>test</scope>
740735
</dependency>
741736
<dependency>
742-
<groupId>org.eclipse</groupId>
743-
<artifactId>yasson</artifactId>
737+
<groupId>org.apache.johnzon</groupId>
738+
<artifactId>johnzon-jsonb</artifactId>
744739
<scope>test</scope>
745740
</dependency>
746741
<dependency>

spring-boot-dependencies/pom.xml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@
117117
<jna.version>4.4.0</jna.version>
118118
<joda-time.version>2.9.9</joda-time.version>
119119
<jolokia.version>1.3.7</jolokia.version>
120+
<johnzon-jsonb.version>1.1.2</johnzon-jsonb.version>
120121
<jooq.version>3.9.4</jooq.version>
121122
<jsonassert.version>1.5.0</jsonassert.version>
122-
<javax.json-api.version>1.1</javax.json-api.version>
123123
<javax-jsonb.version>1.0</javax-jsonb.version>
124124
<json-path.version>2.4.0</json-path.version>
125125
<jstl.version>1.2</jstl.version>
@@ -885,11 +885,6 @@
885885
<artifactId>javax.jms-api</artifactId>
886886
<version>${javax-jms.version}</version>
887887
</dependency>
888-
<dependency>
889-
<groupId>org.glassfish</groupId>
890-
<artifactId>javax.json</artifactId>
891-
<version>${javax.json-api.version}</version>
892-
</dependency>
893888
<dependency>
894889
<groupId>javax.json.bind</groupId>
895890
<artifactId>javax.json.bind-api</artifactId>
@@ -1252,6 +1247,11 @@
12521247
<artifactId>httpmime</artifactId>
12531248
<version>${httpclient.version}</version>
12541249
</dependency>
1250+
<dependency>
1251+
<groupId>org.apache.johnzon</groupId>
1252+
<artifactId>johnzon-jsonb</artifactId>
1253+
<version>${johnzon-jsonb.version}</version>
1254+
</dependency>
12551255
<dependency>
12561256
<groupId>org.apache.logging.log4j</groupId>
12571257
<artifactId>log4j-bom</artifactId>
@@ -2454,11 +2454,6 @@
24542454
<artifactId>snakeyaml</artifactId>
24552455
<version>${snakeyaml.version}</version>
24562456
</dependency>
2457-
<dependency>
2458-
<groupId>org.eclipse</groupId>
2459-
<artifactId>yasson</artifactId>
2460-
<version>${javax-jsonb.version}</version>
2461-
</dependency>
24622457
<dependency>
24632458
<groupId>redis.clients</groupId>
24642459
<artifactId>jedis</artifactId>

spring-boot-test-autoconfigure/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,6 @@
6464
<artifactId>htmlunit</artifactId>
6565
<optional>true</optional>
6666
</dependency>
67-
<dependency>
68-
<groupId>org.glassfish</groupId>
69-
<artifactId>javax.json</artifactId>
70-
<optional>true</optional>
71-
</dependency>
7267
<dependency>
7368
<groupId>org.hibernate</groupId>
7469
<artifactId>hibernate-core</artifactId>
@@ -219,8 +214,8 @@
219214
<scope>test</scope>
220215
</dependency>
221216
<dependency>
222-
<groupId>org.eclipse</groupId>
223-
<artifactId>yasson</artifactId>
217+
<groupId>org.apache.johnzon</groupId>
218+
<artifactId>johnzon-jsonb</artifactId>
224219
<scope>test</scope>
225220
</dependency>
226221
<dependency>

spring-boot-test/pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@
7070
<artifactId>assertj-core</artifactId>
7171
<optional>true</optional>
7272
</dependency>
73-
<dependency>
74-
<groupId>org.glassfish</groupId>
75-
<artifactId>javax.json</artifactId>
76-
<optional>true</optional>
77-
</dependency>
7873
<dependency>
7974
<groupId>org.hamcrest</groupId>
8075
<artifactId>hamcrest-core</artifactId>
@@ -153,8 +148,8 @@
153148
<scope>test</scope>
154149
</dependency>
155150
<dependency>
156-
<groupId>org.eclipse</groupId>
157-
<artifactId>yasson</artifactId>
151+
<groupId>org.apache.johnzon</groupId>
152+
<artifactId>johnzon-jsonb</artifactId>
158153
<scope>test</scope>
159154
</dependency>
160155
<dependency>

0 commit comments

Comments
 (0)