TEXT-2: Resolving merge conflict
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/e3bb7f75 Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/e3bb7f75 Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/e3bb7f75 Branch: refs/heads/master Commit: e3bb7f75a17e613fafa0b9c9a24439fbeda39c13 Parents: 96a6438 43ba723 Author: Rob Tompkins <[email protected]> Authored: Tue Nov 29 19:27:04 2016 -0800 Committer: Rob Tompkins <[email protected]> Committed: Tue Nov 29 19:27:04 2016 -0800 ---------------------------------------------------------------------- .travis.yml | 1 + pom.xml | 6 + src/changes/changes.xml | 1 + .../apache/commons/text/AlphabetConverter.java | 97 ++- .../apache/commons/text/StringEscapeUtils.java | 811 +++++++++++++++++++ .../java/org/apache/commons/text/WordUtils.java | 3 +- .../commons/text/diff/ReplacementsFinder.java | 3 + .../commons/text/diff/StringsComparator.java | 4 +- .../commons/text/names/HumanNameParser.java | 43 +- .../org/apache/commons/text/names/Name.java | 17 +- .../commons/text/names/NameParseException.java | 10 +- .../apache/commons/text/names/NameString.java | 12 +- .../commons/text/similarity/CosineDistance.java | 12 +- .../text/similarity/CosineSimilarity.java | 22 +- .../apache/commons/text/similarity/Counter.java | 4 +- .../commons/text/similarity/EditDistance.java | 1 + .../text/similarity/EditDistanceFrom.java | 2 +- .../commons/text/similarity/FuzzyScore.java | 2 +- .../text/similarity/HammingDistance.java | 2 +- .../text/similarity/JaroWinklerDistance.java | 2 +- .../similarity/LevenshteinDetailedDistance.java | 16 +- .../text/similarity/LevenshteinDistance.java | 8 +- .../text/similarity/LevenshteinResults.java | 4 +- .../commons/text/similarity/RegexTokenizer.java | 8 +- .../text/similarity/SimilarityScoreFrom.java | 2 +- .../text/translate/CharSequenceTranslator.java | 4 +- .../text/translate/LookupTranslator.java | 4 +- .../commons/text/AlphabetConverterTest.java | 42 +- .../commons/text/ExtendedMessageFormatTest.java | 3 +- .../commons/text/StringEscapeUtilsTest.java | 621 ++++++++++++++ .../text/diff/ReplacementsFinderTest.java | 20 +- .../text/diff/StringsComparatorTest.java | 5 +- .../commons/text/names/HumanNameParserTest.java | 14 +- .../text/similarity/CosineDistanceTest.java | 2 +- .../LevenshteinDetailedDistanceTest.java | 6 +- .../ParameterizedEditDistanceFromTest.java | 5 +- .../ParameterizedLevenshteinDistanceTest.java | 2 +- .../ParameterizedSimilarityScoreFromTest.java | 5 +- .../text/similarity/StringMetricFromTest.java | 20 +- .../text/translate/AggregateTranslatorTest.java | 10 +- .../text/translate/EntityArraysTest.java | 14 +- .../text/translate/JavaUnicodeEscaperTest.java | 2 +- .../org/apache/commons/text/names/testNames.txt | 65 +- .../resources/stringEscapeUtilsTestData.txt | 1 + 44 files changed, 1705 insertions(+), 233 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-text/blob/e3bb7f75/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-text/blob/e3bb7f75/src/changes/changes.xml ---------------------------------------------------------------------- diff --cc src/changes/changes.xml index 722aae4,1274672..afa4fa7 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@@ -22,7 -22,7 +22,8 @@@ <body> <release version="1.0" date="tba" description="tba"> + <action issue="TEXT-2" type="add" dev="chtompki" due-to="Don Jeba">Add Jaccard Index and Jaccard Distance</action> + <action issue="TEXT-27" type="add" dev="chtompki">Move org.apache.commons.lang3.StringEscapeUtils.java into text</action> <action issue="TEXT-23" type="add" dev="chtompki">Moving from commons-lang, the package org.apache.commons.lang3.text</action> <action issue="TEXT-10" type="add" dev="kinow" due-to="Don Jeba">A more complex Levenshtein distance</action> <action issue="TEXT-24" type="add" dev="chtompki">Add coveralls and Travis.ci integration</action>
