Skip to content

Commit 5cb006b

Browse files
authored
Merge pull request #214 from Cousjava/jakarta-rename
Jakarta package rename from javax
2 parents 5735bb6 + ece3890 commit 5cb006b

File tree

143 files changed

+477
-477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+477
-477
lines changed

api/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
<parent>
2424
<groupId>org.glassfish</groupId>
2525
<artifactId>json</artifactId>
26-
<version>1.2-SNAPSHOT</version>
26+
<version>2.0-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

3030
<groupId>jakarta.json</groupId>
3131
<artifactId>jakarta.json-api</artifactId>
3232
<packaging>bundle</packaging>
33-
<version>1.2-SNAPSHOT</version>
33+
<version>2.0-SNAPSHOT</version>
3434
<name>Jakarta JSON Processing API</name>
3535
<description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description>
3636
<url>https://github.com/eclipse-ee4j/jsonp</url>

api/src/main/java/javax/json/EmptyArray.java renamed to api/src/main/java/jakarta/json/EmptyArray.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
*/
1616

17-
package javax.json;
17+
package jakarta.json;
1818

1919
import java.io.Serializable;
2020
import java.util.AbstractList;

api/src/main/java/javax/json/EmptyObject.java renamed to api/src/main/java/jakarta/json/EmptyObject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
*/
1616

17-
package javax.json;
17+
package jakarta.json;
1818

1919
import java.io.Serializable;
2020
import java.util.AbstractMap;

api/src/main/java/javax/json/Json.java renamed to api/src/main/java/jakarta/json/Json.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
*/
1616

17-
package javax.json;
17+
package jakarta.json;
1818

1919
import java.io.InputStream;
2020
import java.io.OutputStream;
@@ -25,11 +25,11 @@
2525
import java.util.Collection;
2626
import java.util.Map;
2727
import java.util.Optional;
28-
import javax.json.spi.JsonProvider;
29-
import javax.json.stream.JsonGenerator;
30-
import javax.json.stream.JsonGeneratorFactory;
31-
import javax.json.stream.JsonParser;
32-
import javax.json.stream.JsonParserFactory;
28+
import jakarta.json.spi.JsonProvider;
29+
import jakarta.json.stream.JsonGenerator;
30+
import jakarta.json.stream.JsonGeneratorFactory;
31+
import jakarta.json.stream.JsonParser;
32+
import jakarta.json.stream.JsonParserFactory;
3333

3434
/**
3535
* Factory class for creating JSON processing objects.

api/src/main/java/javax/json/JsonArray.java renamed to api/src/main/java/jakarta/json/JsonArray.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
*/
1616

17-
package javax.json;
17+
package jakarta.json;
1818

1919
import java.util.List;
2020
import java.util.function.Function;
@@ -195,7 +195,7 @@ default <T, K extends JsonValue> List<T> getValuesAs(Function<K, T> func) {
195195
/**
196196
* Returns the {@code String} value of {@code JsonString} at the specified
197197
* position in this JSON array values. If {@code JsonString} is found,
198-
* its {@link javax.json.JsonString#getString()} is returned. Otherwise,
198+
* its {@link jakarta.json.JsonString#getString()} is returned. Otherwise,
199199
* the specified default value is returned.
200200
*
201201
* @param index index of the {@code JsonString} value
@@ -221,7 +221,7 @@ default <T, K extends JsonValue> List<T> getValuesAs(Function<K, T> func) {
221221
/**
222222
* Returns the int value of the {@code JsonNumber} at the specified position.
223223
* If the value at that position is a {@code JsonNumber},
224-
* this method returns {@link javax.json.JsonNumber#intValue()}. Otherwise
224+
* this method returns {@link jakarta.json.JsonNumber#intValue()}. Otherwise
225225
* this method returns the specified default value.
226226
*
227227
* @param index index of the {@code JsonNumber} value

api/src/main/java/javax/json/JsonArrayBuilder.java renamed to api/src/main/java/jakarta/json/JsonArrayBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
*/
1616

17-
package javax.json;
17+
package jakarta.json;
1818

1919
import java.math.BigDecimal;
2020
import java.math.BigInteger;
@@ -28,7 +28,7 @@
2828
* <p>Methods in this class can be chained to perform multiple values to
2929
* the array.</p>
3030
*
31-
* <p>The class {@link javax.json.Json} contains methods to create the builder
31+
* <p>The class {@link jakarta.json.Json} contains methods to create the builder
3232
* object. The example code below shows how to build an empty {@code JsonArray}
3333
* instance.
3434
* <pre>

api/src/main/java/javax/json/JsonBuilderFactory.java renamed to api/src/main/java/jakarta/json/JsonBuilderFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
*/
1616

17-
package javax.json;
17+
package jakarta.json;
1818

1919
import java.util.Collection;
2020
import java.util.Map;

api/src/main/java/javax/json/JsonException.java renamed to api/src/main/java/jakarta/json/JsonException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
*/
1616

17-
package javax.json;
17+
package jakarta.json;
1818

1919
/**
2020
* <code>JsonException</code> indicates that some exception happened during

api/src/main/java/javax/json/JsonMergePatch.java renamed to api/src/main/java/jakarta/json/JsonMergePatch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
*/
1616

17-
package javax.json;
17+
package jakarta.json;
1818

1919
/**
2020
* <p>This interface represents an implementation of a JSON Merge Patch

api/src/main/java/javax/json/JsonNumber.java renamed to api/src/main/java/jakarta/json/JsonNumber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
*/
1616

17-
package javax.json;
17+
package jakarta.json;
1818

1919
import java.math.BigDecimal;
2020
import java.math.BigInteger;

0 commit comments

Comments
 (0)