You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2017/06/03 10:21:10 UTC
ant-ivy git commit: Fix regression in tutorials
Repository: ant-ivy
Updated Branches:
refs/heads/master 990eb7500 -> 95a524ea0
Fix regression in tutorials
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/95a524ea
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/95a524ea
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/95a524ea
Branch: refs/heads/master
Commit: 95a524ea06e546330ec3d95b9c139b7edc599b86
Parents: 990eb75
Author: Jaikiran Pai <ja...@gmail.com>
Authored: Sat Jun 3 07:34:44 2017 +0530
Committer: Jaikiran Pai <ja...@gmail.com>
Committed: Sat Jun 3 07:34:44 2017 +0530
----------------------------------------------------------------------
src/example/configurations/jdbc-example/ivy.xml | 2 +-
.../configurations/multi-projects/filter-framework/ivy.xml | 2 +-
.../filter-framework/test/filter/AbstractTestFilter.java | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/95a524ea/src/example/configurations/jdbc-example/ivy.xml
----------------------------------------------------------------------
diff --git a/src/example/configurations/jdbc-example/ivy.xml b/src/example/configurations/jdbc-example/ivy.xml
index 41f080e..8e42350 100644
--- a/src/example/configurations/jdbc-example/ivy.xml
+++ b/src/example/configurations/jdbc-example/ivy.xml
@@ -39,6 +39,6 @@
<!-- when launching our app in production environement we needs other jdbc driver -->
<dependency org="mm-mysql" name="mm-mysql" rev="2.0.7" conf="runprod->default"/>
<!-- junit is only need in the test configuration-->
- <dependency org="junit" name="junit" rev="3.8" conf="test->default"/>
+ <dependency org="junit" name="junit" rev="4.12" conf="test->default"/>
</dependencies>
</ivy-module>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/95a524ea/src/example/configurations/multi-projects/filter-framework/ivy.xml
----------------------------------------------------------------------
diff --git a/src/example/configurations/multi-projects/filter-framework/ivy.xml b/src/example/configurations/multi-projects/filter-framework/ivy.xml
index 952f577..fc5e6de 100644
--- a/src/example/configurations/multi-projects/filter-framework/ivy.xml
+++ b/src/example/configurations/multi-projects/filter-framework/ivy.xml
@@ -31,6 +31,6 @@
</publications>
<dependencies>
<dependency org="commons-collections" name="commons-collections" rev="3.1" conf="cc-impl->default"/>
- <dependency org="junit" name="junit" rev="3.8" conf="test->default"/>
+ <dependency org="junit" name="junit" rev="4.12" conf="test->default"/>
</dependencies>
</ivy-module>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/95a524ea/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
----------------------------------------------------------------------
diff --git a/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java b/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
index 5d7e133..11bce97 100644
--- a/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
+++ b/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
@@ -29,17 +29,17 @@ public abstract class AbstractTestFilter {
*/
public abstract IFilter getIFilter();
- @Test(expected = NullPointerException.class)
+ @Test
public void testFilterNull() {
getIFilter().filter(null, null);
}
- @Test(expected = NullPointerException.class)
+ @Test
public void testFilterNullValues() {
getIFilter().filter(null, "test");
}
- @Test(expected = NullPointerException.class)
+ @Test
public void testFilterNullPrefix() {
getIFilter().filter(new String[]{"test"}, null);
}