Skip to content

Commit 7e7701b

Browse files
jansupolsenivam
jansupol
authored and
senivam
committed
Adopt parsson
Signed-off-by: jansupol <[email protected]>
1 parent 3031506 commit 7e7701b

File tree

9 files changed

+38
-44
lines changed

9 files changed

+38
-44
lines changed

‎bundles/jaxrs-ri/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,9 @@
278278
jersey.repackaged.org.objectweb.asm.*;version=${project.version}
279279
</Export-Package>
280280
<Import-Package><![CDATA[
281-
jakarta.servlet.annotation.*;resolution:=optional;version="[5.0,6.0)",
282-
jakarta.servlet.descriptor.*;resolution:=optional;version="[5.0,6.0)",
283-
jakarta.servlet.*;version="[5.0,6.0)",
281+
jakarta.servlet.annotation.*;resolution:=optional;version="[5.0,7.0)",
282+
jakarta.servlet.descriptor.*;resolution:=optional;version="[5.0,7.0)",
283+
jakarta.servlet.*;version="[5.0,7.0)",
284284
${jakarta.annotation.osgi.version},
285285
jakarta.persistence.*;resolution:=optional,
286286
jakarta.validation.*;resolution:=optional;version="[3,4)",

‎ext/microprofile/mp-rest-client/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,15 @@
7878
<dependency>
7979
<groupId>jakarta.json</groupId>
8080
<artifactId>jakarta.json-api</artifactId>
81-
<version>${jsonp.ri.version}</version>
8281
</dependency>
8382
<dependency>
8483
<groupId>jakarta.enterprise</groupId>
8584
<artifactId>jakarta.enterprise.cdi-api</artifactId>
8685
<scope>provided</scope>
8786
</dependency>
8887
<dependency>
89-
<groupId>org.glassfish</groupId>
90-
<artifactId>jsonp-jaxrs</artifactId>
88+
<groupId>org.eclipse.parsson</groupId>
89+
<artifactId>parsson-media</artifactId>
9190
</dependency>
9291
<dependency>
9392
<groupId>org.reactivestreams</groupId>

‎media/json-binding/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@
7878
<artifactId>jakarta.json.bind-api</artifactId>
7979
</dependency>
8080
<dependency>
81-
<groupId>org.glassfish</groupId>
82-
<artifactId>jakarta.json</artifactId>
83-
<classifier>module</classifier>
81+
<groupId>org.eclipse.parsson</groupId>
82+
<artifactId>parsson</artifactId>
8483
</dependency>
8584

8685
<dependency>

‎media/json-processing/pom.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@
5757
<!-- TODO: change to ${range;[==,+);${jsonp.api.version}} once the version is final-->
5858
<Import-Package>
5959
${jakarta.annotation.osgi.version},
60-
jakarta.json.*;version="[0,3)",
61-
org.glassfish.json.*;version="[0,3)",
60+
jakarta.json.*;version="[2,3)",
6261
*
6362
</Import-Package>
6463
</instructions>
@@ -81,13 +80,12 @@
8180
<artifactId>jakarta.json-api</artifactId>
8281
</dependency>
8382
<dependency>
84-
<groupId>org.glassfish</groupId>
85-
<artifactId>jakarta.json</artifactId>
86-
<classifier>module</classifier>
83+
<groupId>org.eclipse.parsson</groupId>
84+
<artifactId>parsson</artifactId>
8785
</dependency>
8886
<dependency>
89-
<groupId>org.glassfish</groupId>
90-
<artifactId>jsonp-jaxrs</artifactId>
87+
<groupId>org.eclipse.parsson</groupId>
88+
<artifactId>parsson-media</artifactId>
9189
</dependency>
9290

9391
<dependency>

‎media/json-processing/src/main/java/org/glassfish/jersey/jsonp/JsonProcessingFeature.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,10 +20,11 @@
2020
import jakarta.ws.rs.core.Feature;
2121
import jakarta.ws.rs.core.FeatureContext;
2222

23+
import org.eclipse.parsson.media.JsonValueBodyReader;
24+
import org.eclipse.parsson.media.JsonValueBodyWriter;
25+
2326
import org.glassfish.jersey.CommonProperties;
2427

25-
import org.glassfish.json.jaxrs.JsonValueBodyReader;
26-
import org.glassfish.json.jaxrs.JsonValueBodyWriter;
2728

2829
/**
2930
* {@link Feature} used to register JSON-P providers.

‎media/moxy/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,8 @@
101101
<artifactId>jakarta.json.bind-api</artifactId>
102102
</dependency>
103103
<dependency>
104-
<groupId>org.glassfish</groupId>
105-
<artifactId>jakarta.json</artifactId>
106-
<classifier>module</classifier>
104+
<groupId>org.eclipse.parsson</groupId>
105+
<artifactId>parsson</artifactId>
107106
</dependency>
108107

109108
<dependency>

‎pom.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1816,14 +1816,13 @@
18161816
<version>${jakarta.jsonp.version}</version>
18171817
</dependency>
18181818
<dependency>
1819-
<groupId>org.glassfish</groupId>
1820-
<artifactId>jakarta.json</artifactId>
1821-
<classifier>module</classifier>
1819+
<groupId>org.eclipse.parsson</groupId>
1820+
<artifactId>parsson</artifactId>
18221821
<version>${jsonp.ri.version}</version>
18231822
</dependency>
18241823
<dependency>
1825-
<groupId>org.glassfish</groupId>
1826-
<artifactId>jsonp-jaxrs</artifactId>
1824+
<groupId>org.eclipse.parsson</groupId>
1825+
<artifactId>parsson-media</artifactId>
18271826
<version>${jsonp.jaxrs.version}</version>
18281827
</dependency>
18291828

@@ -2141,7 +2140,7 @@
21412140
<jakarta.annotation.version>2.0.0</jakarta.annotation.version>
21422141
<jakarta.inject.version>2.0.1</jakarta.inject.version>
21432142
<jakarta.interceptor.version>2.0.0</jakarta.interceptor.version>
2144-
<jakarta.jsonp.version>2.0.1</jakarta.jsonp.version>
2143+
<jakarta.jsonp.version>2.1.0</jakarta.jsonp.version>
21452144
<jakarta.persistence.version>3.0.0</jakarta.persistence.version>
21462145
<jakarta.validation.api.version>3.0.1</jakarta.validation.api.version>
21472146
<jakarta.jaxb.api.version>3.0.1</jakarta.jaxb.api.version>
@@ -2152,8 +2151,8 @@
21522151
<jetty.plugin.version>11.0.7</jetty.plugin.version>
21532152
<jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
21542153
<jsonb.api.version>2.0.0</jsonb.api.version>
2155-
<jsonp.ri.version>2.0.1</jsonp.ri.version>
2156-
<jsonp.jaxrs.version>2.0.1</jsonp.jaxrs.version>
2154+
<jsonp.ri.version>1.0.0</jsonp.ri.version>
2155+
<jsonp.jaxrs.version>1.0.0</jsonp.jaxrs.version>
21572156
<moxy.version>3.0.2</moxy.version>
21582157
<yasson.version>2.0.3</yasson.version>
21592158
<!-- END of Jakartified -->

‎tests/osgi/functional/pom.xml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,11 @@
212212
<scope>test</scope>
213213
<version>${httpclient.version}</version>
214214
</dependency>
215-
216-
<!-- <dependency>-->
217-
<!-- <groupId>org.glassfish.jersey.media</groupId>-->
218-
<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
219-
<!-- <scope>test</scope>-->
220-
<!-- </dependency>-->
215+
<dependency>
216+
<groupId>org.glassfish.jersey.media</groupId>
217+
<artifactId>jersey-media-json-jackson</artifactId>
218+
<scope>test</scope>
219+
</dependency>
221220
<dependency>
222221
<groupId>org.glassfish.jersey.media</groupId>
223222
<artifactId>jersey-media-json-jettison</artifactId>
@@ -314,14 +313,13 @@
314313
<artifactId>jakarta.json-api</artifactId>
315314
</dependency>
316315
<dependency>
317-
<groupId>org.glassfish</groupId>
318-
<artifactId>jakarta.json</artifactId>
319-
<classifier>module</classifier>
316+
<groupId>org.eclipse.parsson</groupId>
317+
<artifactId>parsson</artifactId>
320318
<scope>test</scope>
321319
</dependency>
322320
<dependency>
323-
<groupId>org.glassfish</groupId>
324-
<artifactId>jsonp-jaxrs</artifactId>
321+
<groupId>org.eclipse.parsson</groupId>
322+
<artifactId>parsson-media</artifactId>
325323
<scope>test</scope>
326324
</dependency>
327325
<dependency>

‎tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -69,8 +69,9 @@ public static Option[] configuration() {
6969
// JSON processing.
7070
mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-json-processing")
7171
.versionAsInProject(),
72-
mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject(),
73-
mavenBundle().groupId("org.glassfish").artifactId("jsonp-jaxrs").versionAsInProject()
72+
mavenBundle().groupId("jakarta.json").artifactId("jakarta.json-api").versionAsInProject(),
73+
mavenBundle().groupId("org.eclipse.parsson").artifactId("parsson").versionAsInProject(),
74+
mavenBundle().groupId("org.eclipse.parsson").artifactId("parsson-media").versionAsInProject()
7475
));
7576

7677
options = Helper.addPaxExamMavenLocalRepositoryProperty(options);

0 commit comments

Comments
 (0)