Skip to content

Commit 3994ab2

Browse files
authored
Upgrade jakarta ws rs api to 3.0.0-M1 (#236)
Signed-off-by: tvallin <thibault.vallin@oracle.com>
1 parent 7186d73 commit 3994ab2

File tree

9 files changed

+38
-38
lines changed

9 files changed

+38
-38
lines changed

demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2020 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 Distribution License v. 1.0, which is available at
@@ -11,8 +11,8 @@
1111
package org.glassfish.jsondemos.jaxrs;
1212

1313
import jakarta.json.*;
14-
import javax.ws.rs.*;
15-
import javax.ws.rs.core.MediaType;
14+
import jakarta.ws.rs.*;
15+
import jakarta.ws.rs.core.MediaType;
1616

1717
/**
1818
* JsonArray as parameter and return type for a Jakarta RESTful Web Services resource

demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2020 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 Distribution License v. 1.0, which is available at
@@ -11,8 +11,8 @@
1111
package org.glassfish.jsondemos.jaxrs;
1212

1313
import jakarta.json.stream.JsonGenerator;
14-
import javax.ws.rs.ApplicationPath;
15-
import javax.ws.rs.core.Application;
14+
import jakarta.ws.rs.ApplicationPath;
15+
import jakarta.ws.rs.core.Application;
1616
import java.util.HashMap;
1717
import java.util.HashSet;
1818
import java.util.Map;

demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
import jakarta.json.Json;
1414
import jakarta.json.stream.JsonGenerator;
15-
import javax.ws.rs.GET;
16-
import javax.ws.rs.Path;
17-
import javax.ws.rs.Produces;
18-
import javax.ws.rs.core.MediaType;
19-
import javax.ws.rs.core.StreamingOutput;
15+
import jakarta.ws.rs.GET;
16+
import jakarta.ws.rs.Path;
17+
import jakarta.ws.rs.Produces;
18+
import jakarta.ws.rs.core.MediaType;
19+
import jakarta.ws.rs.core.StreamingOutput;
2020
import java.io.OutputStream;
2121

2222
/**

demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2020 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 Distribution License v. 1.0, which is available at
@@ -11,8 +11,8 @@
1111
package org.glassfish.jsondemos.jaxrs;
1212

1313
import jakarta.json.*;
14-
import javax.ws.rs.*;
15-
import javax.ws.rs.core.MediaType;
14+
import jakarta.ws.rs.*;
15+
import jakarta.ws.rs.core.MediaType;
1616

1717
/**
1818
* JsonObject as parameter and return type for a

demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import jakarta.json.Json;
1414
import jakarta.json.stream.JsonParser;
1515
import jakarta.json.stream.JsonParser.Event;
16-
import javax.ws.rs.GET;
17-
import javax.ws.rs.Path;
18-
import javax.ws.rs.Produces;
19-
import javax.ws.rs.core.StreamingOutput;
16+
import jakarta.ws.rs.GET;
17+
import jakarta.ws.rs.Path;
18+
import jakarta.ws.rs.Produces;
19+
import jakarta.ws.rs.core.StreamingOutput;
2020
import java.io.*;
2121
import java.net.URL;
2222

demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2020 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 Distribution License v. 1.0, which is available at
@@ -11,8 +11,8 @@
1111
package org.glassfish.jsondemos.jaxrs;
1212

1313
import jakarta.json.*;
14-
import javax.ws.rs.*;
15-
import javax.ws.rs.core.MediaType;
14+
import jakarta.ws.rs.*;
15+
import jakarta.ws.rs.core.MediaType;
1616

1717
/**
1818
* JsonStructure as parameter and return type for a

jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2020 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
@@ -24,12 +24,12 @@
2424
import jakarta.json.JsonReader;
2525
import jakarta.json.JsonReaderFactory;
2626
import jakarta.json.JsonValue;
27-
import javax.ws.rs.Consumes;
28-
import javax.ws.rs.WebApplicationException;
29-
import javax.ws.rs.core.MediaType;
30-
import javax.ws.rs.core.MultivaluedMap;
31-
import javax.ws.rs.ext.MessageBodyReader;
32-
import javax.ws.rs.ext.Provider;
27+
import jakarta.ws.rs.Consumes;
28+
import jakarta.ws.rs.WebApplicationException;
29+
import jakarta.ws.rs.core.MediaType;
30+
import jakarta.ws.rs.core.MultivaluedMap;
31+
import jakarta.ws.rs.ext.MessageBodyReader;
32+
import jakarta.ws.rs.ext.Provider;
3333

3434
/**
3535
* Jakarta RESTful Web Services MessageBodyReader for JsonValue.

jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2020 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
@@ -28,14 +28,14 @@
2828
import jakarta.json.JsonWriter;
2929
import jakarta.json.JsonWriterFactory;
3030
import jakarta.json.stream.JsonGenerator;
31-
import javax.ws.rs.Produces;
32-
import javax.ws.rs.WebApplicationException;
33-
import javax.ws.rs.core.Configuration;
34-
import javax.ws.rs.core.Context;
35-
import javax.ws.rs.core.MediaType;
36-
import javax.ws.rs.core.MultivaluedMap;
37-
import javax.ws.rs.ext.MessageBodyWriter;
38-
import javax.ws.rs.ext.Provider;
31+
import jakarta.ws.rs.Produces;
32+
import jakarta.ws.rs.WebApplicationException;
33+
import jakarta.ws.rs.core.Configuration;
34+
import jakarta.ws.rs.core.Context;
35+
import jakarta.ws.rs.core.MediaType;
36+
import jakarta.ws.rs.core.MultivaluedMap;
37+
import jakarta.ws.rs.ext.MessageBodyWriter;
38+
import jakarta.ws.rs.ext.Provider;
3939

4040
/**
4141
* Jakarta RESTful Web Services MessageBodyWriter for JsonValue.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
<dependency>
353353
<groupId>jakarta.ws.rs</groupId>
354354
<artifactId>jakarta.ws.rs-api</artifactId>
355-
<version>2.1.2</version>
355+
<version>3.0.0-M1</version>
356356
<scope>provided</scope>
357357
</dependency>
358358
<dependency>

0 commit comments

Comments
 (0)