Skip to content

Commit e73490b

Browse files
lukasjlukasj
authored
Update project to use Parsson name (#4)
Signed-off-by: Lukas Jungmann <[email protected]>
1 parent 8ccb5e5 commit e73490b

File tree

120 files changed

+299
-287
lines changed

Some content is hidden

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

120 files changed

+299
-287
lines changed

‎.github/workflows/pr.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#
2+
# Copyright (c) 2021 Contributors to the Eclipse Foundation
3+
#
4+
# This program and the accompanying materials are made available under the
5+
# terms of the Eclipse Public License v. 2.0 which is available at
6+
# http://www.eclipse.org/legal/epl-2.0,
7+
# or the Eclipse Distribution License v. 1.0 which is available at
8+
# http://www.eclipse.org/org/documents/edl-v10.php.
9+
#
10+
# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
#
12+
13+
name: Parsson build
14+
15+
on:
16+
pull_request:
17+
push:
18+
19+
jobs:
20+
build:
21+
name: Test on JDK ${{ matrix.java_version }}
22+
runs-on: ubuntu-latest
23+
24+
strategy:
25+
matrix:
26+
java_version: [ 11, 17-ea ]
27+
28+
steps:
29+
- name: Checkout for build
30+
uses: actions/[email protected]
31+
- name: Set up JDK
32+
uses: actions/setup-java@v2
33+
with:
34+
distribution: 'zulu'
35+
java-version: ${{ matrix.java_version }}
36+
- name: Verify
37+
run: mvn -B -V -U -C -Poss-release clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true

‎README.md

+4-7
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@
1212
[//]: # " "
1313
[//]: # " SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 "
1414

15-
[![Build Status](https://travis-ci.org/eclipse-ee4j/jsonp.svg?branch=master)](https://travis-ci.org/eclipse-ee4j/jsonp)
15+
# Eclipse Parsson
1616

17-
# Jakarta JSON Processing
18-
19-
Jakarta JSON Processing provides portable APIs to parse, generate, transform, and query JSON documents.
20-
This project contains Jakarta JSON Processing specification, API and a compatible implementation.
17+
Eclipse Parsson is an implementation of Jakarta JSON Processing specification.
2118

2219
## Build
2320

@@ -28,7 +25,7 @@ mvn -U -C clean install
2825

2926
## License
3027

31-
* Most of the Jakarta JSON Processing project source code is licensed
28+
* Most of the Eclipse Parsson project source code is licensed
3229
under the [Eclipse Public License (EPL) v2.0](https://projects.eclipse.org/license/epl-2.0)
3330
and [GNU General Public License (GPL) v2 with Classpath Exception](https://www.gnu.org/software/classpath/license.html);
3431
see the license information at the top of each source file.
@@ -49,7 +46,7 @@ the license text included in every source file.
4946

5047
- [Jakarta JSON Processing official web site](https://eclipse-ee4j.github.io/jsonp)
5148
- [Jakarta JSON Processing @ Eclipse](https://projects.eclipse.org/projects/ee4j.jsonp)
52-
- [README.txt](https://github.com/eclipse-ee4j/jsonp/blob/master/bundles/ri/src/main/resources/README.txt)
49+
- [README.txt](https://github.com/eclipse-ee4j/parsson/blob/master/bundles/ri/src/main/resources/README.txt)
5350

5451
## Contributing
5552

‎bundles/ri/pom.xml ‎bundles/dist/pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
23-
<groupId>org.eclipse.jsonp</groupId>
24-
<artifactId>json-bundles</artifactId>
25-
<version>2.0.2-SNAPSHOT</version>
23+
<groupId>org.eclipse.parsson</groupId>
24+
<artifactId>parsson-bundles</artifactId>
25+
<version>1.0.0-SNAPSHOT</version>
2626
</parent>
2727

28-
<artifactId>jakarta.json-ri</artifactId>
29-
<name>RI Distribution zip bundle</name>
28+
<artifactId>parsson-dist</artifactId>
29+
<name>Eclipse Parsson Distribution zip</name>
3030
<packaging>pom</packaging>
3131

3232
<dependencies>
@@ -35,16 +35,16 @@
3535
<artifactId>jakarta.json-api</artifactId>
3636
</dependency>
3737
<dependency>
38-
<groupId>org.eclipse.jsonp</groupId>
39-
<artifactId>jsonp</artifactId>
38+
<groupId>org.eclipse.parsson</groupId>
39+
<artifactId>parsson</artifactId>
4040
</dependency>
4141
<dependency>
42-
<groupId>org.eclipse.jsonp</groupId>
42+
<groupId>org.eclipse.parsson</groupId>
4343
<artifactId>jakarta.json</artifactId>
4444
</dependency>
4545
<dependency>
46-
<groupId>org.eclipse.jsonp</groupId>
47-
<artifactId>jsonp-jaxrs</artifactId>
46+
<groupId>org.eclipse.parsson</groupId>
47+
<artifactId>parsson-media</artifactId>
4848
</dependency>
4949
</dependencies>
5050

‎bundles/ri/src/main/assembly/archive.xml ‎bundles/dist/src/main/assembly/archive.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@
3838
<outputDirectory>mods</outputDirectory>
3939
<includes>
4040
<include>jakarta.json:jakarta.json-api:*</include>
41-
<include>org.eclipse.jsonp:jsonp:*</include>
41+
<include>org.eclipse.parsson:parsson:*</include>
4242
</includes>
4343
</dependencySet>
4444
<dependencySet>
4545
<useProjectArtifact>false</useProjectArtifact>
4646
<outputDirectory>standalone</outputDirectory>
4747
<includes>
48-
<include>org.eclipse.jsonp:jakarta.json:*</include>
48+
<include>org.eclipse.parsson:jakarta.json:*</include>
4949
</includes>
5050
</dependencySet>
5151
<dependencySet>
5252
<useProjectArtifact>false</useProjectArtifact>
53-
<outputDirectory>jaxrs</outputDirectory>
53+
<outputDirectory>media</outputDirectory>
5454
<includes>
55-
<include>org.eclipse.jsonp:jsonp-jaxrs*</include>
55+
<include>org.eclipse.parsson:parsson-media*</include>
5656
</includes>
5757
</dependencySet>
5858
</dependencySets>

‎bundles/ri/src/main/resources/LICENSE.md ‎bundles/dist/src/main/resources/LICENSE.md

File renamed without changes.

‎bundles/ri/src/main/resources/README.txt ‎bundles/dist/src/main/resources/README.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
For running on JPMS, following modules are provided:
22
* mods/jakarta.json-api-${project.version}.jar - 'jakarta.json' module containing only API classes
3-
* mods/jsonp-${project.version}.jar - 'org.eclipse.jsonp' module containing implementation
3+
* mods/parsson-${project.version}.jar - 'org.eclipse.parsson' module containing implementation
44

55
Integration with Jakarta RESTful Web Services:
6-
* jaxrs/jsonp-jaxrs-${project.version}.jar
6+
* media/parsson-media-${project.version}.jar
77

88
* standalone/jakarta.json-${project.version}.jar - 'jakarta.json' module containing API classes and implementation, which serves as a fallback for environments
99
willing to support different implementations of Jakarta JSON Processing API while also providing some default implementation, such as application servers.
10-
When this library is used, then Eclipse JSONP is the default implementation being provided.
10+
When this library is used, then Eclipse Parsson is the default implementation being provided.
1111

1212
NOTE: jakarta.json-api.jar and jakarta.json.jar CAN NOT co-exist together when running on JPMS. One can be used as a drop-in
1313
replacement of the other wrt Jakarta JSON Processing API.
@@ -19,8 +19,8 @@ IMPORTANT NOTE: module names are not yet final and may change in the future rele
1919

2020
for the implementation:
2121
<dependency>
22-
<groupId>org.eclipse.jsonp</groupId>
23-
<artifactId>jsonp</artifactId>
22+
<groupId>org.eclipse.parsson</groupId>
23+
<artifactId>parsson</artifactId>
2424
<version>${project.version}</version>
2525
</dependency>
2626

@@ -33,14 +33,14 @@ for APIs:
3333

3434
for Jakarta RESTful Web Services integration module:
3535
<dependency>
36-
<groupId>org.eclipse.jsonp</groupId>
37-
<artifactId>jsonp-jaxrs</artifactId>
36+
<groupId>org.eclipse.parsson</groupId>
37+
<artifactId>parsson-media</artifactId>
3838
<version>${project.version}</version>
3939
</dependency>
4040

4141
for Jakarta JSON Processing API which uses Eclipse JSONP as a default provider:
4242
<dependency>
43-
<groupId>org.eclipse.jsonp</groupId>
43+
<groupId>org.eclipse.parsson</groupId>
4444
<artifactId>jakarta.json</artifactId>
4545
<version>${project.version}</version>
4646
</dependency>

‎bundles/jakarta.json/pom.xml

+10-11
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,17 @@
2121
<modelVersion>4.0.0</modelVersion>
2222

2323
<parent>
24-
<groupId>org.eclipse.jsonp</groupId>
25-
<artifactId>json-bundles</artifactId>
26-
<version>2.0.2-SNAPSHOT</version>
24+
<groupId>org.eclipse.parsson</groupId>
25+
<artifactId>parsson-bundles</artifactId>
26+
<version>1.0.0-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

30-
<groupId>org.eclipse.jsonp</groupId>
30+
<groupId>org.eclipse.parsson</groupId>
3131
<artifactId>jakarta.json</artifactId>
32-
<version>2.0.2-SNAPSHOT</version>
33-
<name>JSON-P Default Provider</name>
32+
<version>1.0.0-SNAPSHOT</version>
33+
<name>JSON-P with Parsson Provider</name>
3434
<description>Default provider for Jakarta JSON Processing</description>
35-
<url>https://github.com/eclipse-ee4j/jsonp</url>
3635

3736
<dependencies>
3837
<dependency>
@@ -41,8 +40,8 @@
4140
<scope>provided</scope>
4241
</dependency>
4342
<dependency>
44-
<groupId>org.eclipse.jsonp</groupId>
45-
<artifactId>jsonp</artifactId>
43+
<groupId>org.eclipse.parsson</groupId>
44+
<artifactId>parsson</artifactId>
4645
<scope>provided</scope>
4746
</dependency>
4847
</dependencies>
@@ -123,7 +122,7 @@
123122
<replace file="${project.build.directory}/generated-sources/dependencies/jakarta/json/spi/JsonProvider.java">
124123
<replacefilter>
125124
<replacetoken><![CDATA[org.glassfish.json.JsonProviderImpl]]></replacetoken>
126-
<replacevalue><![CDATA[org.eclipse.jsonp.JsonProviderImpl]]></replacevalue>
125+
<replacevalue><![CDATA[org.eclipse.parsson.JsonProviderImpl]]></replacevalue>
127126
</replacefilter>
128127
</replace>
129128
</target>
@@ -177,7 +176,7 @@
177176
<Implementation-Version>${spec.implementation.version}</Implementation-Version>
178177
<Specification-Vendor>Eclipse Foundation</Specification-Vendor>
179178
<Specification-Version>${spec.specification.version}</Specification-Version>
180-
<Export-Package>!org.eclipse.jsonp,*</Export-Package>
179+
<Export-Package>!org.eclipse.parsson,*</Export-Package>
181180
</instructions>
182181
</configuration>
183182
</execution>

‎bundles/jakarta.json/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
exports jakarta.json;
2020
exports jakarta.json.spi;
2121
exports jakarta.json.stream;
22-
exports org.eclipse.jsonp.api;
22+
exports org.eclipse.parsson.api;
2323

2424
uses jakarta.json.spi.JsonProvider;
2525
}

‎bundles/pom.xml

+7-9
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,19 @@
2121
<modelVersion>4.0.0</modelVersion>
2222

2323
<parent>
24-
<groupId>org.eclipse.jsonp</groupId>
25-
<artifactId>json</artifactId>
26-
<version>2.0.2-SNAPSHOT</version>
24+
<groupId>org.eclipse.parsson</groupId>
25+
<artifactId>project</artifactId>
26+
<version>1.0.0-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

30-
<groupId>org.eclipse.jsonp</groupId>
31-
<artifactId>json-bundles</artifactId>
30+
<groupId>org.eclipse.parsson</groupId>
31+
<artifactId>parsson-bundles</artifactId>
3232
<packaging>pom</packaging>
33-
<name>Jakarta JSON Processing bundles</name>
34-
<description>Jakarta JSON Processing bundles</description>
35-
<url>https://github.com/eclipse-ee4j/jsonp</url>
33+
<name>Eclipse Parsson bundles</name>
3634

3735
<modules>
3836
<module>jakarta.json</module>
39-
<module>ri</module>
37+
<module>dist</module>
4038
</modules>
4139
</project>

‎demos/customprovider-jdk9/pom.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
<modelVersion>4.0.0</modelVersion>
1515

1616
<parent>
17-
<groupId>org.eclipse.jsonp</groupId>
17+
<groupId>org.eclipse.parsson</groupId>
1818
<artifactId>demos</artifactId>
19-
<version>2.0.2-SNAPSHOT</version>
19+
<version>1.0.0-SNAPSHOT</version>
2020
<relativePath>../pom.xml</relativePath>
2121
</parent>
2222

23-
<url>http://maven.apache.org</url>
2423
<artifactId>customprovider-jdk9</artifactId>
2524

2625
<name>customprovider-jdk9</name>
@@ -63,7 +62,7 @@
6362
<configuration>
6463
<argLine>
6564
--module-path ${project.build.directory}/classes:${mod.dir}:${project.build.directory}/test-classes
66-
--add-modules org.eclipse.jsonp.demos.customprovider
65+
--add-modules org.eclipse.parsson.demos.customprovider
6766
</argLine>
6867
</configuration>
6968
</plugin>

‎demos/customprovider-jdk9/src/main/java/module-info.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* SPDX-License-Identifier: BSD-3-Clause
99
*/
1010

11-
module org.eclipse.jsonp.demos.customprovider {
11+
module org.eclipse.parsson.demos.customprovider {
1212
requires transitive jakarta.json;
13-
exports org.eclipse.jsonp.demos.customprovider;
14-
provides jakarta.json.spi.JsonProvider with org.eclipse.jsonp.demos.customprovider.TestProvider;
13+
exports org.eclipse.parsson.demos.customprovider;
14+
provides jakarta.json.spi.JsonProvider with org.eclipse.parsson.demos.customprovider.TestProvider;
1515
}

‎demos/customprovider-jdk9/src/main/java/org/eclipse/jsonp/demos/customprovider/TestGenerator.java ‎demos/customprovider-jdk9/src/main/java/org/eclipse/parsson/demos/customprovider/TestGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* SPDX-License-Identifier: BSD-3-Clause
99
*/
1010

11-
package org.eclipse.jsonp.demos.customprovider;
11+
package org.eclipse.parsson.demos.customprovider;
1212

1313
import jakarta.json.JsonException;
1414
import jakarta.json.JsonValue;

‎demos/customprovider-jdk9/src/main/java/org/eclipse/jsonp/demos/customprovider/TestProvider.java ‎demos/customprovider-jdk9/src/main/java/org/eclipse/parsson/demos/customprovider/TestProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* SPDX-License-Identifier: BSD-3-Clause
99
*/
1010

11-
package org.eclipse.jsonp.demos.customprovider;
11+
package org.eclipse.parsson.demos.customprovider;
1212

1313
import jakarta.json.spi.JsonProvider;
1414
import jakarta.json.stream.JsonGenerator;

‎demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import jakarta.json.Json;
1414
import jakarta.json.stream.JsonGenerator;
15-
import org.eclipse.jsonp.demos.customprovider.TestGenerator;
15+
import org.eclipse.parsson.demos.customprovider.TestGenerator;
1616
import org.junit.Assert;
1717
import org.junit.Test;
1818

‎demos/facebook/pom.xml

+6-7
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,26 @@
1414
<modelVersion>4.0.0</modelVersion>
1515

1616
<parent>
17-
<groupId>org.eclipse.jsonp</groupId>
17+
<groupId>org.eclipse.parsson</groupId>
1818
<artifactId>demos</artifactId>
19-
<version>2.0.2-SNAPSHOT</version>
19+
<version>1.0.0-SNAPSHOT</version>
2020
<relativePath>../pom.xml</relativePath>
2121
</parent>
2222

2323
<packaging>jar</packaging>
24-
<url>http://maven.apache.org</url>
2524
<artifactId>jsondemos-facebook</artifactId>
2625

2726
<properties>
28-
<main.class>org.eclipse.jsonp.demos.facebook.FacebookObjectSearch</main.class>
27+
<main.class>org.eclipse.parsson.demos.facebook.FacebookObjectSearch</main.class>
2928
<!--
30-
<main.class>org.eclipse.jsonp.demos.facebook.FacebookStreamSearch</main.class>
29+
<main.class>org.eclipse.parsson.demos.facebook.FacebookStreamSearch</main.class>
3130
-->
3231
<modules.directory>${project.build.directory}/modules</modules.directory>
3332
</properties>
3433

3534
<dependencies>
3635
<dependency>
37-
<groupId>org.eclipse.jsonp</groupId>
36+
<groupId>org.eclipse.parsson</groupId>
3837
<artifactId>jakarta.json</artifactId>
3938
</dependency>
4039
</dependencies>
@@ -83,7 +82,7 @@
8382
<argument>--module-path</argument>
8483
<argument>${modules.directory}</argument>
8584
<argument>-m</argument>
86-
<argument>org.eclipse.jsonp.demos.facebook/${main.class}</argument>
85+
<argument>org.eclipse.parsson.demos.facebook/${main.class}</argument>
8786
</arguments>
8887
</configuration>
8988
<executions>

‎demos/facebook/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
* SPDX-License-Identifier: BSD-3-Clause
99
*/
1010

11-
module org.eclipse.jsonp.demos.facebook {
11+
module org.eclipse.parsson.demos.facebook {
1212
requires jakarta.json;
1313
}

‎demos/facebook/src/main/java/org/eclipse/jsonp/demos/facebook/FacebookObjectSearch.java ‎demos/facebook/src/main/java/org/eclipse/parsson/demos/facebook/FacebookObjectSearch.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* SPDX-License-Identifier: BSD-3-Clause
99
*/
1010

11-
package org.eclipse.jsonp.demos.facebook;
11+
package org.eclipse.parsson.demos.facebook;
1212

1313
import jakarta.json.*;
1414
import java.io.*;

0 commit comments

Comments
 (0)