Merge branch '2.1.x'

This commit is contained in:
Andy Wilkinson
2019-03-28 11:48:47 +00:00
125 changed files with 450 additions and 447 deletions

View File

@@ -19,7 +19,7 @@ package org.springframework.boot.configurationprocessor.json;
// Note: this class was written without inspecting the non-free org.json source code.
/**
* Parses a JSON (<a href="http://www.ietf.org/rfc/rfc4627.txt">RFC 4627</a>) encoded
* Parses a JSON (<a href="https://www.ietf.org/rfc/rfc4627.txt">RFC 4627</a>) encoded
* string into the corresponding object. Most clients of this class will use only need the
* {@link #JSONTokener(String) constructor} and {@link #nextValue} method. Example usage:
* <pre>