Repository: camel Updated Branches: refs/heads/master 16f4d2e92 -> 799d3cbc7
downgrade JUnit 4.12 to 4.11 as camel-itest-karaf doesn't work with JUnit 4.12 at present Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/799d3cbc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/799d3cbc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/799d3cbc Branch: refs/heads/master Commit: 799d3cbc7b1103070d1631b4cd5c00cf7202c361 Parents: 16f4d2e Author: Christian Mueller <cmuel...@apache.org> Authored: Sat Apr 25 17:28:25 2015 +0200 Committer: Christian Mueller <cmuel...@apache.org> Committed: Sat Apr 25 17:28:25 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/799d3cbc/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 525bcac..d64f230 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -294,8 +294,9 @@ <jt400-bundle-version>6.7_1</jt400-bundle-version> <juel-bundle-version>2.1.3_1</juel-bundle-version> <juel-version>2.1.3</juel-version> - <junit-bundle-version>4.12_1</junit-bundle-version> - <junit-version>4.12</junit-version> + <!-- camel-itest-karaf doesn't work with JUnit 4.12 at present --> + <junit-bundle-version>4.11_1</junit-bundle-version> + <junit-version>4.11</junit-version> <jython-version>2.5.3</jython-version> <jzlib-version>1.1.3</jzlib-version> <kafka-version>0.8.2.0</kafka-version>