Skip to content

Commit 41d3e8e

Browse files
lukasjlukasj
committed
add speclicense, remove JSON-P occurences, update readme
Signed-off-by: Lukas Jungmann <[email protected]>
1 parent 1f18b59 commit 41d3e8e

File tree

5 files changed

+113
-17
lines changed

5 files changed

+113
-17
lines changed

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Thanks for your interest in this project.
44

55
## Project description
66

7-
Eclipse Project for JSON-P is a Java API to process (e.g. parse, generate,
7+
Jakarta JSON Processing is a Java API to process (e.g. parse, generate,
88
transform and query) JSON documents. It produces and consumes JSON in a
99
streaming fashion (similar to StAX API for XML) and allows to build a Java
1010
object model for JSON using API classes (similar to DOM API for XML).

‎README.md

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[![Build Status](https://travis-ci.org/eclipse-ee4j/jsonp.svg?branch=master)](https://travis-ci.org/eclipse-ee4j/jsonp)
22

3-
# Jakarta JSON Processing (JSON-P)
3+
# Jakarta JSON Processing
44

5-
Jakarta JSON Processing provides portable APIs to parse, generate, transform, and query JSON documents. This project contains Jakarta JSON Processing specification, API and a compatible implementation.
5+
Jakarta JSON Processing provides portable APIs to parse, generate, transform, and query JSON documents.
6+
This project contains Jakarta JSON Processing specification, API and a compatible implementation.
67

78
## Build
89

@@ -11,12 +12,31 @@ Use the following command:
1112
mvn -U -C clean install -Dnon.final=true
1213
```
1314

14-
## Licensing
15+
## License
1516

16-
- [Eclipse Public License 2.0](https://projects.eclipse.org/license/epl-2.0)
17-
- [GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
17+
* Most of the Jakarta JSON Processing project source code is licensed
18+
under the [Eclipse Public License (EPL) v2.0](https://projects.eclipse.org/license/epl-2.0)
19+
and [GNU General Public License (GPL) v2 with Classpath Exception](https://www.gnu.org/software/classpath/license.html);
20+
see the license information at the top of each source file.
21+
* The source code for the demo programs is licensed
22+
under the [Eclipse Distribution License (EDL) v1.0.](https://www.eclipse.org/org/documents/edl-v10.php).
23+
* The binary jar files published to the Maven repository are licensed
24+
under the same licenses as the corresponding source code;
25+
see the file `META-INF/LICENSE.txt` in each jar file.
26+
27+
You’ll find the text of the licenses in the workspace in various `LICENSE.txt` or `LICENSE.md` files.
28+
Don’t let the presence of these license files in the workspace confuse you into thinking
29+
that they apply to all files in the workspace.
30+
31+
You should always read the license file included with every download, and read
32+
the license text included in every source file.
1833

1934
## Links
2035

21-
- [JSON-P official web site](https://eclipse-ee4j.github.io/jsonp)
36+
- [Jakarta JSON Processing official web site](https://eclipse-ee4j.github.io/jsonp)
2237
- [Jakarta JSON Processing @ Eclipse](https://projects.eclipse.org/projects/ee4j.jsonp)
38+
39+
## Contributing
40+
41+
We use [contribution policy](CONTRIBUTING.md), which means we can only accept contributions under
42+
the terms of [Eclipse Contributor Agreement](http://www.eclipse.org/legal/ECA.php).

‎api/pom.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,19 @@
5252
<docfilessubdirs>true</docfilessubdirs>
5353
<groups>
5454
<group>
55-
<title>JSON Processing Packages</title>
55+
<title>JSON Processing API Packages</title>
5656
<packages>javax.json*</packages>
5757
</group>
5858
</groups>
59-
<bottom>
60-
<![CDATA[Copyright &#169; 2012-2019,
61-
<a href="http://www.oracle.com">Oracle</a>
62-
and/or its affiliates. All Rights Reserved.
63-
Use is subject to
64-
<a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
65-
<br>Comments to : [email protected]
66-
]]>
59+
<description>JSON Processing API documentation</description>
60+
<doctitle>JSON Processing API documentation</doctitle>
61+
<windowtitle>JSON Processing API documentation</windowtitle>
62+
<header><![CDATA[<br>JSON Processing API v${project.version}]]>
63+
</header>
64+
<bottom><![CDATA[
65+
Comments to: <a href="mailto:[email protected]">[email protected]</a>.<br>
66+
Copyright &#169; 2012&#x2013;{currentYear} Oracle and/or its affiliates. All rights reserved.<br>
67+
Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
6768
</bottom>
6869
</configuration>
6970

‎api/src/main/javadoc/doc-files/speclicense.html

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<html>
2+
<head>
3+
<title>Eclipse Foundation Specification License - v1.0</title>
4+
</head>
5+
<body>
6+
<h1>Eclipse Foundation Specification License - v1.0</h1>
7+
<p>By using and/or copying this document, or the Eclipse Foundation
8+
document from which this statement is linked, you (the licensee) agree
9+
that you have read, understood, and will comply with the following
10+
terms and conditions:</p>
11+
12+
<p>Permission to copy, and distribute the contents of this document, or
13+
the Eclipse Foundation document from which this statement is linked, in
14+
any medium for any purpose and without fee or royalty is hereby
15+
granted, provided that you include the following on ALL copies of the
16+
document, or portions thereof, that you use:</p>
17+
18+
<ul>
19+
<li> link or URL to the original Eclipse Foundation document.</li>
20+
<li>All existing copyright notices, or if one does not exist, a notice
21+
(hypertext is preferred, but a textual representation is permitted)
22+
of the form: &quot;Copyright &copy; [$date-of-document]
23+
&ldquo;Eclipse Foundation, Inc. &lt;&lt;url to this license&gt;&gt;
24+
&quot;
25+
</li>
26+
</ul>
27+
28+
<p>Inclusion of the full text of this NOTICE must be provided. We
29+
request that authorship attribution be provided in any software,
30+
documents, or other items or products that you create pursuant to the
31+
implementation of the contents of this document, or any portion
32+
thereof.</p>
33+
34+
<p>No right to create modifications or derivatives of Eclipse Foundation
35+
documents is granted pursuant to this license, except anyone may
36+
prepare and distribute derivative works and portions of this document
37+
in software that implements the specification, in supporting materials
38+
accompanying such software, and in documentation of such software,
39+
PROVIDED that all such works include the notice below. HOWEVER, the
40+
publication of derivative works of this document for use as a technical
41+
specification is expressly prohibited.</p>
42+
43+
<p>The notice is:</p>
44+
45+
<p>&quot;Copyright &copy; 2018 Eclipse Foundation. This software or
46+
document includes material copied from or derived from [title and URI
47+
of the Eclipse Foundation specification document].&quot;</p>
48+
49+
<h2>Disclaimers</h2>
50+
51+
<p>THIS DOCUMENT IS PROVIDED &quot;AS IS,&quot; AND THE COPYRIGHT
52+
HOLDERS AND THE ECLIPSE FOUNDATION MAKE NO REPRESENTATIONS OR
53+
WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
54+
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
55+
NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE
56+
SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS
57+
WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR
58+
OTHER RIGHTS.</p>
59+
60+
<p>THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION WILL NOT BE LIABLE
61+
FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT
62+
OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE
63+
CONTENTS THEREOF.</p>
64+
65+
<p>The name and trademarks of the copyright holders or the Eclipse
66+
Foundation may NOT be used in advertising or publicity pertaining to
67+
this document or its contents without specific, written prior
68+
permission. Title to copyright in this document will at all times
69+
remain with copyright holders.</p>
70+
71+
</body>
72+
</html>

‎api/src/main/jdk9/module-info.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2019 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
@@ -14,6 +14,9 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
*/
1616

17+
/**
18+
* Jakarta JSON Processing API.
19+
*/
1720
module java.json {
1821
exports javax.json;
1922
exports javax.json.spi;

0 commit comments

Comments
 (0)