Skip to content

Commit

Permalink
switch from obsolete jsonp-jaxrs to parsson media
Browse files Browse the repository at this point in the history
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
lukasj committed May 4, 2022
1 parent 9d0ca2c commit 6e626ca
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions appserver/extras/embedded/all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1327,8 +1327,8 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jsonp-jaxrs</artifactId>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson-media</artifactId>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions appserver/extras/embedded/web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1299,8 +1299,8 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jsonp-jaxrs</artifactId>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson-media</artifactId>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions appserver/featuresets/web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1670,8 +1670,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jsonp-jaxrs</artifactId>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson-media</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand Down
6 changes: 3 additions & 3 deletions appserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<!-- Jakarta JSON -->
<jakarta.jsonp-api.version>2.1.0</jakarta.jsonp-api.version>
<parsson.version>1.1.0</parsson.version>
<jsonp-jaxrs.version>2.0.1</jsonp-jaxrs.version>
<jsonp-jaxrs.version>1.1.0</jsonp-jaxrs.version>
<jakarta.json.bind-api.version>3.0.0</jakarta.json.bind-api.version>
<yasson.version>3.0.0-RC1</yasson.version>

Expand Down Expand Up @@ -438,8 +438,8 @@
<version>${yasson.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jsonp-jaxrs</artifactId>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson-media</artifactId>
<version>${jsonp-jaxrs.version}</version>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/tck/rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@

<tck-setting key="jaxrs_impl_name" value="jersey"/>

<tck-setting key="jaxrs_impl.classes" value="${web.home}/modules/parsson.jar:${web.home}/modules/jakarta.json.bind-api.jar:${web.home}/modules/parrson.jar:${web.home}/modules/jsonp-jaxrs.jar:${web.home}/modules/jersey-client.jar:${web.home}/modules/jersey-common.jar:${web.home}/modules/jersey-server.jar:${web.home}/modules/jersey-container-servlet.jar:${web.home}/modules/jersey-container-servlet-core.jar:${web.home}/modules/jersey-media-jaxb.jar:${web.home}/modules/jersey-media-sse.jar:${web.home}/modules/jersey-hk2.jar:${web.home}/modules/osgi-resource-locator.jar:${web.home}/modules/jakarta.inject-api.jar:${web.home}/modules/guava.jar:${web.home}/modules/hk2-api.jar:${web.home}/modules/hk2-locator.jar:${web.home}/modules/hk2-utils.jar:${web.home}/modules/javassist.jar:${web.home}/modules/cglib.jar:${web.home}/modules/jakarta.annotation-api.jar:${web.home}/modules/jakarta.xml.bind-api.jar:${web.home}/modules/jakarta.activation.jar"/>
<tck-setting key="jaxrs_impl.classes" value="${web.home}/modules/parsson.jar:${web.home}/modules/jakarta.json.bind-api.jar:${web.home}/modules/parrson.jar:${web.home}/modules/parsson-media.jar:${web.home}/modules/jersey-client.jar:${web.home}/modules/jersey-common.jar:${web.home}/modules/jersey-server.jar:${web.home}/modules/jersey-container-servlet.jar:${web.home}/modules/jersey-container-servlet-core.jar:${web.home}/modules/jersey-media-jaxb.jar:${web.home}/modules/jersey-media-sse.jar:${web.home}/modules/jersey-hk2.jar:${web.home}/modules/osgi-resource-locator.jar:${web.home}/modules/jakarta.inject-api.jar:${web.home}/modules/guava.jar:${web.home}/modules/hk2-api.jar:${web.home}/modules/hk2-locator.jar:${web.home}/modules/hk2-utils.jar:${web.home}/modules/javassist.jar:${web.home}/modules/cglib.jar:${web.home}/modules/jakarta.annotation-api.jar:${web.home}/modules/jakarta.xml.bind-api.jar:${web.home}/modules/jakarta.activation.jar"/>
<tck-setting key="jaxrs_impl_lib" value="${web.home}/modules/jersey-container-servlet-core.jar"/>
<tck-setting key="jaxrs.classes" value="${web.home}/modules/jakarta.ws.rs-api.jar"/>
<tck-setting key="servlet_adaptor" value="org/glassfish/jersey/servlet/ServletContainer.class"/>
Expand Down

0 comments on commit 6e626ca

Please sign in to comment.