Merge branch 'master' into nkpgrafika

ceskaexpedice · May 24, 2016 · a3a91b8 · a3a91b8
2 parents ded0a8a + 81085db
commit a3a91b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/buildSrc/lib/jai_core-1.1.3.jar b/buildSrc/lib/jai_core-1.1.3.jar
diff --git a/buildSrc/lib/jai_imageio-1.1.jar b/buildSrc/lib/jai_imageio-1.1.jar
diff --git a/common/build.gradle b/common/build.gradle
@@ -60,7 +60,9 @@ dependencies {
 
     compile "javax.media.jai:com.springsource.javax.media.jai.core:1.1.3"
     compile "javax.media.jai:com.springsource.javax.media.jai.codec:1.1.3"
-    compile "com.sun.media:jai_imageio:1.1"
+    compile module(name:"jai_imageio-1.1") {
+	dependencies name:"jai_core-1.1.3"
+    }
     compile "org.fcrepo:mptstore:0.9.4"
     compile "commons-dbcp:commons-dbcp:1.4"
     compile "net.sf.json-lib:json-lib:2.3:jdk15"