Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-text into 1.5
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/b237eb9d Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/b237eb9d Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/b237eb9d Branch: refs/heads/master Commit: b237eb9d4d2e6f9a42b9cd54ade661622e3bc95e Parents: e1af89b da913a0 Author: Rob Tompkins <chtom...@apache.org> Authored: Mon Oct 1 08:24:47 2018 -0400 Committer: Rob Tompkins <chtom...@apache.org> Committed: Mon Oct 1 08:24:47 2018 -0400 ---------------------------------------------------------------------- pom.xml | 4 +++- src/assembly/src.xml | 2 +- .../org/apache/commons/text/lookup/ConstantStringLookup.java | 1 - .../org/apache/commons/text/lookup/JavaPlatformStringLookup.java | 2 +- .../org/apache/commons/text/lookup/PropertiesStringLookup.java | 2 +- src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-text/blob/b237eb9d/pom.xml ----------------------------------------------------------------------
