You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2014/07/21 19:17:14 UTC

[1/2] git commit: Make integration tests optional if needed.

Repository: ode
Updated Branches:
  refs/heads/master bbb60bd1f -> 420f051b3


Make integration tests optional if needed.


Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/eed7e660
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/eed7e660
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/eed7e660

Branch: refs/heads/master
Commit: eed7e660f7df4494443361eb7347dc3f33dd9458
Parents: bbb60bd
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Mon Jul 21 19:11:08 2014 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Mon Jul 21 19:11:08 2014 +0200

----------------------------------------------------------------------
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/eed7e660/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 8bbacd4..20a6174 100644
--- a/Rakefile
+++ b/Rakefile
@@ -150,7 +150,7 @@ define "ode" do
     end
     test.setup unzip("#{webapp_dir}/WEB-INF"=>project("dao-jpa-ojpa-derby").package(:zip))
     test.setup unzip("#{webapp_dir}/WEB-INF"=>project("dao-hibernate-db").package(:zip))
-    # test.exclude('*') if Buildr.environment == 'hudson' || ENV["notestng"]
+    test.exclude('*') if ENV["notestng"]
 
     NativeDB.prepare_configs test, _(".")
 


[2/2] git commit: Make java8 happy.

Posted by va...@apache.org.
Make java8 happy.


Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/420f051b
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/420f051b
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/420f051b

Branch: refs/heads/master
Commit: 420f051b3e6f9463a4d0997bedb514e770314dd3
Parents: eed7e66
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Mon Jul 21 19:11:16 2014 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Mon Jul 21 19:11:16 2014 +0200

----------------------------------------------------------------------
 utils/src/main/java/org/apache/ode/utils/stl/CollectionsX.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/420f051b/utils/src/main/java/org/apache/ode/utils/stl/CollectionsX.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/org/apache/ode/utils/stl/CollectionsX.java b/utils/src/main/java/org/apache/ode/utils/stl/CollectionsX.java
index 0c89799..6407037 100644
--- a/utils/src/main/java/org/apache/ode/utils/stl/CollectionsX.java
+++ b/utils/src/main/java/org/apache/ode/utils/stl/CollectionsX.java
@@ -231,7 +231,7 @@ public class CollectionsX {
      */
     @SuppressWarnings("unchecked")
     public static <T> Collection<T> filter(Collection src, final Class<T> aClass) {
-        return filter(new ArrayList<T>(src.size()), src.iterator(), aClass);
+        return (Collection<T>) filter(new ArrayList<T>(src.size()), src.iterator(), aClass);
     }
 
 }