[sikuli] 137/385: manually added #8 from iirekm/master

[Gilles Filippini]

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

pini pushed a commit to tag upstream/1.1.0_beta1
in repository sikuli.

commit d7c433009a84ad110c26174017e92136d489f0b8
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Tue Jan 7 18:59:24 2014 +0100

    manually added #8 from iirekm/master
---
 Basics/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Basics/pom.xml b/Basics/pom.xml
index ad80155..5154d4b 100755
--- a/Basics/pom.xml
+++ b/Basics/pom.xml
@@ -46,6 +46,13 @@
       <groupId>com.nativelibs4java</groupId>
       <artifactId>bridj</artifactId>
       <version>0.6.2</version>
+      <exclusions>
+        <!-- exclude this artifact - it includes old junit, which causes problems in classpath -->
+        <exclusion>
+          <groupId>com.google.android.tools</groupId>
+          <artifactId>dx</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 

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