Inherit optional and getter evaluation

.travis.yml

@@ -1,25 +1,32 @@
 # use Docker-based container (instead of OpenVZ)
 sudo: false
 
-cache:
-  directories:
-    - $HOME/.ivy2/cache
-    # Cache the sbt launcher, currently the Travis VM preinstalls 0.13.5
-    - $HOME/.sbt/launchers/0.13.7
-    # Cache scala, currently the Travis VM preinstalls 2.11.2 & 2.10.4
-    #- $HOME/.sbt/boot/scala-$TRAVIS_SCALA_VERSION
-
-    # Updates regarding Travis VM preinstalls:
-    # https://github.com/travis-ci/travis-cookbooks/blob/master/changes.md
-
 language: scala
 
-jdk:
-  - oraclejdk8
+before_install: curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh
+install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx32m -version
 
-script:
-  - sbt ++$TRAVIS_SCALA_VERSION test doc
+jobs:
+  include:
+     - stage: jdk8
+       name: "test and docs on jdk8"
+       script: sbt ++$TRAVIS_SCALA_VERSION test doc
+     - stage: jdk11
+       name: "test and docs on jdk11"
+       script: sbt ++$TRAVIS_SCALA_VERSION test doc
+       env: TRAVIS_JDK=11
 
+env:
+  global:
+    - TRAVIS_JDK=8
+
+before_cache:
   # Remove to avoid unnecessary cache updates
   - find $HOME/.sbt -name "*.lock" -delete
   - find $HOME/.ivy2 -name "ivydata-*.properties" -delete
+
+cache:
+  directories:
+    - $HOME/.ivy2/cache
+    - $HOME/.sbt/boot
+    - $HOME/.jabba/jdk

CONTRIBUTING.md

@@ -14,7 +14,7 @@ fine... just be willing to revise it!
 Before we can accept pull requests, you will need to agree to the
 Typesafe Contributor License Agreement online, using your GitHub
 account - it takes 30 seconds.  You can do this at
-http://www.typesafe.com/contribute/cla
+https://www.lightbend.com/contribute/cla
 
 Expect that most PRs will need revision before merge. If people
 suggest revisions, you can make them yourself or wait for a
@@ -23,38 +23,4 @@ more revision will likely be needed.
 
 # Making a release
 
-To make a release you'll need to be a maintainer with GitHub
-permissions to push to the master and gh-pages branches, and
-Sonatype permissions to publish.
-
-Here are the steps, which should be automated but aren't (PR
-welcome!):
-
-  1. write release notes in NEWS.md following the format
-     already in there. update README with the new version.
-     Commit.
-  2. create a signed git tag "vX.Y.Z"
-  3. start sbt; `show version` should confirm that the version was
-     taken from the tag
-  4. clean
-  5. test (double check that release works)
-  6. doc (double check that docs build, plus build docs
-     to be copied to gh-pages later)
-  7. if test or doc fails, delete the tag, fix it, start over.
-  8. publishSigned
-  9. make a separate clone of the repo in another directory and
-      check out the gh-pages branch
-  10. /bin/rm -rf latest/api on gh-pages checkout
-  11. copy config/target/api from master checkout to vX.Y.Z in
-      gh-pages so you have vX.Y.Z/index.html
-  12. copy config/target/api from master checkout into latest/
-      so you have latest/api/index.html
-  13. commit all that to gh-pages, check the diff for sanity
-      (latest/api should be mostly just changed timestamps)
-  14. push gh-pages
-  15. log into sonatype website and go through the usual hoops
-      (under Staging Repositories, search for com.typesafe, verify the
-      artifacts in it, close, release)
-  16. push the "vX.Y.Z" tag
-  17. announce release, possibly wait for maven central to sync
-      first
+See RELEASING.md

HOCON.md

@@ -109,7 +109,7 @@ the config file to the computer program.
 ## Syntax
 
 Much of this is defined with reference to JSON; you can find the
-JSON spec at http://json.org/ of course.
+JSON spec at https://json.org/ of course.
 
 ### Unchanged from JSON
 
@@ -317,11 +317,6 @@ String value concatenation is allowed in field keys, in addition
 to field values and array elements. Objects and arrays do not make
 sense as field keys.
 
-Note: Akka 2.0 (and thus Play 2.0) contains an embedded
-implementation of the config lib which does not support array and
-object value concatenation; it only supports string value
-concatenation.
-
 #### String value concatenation
 
 String value concatenation is the trick that makes unquoted
@@ -739,9 +734,6 @@ optional (`${?a}` not `${a}`), which allows `a += b` to be the
 first mention of `a` in the file (it is not necessary to have `a =
 []` first).
 
-Note: Akka 2.0 (and thus Play 2.0) contains an embedded
-implementation of the config lib which does not support `+=`.
-
 #### Examples of Self-Referential Substitutions
 
 In isolation (with no merges involved), a self-referential field
@@ -959,11 +951,6 @@ word `"include"`, only unquoted `include` is special:
 
     { "include" : 42 }
 
-Note: Akka 2.0 (and thus Play 2.0) contains an embedded
-implementation of the config lib which does not support the
-`url()`/`file()`/`classpath()` syntax. Only the heuristic `include
-"foo"` syntax is supported in that version.
-
 #### Include semantics: merging
 
 An _including file_ contains the include statement and an
@@ -1337,7 +1324,7 @@ such that following the standard leads to people being confused.
 Worse, common usage varies based on whether people are talking
 about RAM or disk sizes, and various existing operating systems
 and apps do all kinds of different things.  See
-http://en.wikipedia.org/wiki/Binary_prefix#Deviation_between_powers_of_1024_and_powers_of_1000
+https://en.wikipedia.org/wiki/Binary_prefix#Deviation_between_powers_of_1024_and_powers_of_1000
 for examples. It appears impossible to sort this out without
 causing confusion for someone sometime.
 
@@ -1427,7 +1414,7 @@ way to get rid of default fallback values they don't want.
 
 It may be useful to merge Java properties data with data loaded
 from JSON or HOCON. See the Java properties spec here:
-http://download.oracle.com/javase/7/docs/api/java/util/Properties.html#load%28java.io.Reader%29
+https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html#load-java.io.Reader-
 
 Java properties parse as a one-level map from string keys to
 string values.

LICENSE-2.0.txt

@@ -1,7 +1,7 @@
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -193,7 +193,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

NEWS.md

@@ -1,3 +1,41 @@
+# 1.4.0: October 11, 2019
+
+- `application.conf` variables can now override variables in `reference.conf` [#619](https://github.com/lightbend/config/issues/167)
+- performance improvement through capacity hint for `ArrayList` [#648](https://github.com/lightbend/config/pull/648)
+
+(This was previously published as 1.3.5-RC1 but deemed a large enough change to require a minor version rather than a patch)
+
+# 1.3.4: April 18, 2019
+
+- it is now possible to override any configuration setting from environment variables ([#620](/../../pull/620)) thanks to [@andreaTP](https://github.com/andreaTP)
+- added support for integer keys that are longer than `Int` ([#568](/../../pull/568)) thanks to [@michalmela](https://github.com/michalmela)
+- `Missing` exception now has a reference to the origin `Config` ([#585](/../../pull/585)) thanks to [@vagola](https://github.com/vagola)
+- performance improvements to `resolve()` ([#578](/../../pull/578)) thanks to [@sam-token](https://github.com/sam-token)
+- config file syntax is now resolved when parsing `InputStream` ([#573](/../../pull/573)) thanks to [@ntviet18](https://github.com/ntviet18)
+- it is now possible to use `@Optional` on keys that are reserved words ([#570](/../../pull/570)) thanks to [@radist-nt](https://github.com/radist-nt)
+- `ValidationProblem` is now serializable ([#437](/../../pull/437)) thanks to [@iantabolt](https://github.com/iantabolt)
+
+All of the merged PRs can be found in the [release milestone](https://github.com/lightbend/config/milestone/4?closed=1).
+
+# 1.3.3: February 22, 2018
+
+- artifact now includes `Automatic-Module-Name` which makes it consumable as Java 9 module.
+- minor issue fix. All of the fixed issues can be found in the [milestone page](https://github.com/lightbend/config/milestone/3?closed=1).
+
+# 1.3.2: October 6, 2017
+
+- environment variables are now able to be resolved to lists in
+  the same fashion as system properties.
+- added `getPeriod()` which returns time units as
+  `java.time.Period`. Currently supported periods are days, weeks,
+  months and years. [More information here](HOCON.md#period-format).
+- `ConfigResolveOptions` now has `appendResolver(...)` which allows
+  having custom behavior when unresolved substitutions are encountered
+  during resolution.
+- Config Beans now support `Set` collection.
+- a few other small bugfixes. All of the fixed issues can be found
+  in the [milestone page](https://github.com/lightbend/config/milestone/1?closed=1).
+
 # 1.3.1: September 24, 2016
 
 - added `include required("foo")` syntax to specify includes that
@@ -208,7 +246,7 @@ Thank you to contributors with commits since v1.2.1 tag:
  - build jar using Java 1.6 (and enforce this in build)
  - change getDuration to return unboxed long instead of boxed
  - API documentation improvements
-   http://typesafehub.github.io/config/latest/api/
+   https://lightbend.github.io/config/latest/api/
 
 # 1.1.0-9f31d6308e7ebbc3d7904b64ebb9f61f7e22a968: January 6, 2014
 
@@ -226,7 +264,7 @@ Thank you to contributors with commits since v1.2.1 tag:
  - new API Config.getDuration() replaces getMilliseconds and
    getNanoseconds. (should it return `long` instead of `Long` even
    though it's been in git for a while? weigh in at
-   https://github.com/typesafehub/config/issues/119 )
+   https://github.com/lightbend/config/issues/119 )
  - new API ConfigResolveOptions.setAllowUnresolved lets you
    partially-resolve a Config
  - new API Config.isResolved lets you check on resolution status