Boilerplate spec and various Jakarta EE 8 related updates (#183)
diff --git a/.gitignore b/.gitignore index a6f89c2..8b815be 100644 --- a/.gitignore +++ b/.gitignore
@@ -1 +1,23 @@ -/target/ \ No newline at end of file +# Maven noise +target/ + +# OSX noise +.DS_Store + +# IntelliJ Idea noise +.idea +*.iws +*.ipr +*.iml + +# Eclipse noise +.settings/ +.classpath +.project + +# NetBeans noise +nbproject/ + +# Java noise +*.class +*err_pid*.log
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a33b4d3..415e972 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@ -# Contributing to Eclipse Project for JSON Processing +# Contributing to Jakarta JSON Processing Thanks for your interest in this project.
diff --git a/NOTICE.md b/NOTICE.md index b4cb5ba..96e73f8 100644 --- a/NOTICE.md +++ b/NOTICE.md
@@ -1,4 +1,4 @@ -# Notices for Eclipse Project for JSON Processing +# Notices for Jakarta JSON Processing This content is produced and maintained by the Eclipse Project for JSON Processing project. @@ -7,7 +7,7 @@ ## Trademarks -Eclipse Project for JSON Processing is a trademark of the Eclipse Foundation. +Jakarta JSON Processing is a trademark of the Eclipse Foundation. ## Copyright
diff --git a/README.md b/README.md index 5960c73..d35a601 100644 --- a/README.md +++ b/README.md
@@ -1,14 +1,13 @@ [](https://travis-ci.org/eclipse-ee4j/jsonp) -# JSON Processing (JSON-P) +# Jakarta JSON Processing (JSON-P) -This projects contains API and Reference Implementation (RI) of JSR-374. -The Java API for JSON Processing provides portable APIs to parse, generate, transform, and query JSON documents. +The Java API for 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. ## Build Use the following command: -```bash +```bash mvn -U -C clean install -Dnon.final=true ``` @@ -19,5 +18,5 @@ ## Links -- JSON-P official web site: https://javaee.github.io/jsonp -- JSR-374 page on JCP site: https://jcp.org/en/jsr/detail?id=374 +- [JSON-P official web site](https://eclipse-ee4j.github.io/jsonp) +- [Jakarta JSON Processing @ Eclipse](https://projects.eclipse.org/projects/ee4j.jsonp)
diff --git a/api/pom.xml b/api/pom.xml index 1f3b5e3..957542e 100644 --- a/api/pom.xml +++ b/api/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -31,9 +31,9 @@ <artifactId>jakarta.json-api</artifactId> <packaging>bundle</packaging> <version>1.1.6-SNAPSHOT</version> - <name>JSR 374 (JSON Processing) API</name> - <description>API module of JSR 374:Java API for Processing JSON</description> - <url>https://javaee.github.io/jsonp</url> + <name>Jakarta JSON Processing API</name> + <description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description> + <url>https://github.com/eclipse-ee4j/jsonp</url> <properties> <packages.export>javax.json.*</packages.export> @@ -124,7 +124,7 @@ <Implementation-Version>${spec.implementation.version}</Implementation-Version> <Specification-Version>${spec.specification.version}</Specification-Version> <Export-Package>${packages.export}</Export-Package> - <Bundle-Description>Java API for JSON Processing (JSON-P) ${spec_version}</Bundle-Description> + <Bundle-Description>Jakarta JSON Processing API ${spec_version}</Bundle-Description> <Specification-Vendor>Oracle</Specification-Vendor> </instructions> </configuration>
diff --git a/api/src/main/javadoc/overview.html b/api/src/main/javadoc/overview.html index 32cf746..5fb843d 100644 --- a/api/src/main/javadoc/overview.html +++ b/api/src/main/javadoc/overview.html
@@ -1,7 +1,7 @@ <html> <!-- - Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -18,7 +18,7 @@ --> <body> -The Java API for JSON Processing provides portable APIs to parse, +Jakarta JSON Processing provides portable APIs to parse, generate, transform, and query <a href="http://json.org/">JSON</a> using the streaming API or the object model API. @@ -41,68 +41,68 @@ The object model generates JSON output by navigating the entire tree at once. <h2>The Streaming API</h2> -<p>The streaming API is similar to the StAX API for XML and consists of the -interfaces {@link javax.json.stream.JsonParser} and -{@link javax.json.stream.JsonGenerator}. {@code JsonParser} -contains methods to parse JSON data using the streaming model. +<p>The streaming API is similar to the StAX API for XML and consists of the +interfaces {@link javax.json.stream.JsonParser} and +{@link javax.json.stream.JsonGenerator}. {@code JsonParser} +contains methods to parse JSON data using the streaming model. {@code JsonGenerator} contains methods to write JSON data to an ouptut source. -<p>{@code JsonParser} provides forward, read-only access to -JSON data using the pull parsing programming model. In this model the -application code controls the thread and calls methods in the parser interface -to move the parser forward or to obtain JSON data from the current state of -the parser. Refer to -<a href="javax/json/stream/JsonParser.html#JsonParserExample2">this example</a> -for more details. +<p>{@code JsonParser} provides forward, read-only access to +JSON data using the pull parsing programming model. In this model the +application code controls the thread and calls methods in the parser interface +to move the parser forward or to obtain JSON data from the current state of +the parser. Refer to +<a href="javax/json/stream/JsonParser.html#JsonParserExample2">this example</a> +for more details. -<p>{@code JsonGenerator} provides methods to write JSON to a stream. The +<p>{@code JsonGenerator} provides methods to write JSON to a stream. The generator writes name/value pairs in JSON objects and values in JSON arrays. -Refer to -<a href="javax/json/stream/JsonGenerator.html#JsonGeneratorExample3">this -example</a> for more details. +Refer to +<a href="javax/json/stream/JsonGenerator.html#JsonGeneratorExample3">this +example</a> for more details. -<p>The streaming API is a low-level API designed to process large amounts of -JSON data efficiently. Other JSON frameworks (such as JSON binding) can be -implemented using this API.</p> +<p>The streaming API is a low-level API designed to process large amounts of +JSON data efficiently. Other JSON frameworks (such as JSON binding) can be +implemented using this API.</p> <h2>The Object Model API</h2> -<p>The object model API is similar to the DOM API for XML. It is a high-level -API that provides immutable object models for JSON object and array structures. -These JSON structures are represented as object models using the Java types -{@link javax.json.JsonObject} and {@link javax.json.JsonArray}. -{@code JsonObject} provides a {@link java.util.Map} view to access the unordered +<p>The object model API is similar to the DOM API for XML. It is a high-level +API that provides immutable object models for JSON object and array structures. +These JSON structures are represented as object models using the Java types +{@link javax.json.JsonObject} and {@link javax.json.JsonArray}. +{@code JsonObject} provides a {@link java.util.Map} view to access the unordered collection of zero or more name/value pairs from the model. Similarly, -{@code JsonArray} provides a {@link java.util.List} view to access the ordered -sequence of zero or more values from the model. +{@code JsonArray} provides a {@link java.util.List} view to access the ordered +sequence of zero or more values from the model. -<p>The object model API uses builder patterns to create these object models. +<p>The object model API uses builder patterns to create these object models. Application code can use the interface {@link javax.json.JsonObjectBuilder} -to create models that represent JSON objects. The resulting model is of type -{@code JsonObject}. Refer to -<a href="javax/json/JsonObjectBuilder.html#JsonObjectBuilderExample1">this example</a> +to create models that represent JSON objects. The resulting model is of type +{@code JsonObject}. Refer to +<a href="javax/json/JsonObjectBuilder.html#JsonObjectBuilderExample1">this example</a> for more details. Application code can use the interface -{@link javax.json.JsonArrayBuilder} to create models that represent JSON arrays. -The resulting model is of type {@code JsonArray}. Refer to -<a href="javax/json/JsonArrayBuilder.html#JsonArrayBuilderExample1">this example</a> -for more details. +{@link javax.json.JsonArrayBuilder} to create models that represent JSON arrays. +The resulting model is of type {@code JsonArray}. Refer to +<a href="javax/json/JsonArrayBuilder.html#JsonArrayBuilderExample1">this example</a> +for more details. -<p>These object models can also be created from an input source (such as +<p>These object models can also be created from an input source (such as {@link java.io.InputStream} or {@link java.io.Reader}) using the interface -{@link javax.json.JsonReader}. -<a href="javax/json/JsonReader.html#JsonReaderExample1">This example</a> shows +{@link javax.json.JsonReader}. +<a href="javax/json/JsonReader.html#JsonReaderExample1">This example</a> shows how to read and create an empty {@code JsonArray} model using the interface -{@code JsonReader}. Similarly, these object models can be written to an output -source (such as {@link java.io.OutputStream} or {@link java.io.Writer}) using -the class {@link javax.json.JsonWriter}. -<a href="javax/json/JsonWriter.html#JsonWriterExample1">This example</a> shows +{@code JsonReader}. Similarly, these object models can be written to an output +source (such as {@link java.io.OutputStream} or {@link java.io.Writer}) using +the class {@link javax.json.JsonWriter}. +<a href="javax/json/JsonWriter.html#JsonWriterExample1">This example</a> shows how to write an empty {@code JsonObject} model using the interface {@code JsonWriter}. <h2>JSON Pointer, JSON Patch, and JSON Merge Patch</h2> -The Java API for JSON Processing supports the latest standard on +The Java API for JSON Processing supports the latest standard on <a href="http://tools.ietf.org/html/rfc6901">JSON Pointer</a>, <a Href="http://tools.ietf.org/html/rfc6902">JSON Patch</a>, and <a Href="http://tools.ietf.org/html/rfc7396">JSON Merge Patch</a>. - + </body> </html>
diff --git a/bundles/pom.xml b/bundles/pom.xml index 9c535e6..1579823 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -30,9 +30,9 @@ <groupId>org.glassfish</groupId> <artifactId>json-bundles</artifactId> <packaging>pom</packaging> - <name>JSR 374 (JSON Processing) bundles</name> - <description>JSON Processing bundles</description> - <url>https://javaee.github.io/jsonp</url> + <name>Jakarta JSON Processing bundles</name> + <description>Jakarta JSON Processing bundles</description> + <url>https://github.com/eclipse-ee4j/jsonp</url> <modules> <module>ri</module>
diff --git a/bundles/ri/src/main/resources/README.txt b/bundles/ri/src/main/resources/README.txt index 63fa361..4f26662 100644 --- a/bundles/ri/src/main/resources/README.txt +++ b/bundles/ri/src/main/resources/README.txt
@@ -1,4 +1,4 @@ -* standalone/jakarta.json-${project.version}.jar contains both "JSR 374 : Java API for JSON Processing 1.1" API +* standalone/jakarta.json-${project.version}.jar contains both "Jakarta JSON Processing 1.1" API and its default provider implementation. Keep it in classpath for both compiling and running your application. Automatic module name is: 'java.json'
diff --git a/impl/pom.xml b/impl/pom.xml index 055e5e2..37ae9b7 100644 --- a/impl/pom.xml +++ b/impl/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -31,9 +31,9 @@ <artifactId>jakarta.json</artifactId> <packaging>bundle</packaging> <version>1.1.6-SNAPSHOT</version> - <name>JSR 374 (JSON Processing) Default Provider</name> - <description>Default provider for JSR 374:Java API for Processing JSON</description> - <url>https://javaee.github.io/jsonp</url> + <name>JSON-P Default Provider</name> + <description>Default provider for Jakarta JSON Processing</description> + <url>https://github.com/eclipse-ee4j/jsonp</url> <properties> <packages.private>org.glassfish.json</packages.private> @@ -244,4 +244,4 @@ </build> </profile> </profiles> -</project> \ No newline at end of file +</project>
diff --git a/jaxrs-1x/pom.xml b/jaxrs-1x/pom.xml index a3fb495..8675e13 100644 --- a/jaxrs-1x/pom.xml +++ b/jaxrs-1x/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -30,9 +30,10 @@ <artifactId>jsonp-jaxrs-1x</artifactId> <packaging>bundle</packaging> <version>1.1.6-SNAPSHOT</version> - <name>JSR 374 (JSON Processing) Media for JAX-RS 1.1</name> - <description>JAX-RS 1.1 MessageBodyReader and MessageBodyWriter to support JsonObject/JsonArray/JsonStructure API of JSR 374:Java API for Processing JSON</description> - <url>https://javaee.github.io/jsonp</url> + <name>Jakarta JSON Processing Media for JAX-RS 1.1</name> + <description>JAX-RS 1.1 MessageBodyReader and MessageBodyWriter to support JsonObject/JsonArray/JsonStructure API of Jakarta JSON Processing</description> + <url>https://github.com/eclipse-ee4j/jsonp</url> + <build> <plugins> <plugin>
diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml index d804674..53c1ac7 100644 --- a/jaxrs/pom.xml +++ b/jaxrs/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -31,9 +31,9 @@ <artifactId>jsonp-jaxrs</artifactId> <packaging>bundle</packaging> <version>1.1.6-SNAPSHOT</version> - <name>JSR 374 (JSON Processing) Media for JAX-RS</name> - <description>JAX-RS MessageBodyReader and MessageBodyWriter to support JsonValue API of JSR 374:Java API for Processing JSON</description> - <url>https://javaee.github.io/jsonp</url> + <name>Jakarta JSON Processing Media for JAX-RS</name> + <description>JAX-RS MessageBodyReader and MessageBodyWriter to support JsonValue API of Jakarta JSON Processing</description> + <url>https://github.com/eclipse-ee4j/jsonp</url> <build> <plugins> <plugin>
diff --git a/pom.xml b/pom.xml index 233f86d..f6c448a 100644 --- a/pom.xml +++ b/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -34,9 +34,9 @@ <artifactId>json</artifactId> <packaging>pom</packaging> <version>1.1.6-SNAPSHOT</version> - <name>JSR 374 (JSON Processing) RI</name> - <description>JSR 374:Java API for Processing JSON RI</description> - <url>https://javaee.github.io/jsonp</url> + <name>Jakarta JSON Processing</name> + <description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description> + <url>https://github.com/eclipse-ee4j/jsonp</url> <scm> <connection>scm:git:git://github.com/eclipse-ee4j/jsonp.git</connection> @@ -60,11 +60,19 @@ <developers> <developer> + <id>m0mus</id> + <name>Dmitry Kornilov</name> + <organization>Oracle</organization> + <roles> + <role>project lead</role> + </roles> + </developer> + <developer> <id>lukasj</id> <name>Lukas Jungmann</name> <organization>Oracle</organization> <roles> - <role>lead</role> + <role>dev lead</role> </roles> </developer> </developers>
diff --git a/spec/.gitignore b/spec/.gitignore new file mode 100644 index 0000000..450b4b3 --- /dev/null +++ b/spec/.gitignore
@@ -0,0 +1,2 @@ +.m2/ +target/
diff --git a/spec/LICENSE b/spec/LICENSE new file mode 100644 index 0000000..d3087e4 --- /dev/null +++ b/spec/LICENSE
@@ -0,0 +1,277 @@ +Eclipse Public License - v 2.0 + + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. + +"Contributor" means any person or entity that Distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which +are necessarily infringed by the use or sale of its Contribution alone +or when combined with the Program. + +"Program" means the Contributions Distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the + rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to grant + the copyright license set forth in this Agreement. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). + +3. REQUIREMENTS + +3.1 If a Contributor Distributes the Program in any form, then: + + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and + + b) a copy of this Agreement must be included with each copy of + the Program. + +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities +with respect to end users, business partners and the like. While this +license is intended to facilitate the commercial use of the Program, +the Contributor who includes the Program in a commercial product +offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes +the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits +and other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program +in a commercial product offering. The obligations in this section do not +apply to any claims or Losses relating to any actual or alleged +intellectual property infringement. In order to qualify, an Indemnified +Contributor must: a) promptly notify the Commercial Contributor in +writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those performance +claims and warranties, and if a court requires any other Contributor to +pay any damages as a result, the Commercial Contributor must pay +those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF +TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR +PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all +risks associated with its exercise of rights under this Agreement, +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs +or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS +SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software +or hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably practicable. +However, Recipient's obligations under this Agreement and any licenses +granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, +but in order to avoid inconsistency the Agreement is copyrighted and +may only be modified in the following manner. The Agreement Steward +reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement +Steward has the right to modify this Agreement. The Eclipse Foundation +is the initial Agreement Steward. The Eclipse Foundation may assign the +responsibility to serve as the Agreement Steward to a suitable separate +entity. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be +Distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to Distribute the Program (including its +Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted +under this Agreement are reserved. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set forth +in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), +version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + + You may add additional accurate notices of copyright ownership.
diff --git a/spec/README.md b/spec/README.md new file mode 100644 index 0000000..6ccef79 --- /dev/null +++ b/spec/README.md
@@ -0,0 +1,22 @@ +Jakarta JSON Processing Specification +====================================== + +This project generates the Jakarta JSON Processing Specification. + +Building +-------- + +Prerequisites: + +* JDK8+ +* Maven 3.0.3+ + +Run the full build: + +`mvn install` + +Locate the html files: +- `target/generated-docs/jsonp-spec-<version>.html` + +Locate the PDF files: +- `target/generated-docs/jsonp-spec-<version>.pdf`
diff --git a/spec/pom.xml b/spec/pom.xml new file mode 100644 index 0000000..a27b928 --- /dev/null +++ b/spec/pom.xml
@@ -0,0 +1,210 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v. 2.0, which is available at + http://www.eclipse.org/legal/epl-2.0. + + This Source Code may also be made available under the following Secondary + Licenses when the conditions for such availability set forth in the + Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + version 2 with the GNU Classpath Exception, which is available at + https://www.gnu.org/software/classpath/license.html. + + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + +--> +<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/maven-v4_0_0.xsd"> + <parent> + <groupId>org.eclipse.ee4j</groupId> + <artifactId>project</artifactId> + <version>1.0.5</version> + <relativePath/> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-spec</artifactId> + <packaging>pom</packaging> + <version>1.1.0-SNAPSHOT</version> + <name>Jakarta JSON Processing Specification</name> + + <properties> + <site.output.dir>${project.build.directory}/staging</site.output.dir> + <maven.site.skip>true</maven.site.skip> + <asciidoctor.maven.plugin.version>1.5.7.1</asciidoctor.maven.plugin.version> + <asciidoctorj.version>1.6.2</asciidoctorj.version> + <asciidoctorj.pdf.version>1.5.0-alpha.16</asciidoctorj.pdf.version> + <jruby.version>9.2.6.0</jruby.version> + <!-- status: DRAFT, BETA, etc., or blank for final --> + <status>DRAFT</status> + <maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format> + <revisiondate>${maven.build.timestamp}</revisiondate> + </properties> + + <scm> + <connection>scm:git:git@github.com:eclipse-ee4j/jsonp.git</connection> + <developerConnection>scm:git:git@github.com:eclipse-ee4j/jsonp.git</developerConnection> + <url>https://github.com/eclipse-ee4j/jsonp</url> + <tag>HEAD</tag> + </scm> + + <distributionManagement> + <site> + <url>scm:git:git@github.com:eclipse-ee4j/jsonp.git</url> + </site> + </distributionManagement> + + <build> + <defaultGoal>package</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.4.1</version> + <executions> + <execution> + <id>enforce-versions</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>[1.8.0,)</version> + <message>You need JDK8 or higher</message> + </requireJavaVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctor-maven-plugin</artifactId> + <version>${asciidoctor.maven.plugin.version}</version> + <dependencies> + <dependency> + <groupId>org.jruby</groupId> + <artifactId>jruby-complete</artifactId> + <version>${jruby.version}</version> + </dependency> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj</artifactId> + <version>${asciidoctorj.version}</version> + </dependency> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj-pdf</artifactId> + <version>${asciidoctorj.pdf.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>asciidoc-to-html</id> + <phase>generate-resources</phase> + <goals> + <goal>process-asciidoc</goal> + </goals> + <configuration> + <backend>html5</backend> + <outputFile>${project.build.directory}/generated-docs/jsonp-spec-${project.version}.html</outputFile> + <attributes> + <doctype>book</doctype> + <status>${status}</status> + <data-uri /> + <icons>font</icons> + <toc>left</toc> + <icons>font</icons> + <sectanchors>true</sectanchors> + <idprefix /> + <idseparator>-</idseparator> + <docinfo1>true</docinfo1> + </attributes> + </configuration> + </execution> + <execution> + <id>asciidoc-to-pdf</id> + <phase>generate-resources</phase> + <goals> + <goal>process-asciidoc</goal> + </goals> + <configuration> + <backend>pdf</backend> + <outputFile>${project.build.directory}/generated-docs/jsonp-spec-${project.version}.pdf</outputFile> + <attributes> + <pdf-stylesdir>${project.basedir}/src/theme</pdf-stylesdir> + <pdf-style>jakartaee</pdf-style> + <doctype>book</doctype> + <status>${status}</status> + <data-uri /> + <icons>font</icons> + <pagenums /> + <toc /> + <icons>font</icons> + <sectanchors>true</sectanchors> + <idprefix /> + <idseparator>-</idseparator> + <docinfo1>true</docinfo1> + <embedAssets>true</embedAssets> + </attributes> + </configuration> + </execution> + </executions> + <configuration> + <sourceDocumentName>jsonp-spec.adoc</sourceDocumentName> + <sourceHighlighter>coderay</sourceHighlighter> + <attributes> + <revnumber>${project.version}</revnumber> + <revremark>${status}</revremark> + <revdate>${revisiondate}</revdate> + </attributes> + </configuration> + + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.5.2</version> + <configuration> + <mavenExecutorId>forked-path</mavenExecutorId> + <useReleaseProfile>false</useReleaseProfile> + <arguments>${release.arguments}</arguments> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-provider-gitexe</artifactId> + <version>1.9.4</version> + </dependency> + </dependencies> + </plugin> + + <!-- + This is the rule that builds the zip file for download. + --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>3.1.1</version> + <inherited>false</inherited> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>${project.basedir}/src/assembly/assembly.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project>
diff --git a/spec/src/assembly/assembly.xml b/spec/src/assembly/assembly.xml new file mode 100644 index 0000000..53f9453 --- /dev/null +++ b/spec/src/assembly/assembly.xml
@@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- + + Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v. 2.0, which is available at + http://www.eclipse.org/legal/epl-2.0. + + This Source Code may also be made available under the following Secondary + Licenses when the conditions for such availability set forth in the + Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + version 2 with the GNU Classpath Exception, which is available at + https://www.gnu.org/software/classpath/license.html. + + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + +--> + +<assembly> + <id>spec</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>jsonp-spec</baseDirectory> + <fileSets> + <fileSet> + <directory>target/generated-docs</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> +</assembly>
diff --git a/spec/src/main/asciidoc/images/jakarta_ee_logo_schooner_color_stacked_default.png b/spec/src/main/asciidoc/images/jakarta_ee_logo_schooner_color_stacked_default.png new file mode 100644 index 0000000..97b46ce --- /dev/null +++ b/spec/src/main/asciidoc/images/jakarta_ee_logo_schooner_color_stacked_default.png Binary files differ
diff --git a/spec/src/main/asciidoc/jsonp-spec.adoc b/spec/src/main/asciidoc/jsonp-spec.adoc new file mode 100644 index 0000000..446b390 --- /dev/null +++ b/spec/src/main/asciidoc/jsonp-spec.adoc
@@ -0,0 +1,28 @@ +// +// Copyright (c) 2017, 2019 Contributors to the Eclipse Foundation +// + += Jakarta JSON Processing +:authors: Jakarta JSON Processing Team, https://projects.eclipse.org/projects/ee4j.jsonp +:email: https://dev.eclipse.org/mailman/listinfo/jsonp-dev +:version-label!: +:doctype: book +:license: Eclipse Foundation Specification License v1.0 +:source-highlighter: coderay +:toc: left +:toclevels: 4 +:sectnumlevels: 4 +:sectanchors: +ifdef::backend-pdf[] +:pagenums: +:numbered: +:title-logo-image: image:jakarta_ee_logo_schooner_color_stacked_default.png[pdfwidth=4.25in,align=right] +endif::[] + +// == License +:sectnums!: +include::license-efsl.adoc[] + +// == Spec +:sectnums: +include::jsonp.adoc[]
diff --git a/spec/src/main/asciidoc/jsonp.adoc b/spec/src/main/asciidoc/jsonp.adoc new file mode 100644 index 0000000..294b916 --- /dev/null +++ b/spec/src/main/asciidoc/jsonp.adoc
@@ -0,0 +1,3 @@ +== Introduction + +Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.
diff --git a/spec/src/main/asciidoc/license-efsl.adoc b/spec/src/main/asciidoc/license-efsl.adoc new file mode 100644 index 0000000..855fc87 --- /dev/null +++ b/spec/src/main/asciidoc/license-efsl.adoc
@@ -0,0 +1,72 @@ +[subs="normal"] +.... +Specification: {doctitle} + +Version: {revnumber} + +Status: {revremark} + +Release: {revdate} +.... + +=== Eclipse Foundation Specification License + +By using and/or copying this document, or the Eclipse Foundation +document from which this statement is linked, you (the licensee) agree +that you have read, understood, and will comply with the following +terms and conditions: + +Permission to copy, and distribute the contents of this document, or +the Eclipse Foundation document from which this statement is linked, in +any medium for any purpose and without fee or royalty is hereby +granted, provided that you include the following on ALL copies of the +document, or portions thereof, that you use: + +* link or URL to the original Eclipse Foundation document. +* All existing copyright notices, or if one does not exist, a notice + (hypertext is preferred, but a textual representation is permitted) + of the form: "Copyright (c) [$date-of-document] + Eclipse Foundation, Inc. <<url to this license>>" + +Inclusion of the full text of this NOTICE must be provided. We +request that authorship attribution be provided in any software, +documents, or other items or products that you create pursuant to the +implementation of the contents of this document, or any portion +thereof. + +No right to create modifications or derivatives of Eclipse Foundation +documents is granted pursuant to this license, except anyone may +prepare and distribute derivative works and portions of this document +in software that implements the specification, in supporting materials +accompanying such software, and in documentation of such software, +PROVIDED that all such works include the notice below. HOWEVER, the +publication of derivative works of this document for use as a technical +specification is expressly prohibited. + +The notice is: + +"Copyright (c) 2018 Eclipse Foundation. This software or +document includes material copied from or derived from [title and URI +of the Eclipse Foundation specification document]." + +==== Disclaimers + +THIS DOCUMENT IS PROVIDED "AS IS," AND THE COPYRIGHT +HOLDERS AND THE ECLIPSE FOUNDATION MAKE NO REPRESENTATIONS OR +WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, +NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE +SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS +WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR +OTHER RIGHTS. + +THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION WILL NOT BE LIABLE +FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT +OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE +CONTENTS THEREOF. + +The name and trademarks of the copyright holders or the Eclipse +Foundation may NOT be used in advertising or publicity pertaining to +this document or its contents without specific, written prior +permission. Title to copyright in this document will at all times +remain with copyright holders.
diff --git a/spec/src/theme/jakartaee-theme.yml b/spec/src/theme/jakartaee-theme.yml new file mode 100644 index 0000000..6092a2f --- /dev/null +++ b/spec/src/theme/jakartaee-theme.yml
@@ -0,0 +1,299 @@ +# +# Following is the asciidoctor-pdf default theme [1], with small +# customizations, mostly for header and footer, marked "EE". +# +# [1] https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml +# +font: + catalog: + # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols + Noto Serif: + normal: notoserif-regular-subset.ttf + bold: notoserif-bold-subset.ttf + italic: notoserif-italic-subset.ttf + bold_italic: notoserif-bold_italic-subset.ttf + # M+ 1mn supports ASCII and the circled numbers used for conums + M+ 1mn: + normal: mplus1mn-regular-ascii-conums.ttf + bold: mplus1mn-bold-ascii.ttf + italic: mplus1mn-italic-ascii.ttf + bold_italic: mplus1mn-bold_italic-ascii.ttf + # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols + # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font + M+ 1p Fallback: + normal: mplus1p-regular-fallback.ttf + bold: mplus1p-regular-fallback.ttf + italic: mplus1p-regular-fallback.ttf + bold_italic: mplus1p-regular-fallback.ttf + fallbacks: + - M+ 1p Fallback +page: + background_color: ffffff + layout: portrait + margin: [0.5in, 0.67in, 0.67in, 0.67in] + # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress + margin_inner: 0.75in + margin_outer: 0.59in + #size: A4 # EE + size: Letter # EE +base: + align: justify + # color as hex string (leading # is optional) + font_color: 333333 + # color as RGB array + #font_color: [51, 51, 51] + # color as CMYK array (approximated) + #font_color: [0, 0, 0, 0.92] + #font_color: [0, 0, 0, 92%] + font_family: Noto Serif + # choose one of these font_size/line_height_length combinations + #font_size: 14 + #line_height_length: 20 + #font_size: 11.25 + #line_height_length: 18 + #font_size: 11.2 + #line_height_length: 16 + font_size: 10.5 + #line_height_length: 15 + # correct line height for Noto Serif metrics + line_height_length: 12 + #font_size: 11.25 + #line_height_length: 18 + line_height: $base_line_height_length / $base_font_size + font_size_large: round($base_font_size * 1.25) + font_size_small: round($base_font_size * 0.85) + font_size_min: $base_font_size * 0.75 + font_style: normal + border_color: eeeeee + border_radius: 4 + border_width: 0.5 +# FIXME vertical_rhythm is weird; we should think in terms of ems +#vertical_rhythm: $base_line_height_length * 2 / 3 +# correct line height for Noto Serif metrics (comes with built-in line height) +vertical_rhythm: $base_line_height_length +horizontal_rhythm: $base_line_height_length +# QUESTION should vertical_spacing be block_spacing instead? +vertical_spacing: $vertical_rhythm +link: + font_color: 428bca +# literal is currently used for inline monospaced in prose and table cells +literal: + font_color: b12146 + font_family: M+ 1mn +menu_caret_content: " <font size=\"1.15em\"><color rgb=\"b12146\">\u203a</color></font> " +heading: + align: left + #font_color: 181818 + font_color: $base_font_color + font_family: $base_font_family + font_style: bold + # h1 is used for part titles (book doctype) or the doctitle (article doctype) + #h1_font_size: floor($base_font_size * 2.6) # EE + h1_font_size: floor($base_font_size * 2.5) # EE, squeeze title onto one line + # h2 is used for chapter titles (book doctype only) + h2_font_size: floor($base_font_size * 2.15) + h3_font_size: round($base_font_size * 1.7) + h4_font_size: $base_font_size_large + h5_font_size: $base_font_size + h6_font_size: $base_font_size_small + #line_height: 1.4 + # correct line height for Noto Serif metrics (comes with built-in line height) + line_height: 1 + margin_top: $vertical_rhythm * 0.4 + margin_bottom: $vertical_rhythm * 0.9 +title_page: + align: right + logo: + top: 10% + title: + top: 55% + font_size: $heading_h1_font_size + font_color: 999999 + line_height: 0.9 + subtitle: + font_size: $heading_h3_font_size + font_style: bold_italic + line_height: 1 + authors: + margin_top: $base_font_size * 1.25 + font_size: $base_font_size_large + font_color: 181818 + revision: + margin_top: $base_font_size * 1.25 +block: + margin_top: 0 + margin_bottom: $vertical_rhythm +caption: + align: left + font_size: $base_font_size * 0.95 + font_style: italic + # FIXME perhaps set line_height instead of / in addition to margins? + margin_inside: $vertical_rhythm / 3 + #margin_inside: $vertical_rhythm / 4 + margin_outside: 0 +lead: + font_size: $base_font_size_large + line_height: 1.4 +abstract: + font_color: 5c6266 + font_size: $lead_font_size + line_height: $lead_line_height + font_style: italic + first_line_font_style: bold + title: + align: center + font_color: $heading_font_color + font_family: $heading_font_family + font_size: $heading_h4_font_size + font_style: $heading_font_style +admonition: + column_rule_color: $base_border_color + column_rule_width: $base_border_width + padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm] + #icon: + # tip: + # name: fa-lightbulb-o + # stroke_color: 111111 + # size: 24 + label: + text_transform: uppercase + font_style: bold +blockquote: + font_color: $base_font_color + font_size: $base_font_size_large + border_color: $base_border_color + border_width: 5 + # FIXME disable negative padding bottom once margin collapsing is implemented + padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2] + cite_font_size: $base_font_size_small + cite_font_color: 999999 +# code is used for source blocks (perhaps change to source or listing?) +code: + font_color: $base_font_color + font_family: $literal_font_family + font_size: ceil($base_font_size) + padding: $code_font_size + line_height: 1.25 + # line_gap is an experimental property to control how a background color is applied to an inline block element + line_gap: 3.8 + background_color: f5f5f5 + border_color: cccccc + border_radius: $base_border_radius + border_width: 0.75 +conum: + font_family: M+ 1mn + font_color: $literal_font_color + font_size: $base_font_size + line_height: 4 / 3 +example: + border_color: $base_border_color + border_radius: $base_border_radius + border_width: 0.75 + background_color: ffffff + # FIXME reenable padding bottom once margin collapsing is implemented + padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm] +image: + align: left +prose: + margin_top: $block_margin_top + margin_bottom: $block_margin_bottom +sidebar: + background_color: eeeeee + border_color: e1e1e1 + border_radius: $base_border_radius + border_width: $base_border_width + # FIXME reenable padding bottom once margin collapsing is implemented + padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25] + title: + align: center + font_color: $heading_font_color + font_family: $heading_font_family + font_size: $heading_h4_font_size + font_style: $heading_font_style +thematic_break: + border_color: $base_border_color + border_style: solid + border_width: $base_border_width + margin_top: $vertical_rhythm * 0.5 + margin_bottom: $vertical_rhythm * 1.5 +description_list: + term_font_style: bold + term_spacing: $vertical_rhythm / 4 + description_indent: $horizontal_rhythm * 1.25 +outline_list: + indent: $horizontal_rhythm * 1.5 + #marker_font_color: 404040 + # NOTE outline_list_item_spacing applies to list items that do not have complex content + item_spacing: $vertical_rhythm / 2 +table: + background_color: $page_background_color + #head_background_color: <hex value> + #head_font_color: $base_font_color + head_font_style: bold + #body_background_color: <hex value> + body_stripe_background_color: f9f9f9 + foot_background_color: f0f0f0 + border_color: dddddd + border_width: $base_border_width + cell_padding: 3 +toc: + indent: $horizontal_rhythm + line_height: 1.4 + dot_leader: + #content: ". " + font_color: a9a9a9 + #levels: 2 3 +# NOTE in addition to footer, header is also supported +footer: + font_size: $base_font_size_small + # NOTE if background_color is set, background and border will span width of page + #border_color: dddddd # EE + #border_width: 0.25 # EE + height: $base_line_height_length * 2.5 + line_height: 1 + padding: [$base_line_height_length / 2, 1, 0, 1] + vertical_align: top + #image_vertical_align: <alignment> or <number> + # additional attributes for content: + # * {page-count} + # * {page-number} + # * {document-title} + # * {document-subtitle} + # * {chapter-title} + # * {section-title} + # * {section-or-chapter-title} + recto: + #columns: "<50% =0% >50%" + right: + #content: '{page-number}' # EE + #content: '{section-or-chapter-title} | {page-number}' + #content: '{document-title} | {page-number}' + content: '{document-title}{nbsp}{nbsp}{nbsp} *{page-number}*' # EE + #center: + # content: '{page-number}' + left: # EE + content: '{status}' # EE + verso: + #columns: $footer_recto_columns + left: + #content: $footer_recto_right_content # EE + #content: '{page-number} | {chapter-title}' + content: '*{page-number}* {nbsp}{nbsp}{nbsp}{document-title}' # EE + #center: + # content: '{page-number}' + right: # EE + content: '{status}' # EE +header: # EE + font_size: $base_font_size_small # EE + border_color: dddddd # EE + border_width: 0.25 # EE + height: $base_line_height_length * 2.5 # EE + line_height: 1 # EE + padding: [$base_line_height_length / 2, 1, 0, 1] # EE + vertical_align: top # EE + recto: # EE + right: # EE + content: '{section-or-chapter-title}' # EE + verso: # EE + left: # EE + content: '{section-or-chapter-title}' # EE
diff --git a/tests/pom.xml b/tests/pom.xml index d8b1613..c3efaa6 100644 --- a/tests/pom.xml +++ b/tests/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -29,7 +29,7 @@ <artifactId>jsonp-tests</artifactId> <packaging>jar</packaging> - <name>JSR 374 (JSON Processing) Tests</name> + <name>Jakarta JSON Processing Tests</name> <dependencies> <dependency>
