This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-html4j.git
commit 62202b0d491229ddf635cc69bb6e69e13a35d613
Author: Jaroslav Tulach <jaroslav.tul...@oracle.com>
AuthorDate: Wed Oct 18 04:14:24 2017 +0200
Using JSON library from Android SDK licensed under Apache License 2.0
---
DEPENDENCIES | 8 ++------
ko-felix-test/pom.xml | 4 ++--
ko-osgi-test/pom.xml | 4 ++--
ko-ws-tyrus/pom.xml | 4 ++--
.../java/org/netbeans/html/wstyrus/LoadJSON.java | 20 ++++++++------------
pom.xml | 6 +++---
src/main/javadoc/overview.html | 6 ++++++
7 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/DEPENDENCIES b/DEPENDENCIES
index ba9ae29..4eb2c35 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -7,8 +7,8 @@ HTML APIs via Java
From: 'an unknown organization'
- - OSGi json classes (http://wiki.twentyeleven.de/org.json-osgi)
de.twentyeleven.skysail:org.json-osgi:bundle:20080701
- License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - JSON library from Android SDK (http://developer.android.com/sdk)
com.vaadin.external.google:android-json:jar:0.0.20131108.vaadin1
+ License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- Eclipse Equinox OSGi Framework (http://www.eclipse.org/equinox/)
org.eclipse:org.eclipse.osgi:jar:3.8.0.v20120529-1548
License: Eclipse Public License
(http://www.eclipse.org/legal/epl-v10.html)
- Plexus Cipher: encryption/decryption Component
(http://spice.sonatype.org/plexus-cipher)
org.sonatype.plexus:plexus-cipher:jar:1.4
@@ -32,10 +32,6 @@ From: 'Google, Inc.' (http://www.google.com)
- Sisu Guice - Core Library
(http://code.google.com/p/google-guice/sisu-guice/)
org.sonatype.sisu:sisu-guice:jar:3.1.0
License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
-From: 'JSON' (http://json.org/)
- - JSON (JavaScript Object Notation) (http://www.json.org/java/index.html)
org.json:json:jar:20080701
- License: provided without support or warranty
(http://www.json.org/license.html)
-
From: 'ObjectWeb' (http://www.objectweb.org/)
- ASM Debug All (http://asm.objectweb.org/asm-debug-all/)
org.ow2.asm:asm-debug-all:jar:5.0.3
License: BSD (http://asm.objectweb.org/license.html)
diff --git a/ko-felix-test/pom.xml b/ko-felix-test/pom.xml
index cdc91ff..1f8f74b 100644
--- a/ko-felix-test/pom.xml
+++ b/ko-felix-test/pom.xml
@@ -78,8 +78,8 @@
<systemPath>${jfxrt.jar}</systemPath>
</dependency>
<dependency>
- <groupId>de.twentyeleven.skysail</groupId>
- <artifactId>org.json-osgi</artifactId>
+ <groupId>com.vaadin.external.google</groupId>
+ <artifactId>android-json</artifactId>
</dependency>
<dependency>
<groupId>org.netbeans.html</groupId>
diff --git a/ko-osgi-test/pom.xml b/ko-osgi-test/pom.xml
index 4990cb0..c934edd 100644
--- a/ko-osgi-test/pom.xml
+++ b/ko-osgi-test/pom.xml
@@ -77,8 +77,8 @@
<systemPath>${jfxrt.jar}</systemPath>
</dependency>
<dependency>
- <groupId>de.twentyeleven.skysail</groupId>
- <artifactId>org.json-osgi</artifactId>
+ <groupId>com.vaadin.external.google</groupId>
+ <artifactId>android-json</artifactId>
</dependency>
<dependency>
<groupId>org.netbeans.html</groupId>
diff --git a/ko-ws-tyrus/pom.xml b/ko-ws-tyrus/pom.xml
index 82de6b2..b0bf25c 100644
--- a/ko-ws-tyrus/pom.xml
+++ b/ko-ws-tyrus/pom.xml
@@ -78,8 +78,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>de.twentyeleven.skysail</groupId>
- <artifactId>org.json-osgi</artifactId>
+ <groupId>com.vaadin.external.google</groupId>
+ <artifactId>android-json</artifactId>
</dependency>
<dependency>
<artifactId>javax.websocket-api</artifactId>
diff --git a/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/LoadJSON.java
b/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/LoadJSON.java
index 39cad2b..403b169 100644
--- a/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/LoadJSON.java
+++ b/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/LoadJSON.java
@@ -185,20 +185,16 @@ final class LoadJSON implements Runnable {
private static JSONTokener createTokener(InputStream is) throws
IOException {
Reader r = new InputStreamReader(is, "UTF-8");
- try {
- return new JSONTokener(r);
- } catch (LinkageError ex) {
- // phones may carry outdated version of JSONTokener
- StringBuilder sb = new StringBuilder();
- for (;;) {
- int ch = r.read();
- if (ch == -1) {
- break;
- }
- sb.append((char)ch);
+ StringBuilder sb = new StringBuilder();
+ char[] arr = new char[4096];
+ for (;;) {
+ int len = r.read(arr);
+ if (len == -1) {
+ break;
}
- return new JSONTokener(sb.toString());
+ sb.append(arr, 0, len);
}
+ return new JSONTokener(sb.toString());
}
static Object convertToArray(Object o) throws JSONException {
diff --git a/pom.xml b/pom.xml
index a9d8479..d989cd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -341,9 +341,9 @@
org.netbeans.html.boot.impl:org.netbeans.html.boot.fx:org.netbeans.html.context.
</exclusions>
</dependency>
<dependency>
- <groupId>de.twentyeleven.skysail</groupId>
- <artifactId>org.json-osgi</artifactId>
- <version>20080701</version>
+ <groupId>com.vaadin.external.google</groupId>
+ <artifactId>android-json</artifactId>
+ <version>0.0.20131108.vaadin1</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index d3ef56d..88f9bb9 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -51,6 +51,12 @@
yet the application code can be written in Java.
</p>
+ <h3>New in version 1.5.1</h3>
+
+ Using <a target="_blank"
href="http://search.maven.org/#artifactdetails%7Ccom.vaadin.external.google%7Candroid-json%7C0.0.20131108.vaadin1%7Cjar";>Android
JSON</a>
+ parsing library as it is Apache licensed -
+ bug <a target="_blank"
href="https://issues.apache.org/jira/browse/NETBEANS-89";>#89</a>.
+
<h3>New in version 1.5</h3>
<p>
--
To stop receiving notification emails like this one, please contact
"comm...@netbeans.apache.org" <comm...@netbeans.apache.org>.
