# HG changeset patch # User robcast # Date 1445523424 -7200 # Node ID 7247c046d9dc3a42b73fd50a4656bafa22224660 # Parent 840004733070889b90c145f5a63bc2cd0ed89a19 added build-time config to use Twelvemonkeys-ImageIO plugin instead of JAI-ImageIO. activate with "mvn -Dimageio=12m". diff -r 840004733070 -r 7247c046d9dc common/pom.xml --- a/common/pom.xml Thu Oct 22 11:01:19 2015 +0200 +++ b/common/pom.xml Thu Oct 22 16:17:04 2015 +0200 @@ -1,55 +1,104 @@ - - 4.0.0 - - digilib - digilib - 2.3-SNAPSHOT - - digilib-common - digilib-common - The Digital Image Library - common library - http://digilib.sourceforge.net - jar - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.7 - 1.7 - - - - - + + 4.0.0 + + digilib + digilib + 2.3-SNAPSHOT + + + digilib-common + digilib-common + The Digital Image Library - common library + http://digilib.sourceforge.net + jar + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.7 + 1.7 + + + + + - - - com.github.jai-imageio - jai-imageio-core - 1.3.0 - - - - org.devlib.schmidt - imageinfo - 1.9 - jar - compile - - - log4j - log4j - jar - compile - - + + + imageio-jai + + + true + + imageio + jai + + + + + com.github.jai-imageio + jai-imageio-core + 1.3.0 + jar + compile + + + + + + imageio-12m + + + + imageio + 12m + + + + + com.twelvemonkeys.imageio + imageio-jpeg + 3.1.2 + jar + compile + + + com.twelvemonkeys.imageio + imageio-tiff + 3.1.2 + jar + compile + + + + + + + + org.devlib.schmidt + imageinfo + 1.9 + jar + compile + + + log4j + log4j + jar + compile + + diff -r 840004733070 -r 7247c046d9dc pom.xml --- a/pom.xml Thu Oct 22 11:01:19 2015 +0200 +++ b/pom.xml Thu Oct 22 16:17:04 2015 +0200 @@ -3,6 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + UTF-8 + + digilib digilib 2.3-SNAPSHOT @@ -242,9 +246,6 @@ - - UTF-8 - diff -r 840004733070 -r 7247c046d9dc servlet3/pom.xml --- a/servlet3/pom.xml Thu Oct 22 11:01:19 2015 +0200 +++ b/servlet3/pom.xml Thu Oct 22 16:17:04 2015 +0200 @@ -13,7 +13,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 1.7 1.7