Changeset d621e19

Timestamp:

Apr 17, 2018 5:01:24 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

ea9a332

Parents:

1ba7fb9

Message:

json-smart-v1 lib for DoH and i2pcontrol
Copied from i2p.plugins.i2pcontrol.
Does not include JSON-RPC2, that stays in the plugin.
i2pcontrol checkin notes:
Smart Mini files (net.minidev.json) from:
​https://github.com/netplex/json-smart-v1
commit 51e1641 on Oct 23, 2015
Essentially version 1.3.2 (1.3.1+)
Licensed Apache 2.0.
Removed as unneeded: JSONNavi.java, JSONStyleIdent.java
Not in Debian/Ubuntu?
Version in Maven Central (1.0.8) is too old

Files:

• LICENSE.txt (modified) (1 diff)
• build.xml (modified) (1 diff)
• core/java/src/net/minidev/json/JSONArray.java (added)
• core/java/src/net/minidev/json/JSONAware.java (added)
• core/java/src/net/minidev/json/JSONAwareEx.java (added)
• core/java/src/net/minidev/json/JSONObject.java (added)
• core/java/src/net/minidev/json/JSONStreamAware.java (added)
• core/java/src/net/minidev/json/JSONStreamAwareEx.java (added)
• core/java/src/net/minidev/json/JSONStyle.java (added)
• core/java/src/net/minidev/json/JSONUtil.java (added)
• core/java/src/net/minidev/json/JSONValue.java (added)
• core/java/src/net/minidev/json/JStylerObj.java (added)
• core/java/src/net/minidev/json/parser/ContainerFactory.java (added)
• core/java/src/net/minidev/json/parser/ContentHandler.java (added)
• core/java/src/net/minidev/json/parser/ContentHandlerCompressor.java (added)
• core/java/src/net/minidev/json/parser/ContentHandlerDumy.java (added)
• core/java/src/net/minidev/json/parser/FakeContainerFactory.java (added)
• core/java/src/net/minidev/json/parser/JSONParser.java (added)
• core/java/src/net/minidev/json/parser/JSONParserBase.java (added)
• core/java/src/net/minidev/json/parser/JSONParserByteArray.java (added)
• core/java/src/net/minidev/json/parser/JSONParserInputStream.java (added)
• core/java/src/net/minidev/json/parser/JSONParserMemory.java (added)
• core/java/src/net/minidev/json/parser/JSONParserReader.java (added)
• core/java/src/net/minidev/json/parser/JSONParserStream.java (added)
• core/java/src/net/minidev/json/parser/JSONParserString.java (added)
• core/java/src/net/minidev/json/parser/ParseException.java (added)
• core/java/src/net/minidev/json/reader/ArrayWriter.java (added)
• core/java/src/net/minidev/json/reader/BeansWriter.java (added)
• core/java/src/net/minidev/json/reader/JsonWriter.java (added)
• core/java/src/net/minidev/json/reader/JsonWriterI.java (added)

LICENSE.txt

@@ -87 +87 @@
    HostnameVerifier:
    From Apache HttpClient 4.4.1 and HttpCore 4.4.1
+   See licenses/LICENSE-Apache2.0.txt
+
+   json-smart-v1 1.3.1+
+   Copyright 2011 JSON-SMART authors
    See licenses/LICENSE-Apache2.0.txt
 

build.xml

@@ -785 +785 @@
             doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
             windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
-            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util" />
+            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util:net.minidev.json:net.minidev.json.*" />
             <group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" />
             <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters:com.maxmind.geoip" />