Skip to content

Commit 01ee02a

Browse files
lukasjm0mus
authored andcommitted
Jdk11 preparation, jakarta uptake, osgi and docs fixes (#126)
Signed-off-by: Lukas Jungmann <[email protected]>
1 parent e82316a commit 01ee02a

File tree

27 files changed

+525
-393
lines changed

27 files changed

+525
-393
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: java
22

33
jdk:
44
- oraclejdk8
5-
- oraclejdk9
5+
- openjdk11
66

77
cache:
88
directories:
@@ -12,4 +12,4 @@ cache:
1212
install: true
1313

1414
script:
15-
- mvn -U -C -Dnon.final=true clean verify
15+
- mvn -U -C -Pstaging -Dnon.final=true clean verify

api/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -57,12 +57,12 @@
5757
</group>
5858
</groups>
5959
<bottom>
60-
<![CDATA[Copyright &#169; 2012-2017,
60+
<![CDATA[Copyright &#169; 2012-2018,
6161
<a href="http://www.oracle.com">Oracle</a>
6262
and/or its affiliates. All Rights Reserved.
6363
Use is subject to
6464
<a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
65-
<br>Comments to : jsonp-[email protected]
65+
<br>Comments to : jsonp-[email protected]
6666
]]>
6767
</bottom>
6868
<links>

api/src/main/java/javax/json/JsonArrayBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
* </code>
7171
* </pre>
7272
*
73-
* <p>This class does <em>not</em> allow <tt>null</tt> to be used as a
73+
* <p>This class does <em>not</em> allow <code>null</code> to be used as a
7474
* value while building the JSON array
7575
*
7676
* @see JsonObjectBuilder

api/src/main/java/javax/json/JsonException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public JsonException(String message) {
4343
* @param message the detail message (which is saved for later retrieval
4444
* by the {@link #getMessage()} method).
4545
* @param cause the cause (which is saved for later retrieval by the
46-
* {@link #getCause()} method). (A <tt>null</tt> value is
46+
* {@link #getCause()} method). (A <code>null</code> value is
4747
* permitted, and indicates that the cause is nonexistent or
4848
* unknown.)
4949
*/

api/src/main/java/javax/json/JsonObjectBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
* </code>
8787
* </pre>
8888
*
89-
* <p>This class does <em>not</em> allow <tt>null</tt> to be used as a name or
89+
* <p>This class does <em>not</em> allow <code>null</code> to be used as a name or
9090
* value while building the JSON object
9191
*
9292
* @see JsonArrayBuilder

api/src/main/java/javax/json/stream/JsonGenerationException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public JsonGenerationException(String message) {
4545
* @param message the detail message (which is saved for later retrieval
4646
* by the {@link #getMessage()} method).
4747
* @param cause the cause (which is saved for later retrieval by the
48-
* {@link #getCause()} method). (A <tt>null</tt> value is
48+
* {@link #getCause()} method). (A <code>null</code> value is
4949
* permitted, and indicates that the cause is nonexistent or
5050
* unknown.)
5151
*/

api/src/main/java/javax/json/stream/JsonParsingException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public JsonParsingException(String message, JsonLocation location) {
4949
* @param message the detail message (which is saved for later retrieval
5050
* by the {@link #getMessage()} method).
5151
* @param cause the cause (which is saved for later retrieval by the
52-
* {@link #getCause()} method). (A <tt>null</tt> value is
52+
* {@link #getCause()} method). (A <code>null</code> value is
5353
* permitted, and indicates that the cause is nonexistent or
5454
* unknown.)
5555
* @param location the location of the incorrect JSON

bundles/licensee/pom.xml

Lines changed: 0 additions & 85 deletions
This file was deleted.

bundles/licensee/src/main/assembly/archive.xml

Lines changed: 0 additions & 46 deletions
This file was deleted.

bundles/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,4 @@
3737
<modules>
3838
<module>ri</module>
3939
</modules>
40-
<profiles>
41-
<profile>
42-
<id>licensee</id>
43-
<modules>
44-
<module>licensee</module>
45-
</modules>
46-
</profile>
47-
</profiles>
4840
</project>

0 commit comments

Comments
 (0)