[parboiled] 01/02: Merge tag 'upstream/1.1.7'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository parboiled.

commit a143352ad77bdad1f95f2cd9e2fb154c571b2439
Merge: 7100de7 df42e5d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 19 14:02:46 2015 +0100

    Merge tag 'upstream/1.1.7'
    
    Upstream version 1.1.7

 CHANGELOG                                          |  7 +++
 .../calculators/SimpleCalculatorTest.scala         |  4 +-
 .../examples/calculators/TracingTest.scala         |  4 +-
 .../parboiled/examples/json/JsonParserTest.scala   |  4 +-
 .../main/java/org/parboiled/MatcherContext.java    |  2 +-
 .../main/java/org/parboiled/common/Formatter.java  |  4 +-
 .../java/org/parboiled/common/ImmutableList.java   |  2 +-
 .../java/org/parboiled/common/Preconditions.java   | 14 ++---
 .../main/java/org/parboiled/common/Predicates.java |  3 +-
 .../java/org/parboiled/common/StringUtils.java     | 28 +---------
 .../org/parboiled/transform/ParserClassNode.java   |  2 +
 .../java/org/parboiled/transform/RuleMethod.java   |  2 +-
 .../parboiled/transform/RuleMethodRewriter.java    |  2 +-
 .../main/java/org/parboiled/transform/Types.java   |  2 +
 .../java/org/parboiled/transform/AsmTestUtils.java |  6 +-
 .../scala/org/parboiled/scala/BugIn101Test.scala   |  4 +-
 .../org/parboiled/scala/EOIMatchingTest.scala      |  4 +-
 .../org/parboiled/scala/FirstOfStringsTest.scala   |  4 +-
 .../parboiled/scala/LoopedReductionRuleTest.scala  |  4 +-
 .../scala/org/parboiled/scala/NTimesTest.scala     |  4 +-
 .../scala/org/parboiled/scala/RecursionTest.scala  |  4 +-
 .../parboiled/scala/SemanticPredicateTest.scala    |  4 +-
 .../scala/org/parboiled/scala/SimpleTest.scala     |  4 +-
 .../parboiled/scala/SyntacticPredicateTest.scala   |  4 +-
 .../org/parboiled/scala/WithContextTest.scala      |  4 +-
 project/Build.scala                                | 64 ++++++----------------
 project/Dependencies.scala                         | 20 +++++--
 project/Plugins.sbt                                |  4 +-
 project/build.properties                           |  2 +-
 29 files changed, 92 insertions(+), 124 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/parboiled.git