# HG changeset patch # User robcast # Date 1456392114 -3600 # Node ID b084694ec6182b4fb764899a30c05dbb4a2380ea # Parent 43614b59adf8720cc2ec50a096b229c00d7f81b0# Parent ef98becd15b1626010d8d1166f4214f22b87fee6 Merge from default ef98becd15b1626010d8d1166f4214f22b87fee6 diff -r ef98becd15b1 -r b084694ec618 .hgtags --- a/.hgtags Fri Feb 05 19:03:45 2016 +0100 +++ b/.hgtags Thu Feb 25 10:21:54 2016 +0100 @@ -7,3 +7,7 @@ 47006645dc1270ba275253fddca5aa5c44e69ba1 Root_digilibPDF a336f89a9fbf0a79f964d9750b56d4e6f83bb4c8 release_1_2 16c847c3291cd5e7ddba329c6dbac64148d772f7 Root_gen2_1 +59805085a237f5ac97c9884691811a283bd7dc03 release-2.3.1 +2a248500ede2875d88ac5bf52d933639462f4078 release-2.3.4 +01c50fb9285659b97f1374f36dc91ece4691d917 release-2.3.6 +42fb22288b55529a271e3ff1c18b262e40f9ba58 release-2.3.7 diff -r ef98becd15b1 -r b084694ec618 common-bioformats/pom.xml --- a/common-bioformats/pom.xml Fri Feb 05 19:03:45 2016 +0100 +++ b/common-bioformats/pom.xml Thu Feb 25 10:21:54 2016 +0100 @@ -3,7 +3,7 @@ digilib digilib - 2.3-SNAPSHOT + 2.3.7 .. digilib-common-bioformats diff -r ef98becd15b1 -r b084694ec618 common-imagej/pom.xml --- a/common-imagej/pom.xml Fri Feb 05 19:03:45 2016 +0100 +++ b/common-imagej/pom.xml Thu Feb 25 10:21:54 2016 +0100 @@ -3,7 +3,7 @@ digilib digilib - 2.3-SNAPSHOT + 2.3.7 .. digilib-common-imagej diff -r ef98becd15b1 -r b084694ec618 common-jai/pom.xml --- a/common-jai/pom.xml Fri Feb 05 19:03:45 2016 +0100 +++ b/common-jai/pom.xml Thu Feb 25 10:21:54 2016 +0100 @@ -3,7 +3,7 @@ digilib digilib - 2.3-SNAPSHOT + 2.3.7 .. digilib-common-jai diff -r ef98becd15b1 -r b084694ec618 common/pom.xml --- a/common/pom.xml Fri Feb 05 19:03:45 2016 +0100 +++ b/common/pom.xml Thu Feb 25 10:21:54 2016 +0100 @@ -6,7 +6,7 @@ digilib digilib - 2.3-SNAPSHOT + 2.3.7 digilib-common diff -r ef98becd15b1 -r b084694ec618 common/src/main/java/digilib/conf/DigilibConfiguration.java --- a/common/src/main/java/digilib/conf/DigilibConfiguration.java Fri Feb 05 19:03:45 2016 +0100 +++ b/common/src/main/java/digilib/conf/DigilibConfiguration.java Thu Feb 25 10:21:54 2016 +0100 @@ -57,7 +57,7 @@ /** digilib version */ public static String getClassVersion() { - return "2.3.8a"; + return "2.3.8"; } /* non-static getVersion for Java inheritance */ diff -r ef98becd15b1 -r b084694ec618 doc/pom.xml --- a/doc/pom.xml Fri Feb 05 19:03:45 2016 +0100 +++ b/doc/pom.xml Thu Feb 25 10:21:54 2016 +0100 @@ -3,7 +3,7 @@ digilib digilib - 2.3-SNAPSHOT + 2.3.7 digilib-doc pom diff -r ef98becd15b1 -r b084694ec618 pdf/pom.xml --- a/pdf/pom.xml Fri Feb 05 19:03:45 2016 +0100 +++ b/pdf/pom.xml Thu Feb 25 10:21:54 2016 +0100 @@ -4,7 +4,7 @@ digilib digilib - 2.3-SNAPSHOT + 2.3.7 digilib-pdf digilib-pdf diff -r ef98becd15b1 -r b084694ec618 pom.xml --- a/pom.xml Fri Feb 05 19:03:45 2016 +0100 +++ b/pom.xml Thu Feb 25 10:21:54 2016 +0100 @@ -1,6 +1,5 @@ - + 4.0.0 @@ -9,7 +8,7 @@ digilib digilib - 2.3-SNAPSHOT + 2.3.7 pom digilib @@ -80,6 +79,7 @@ scm:hg:http://hg.code.sf.net/p/digilib/code scm:hg:https://hg.code.sf.net/p/digilib/code https://sourceforge.net/p/digilib/code/ci/default/tree + release-2.3.7 Trac @@ -196,57 +196,57 @@ digilib digilib-common - 2.3-SNAPSHOT + 2.3.7 digilib digilib-common-jai - 2.3-SNAPSHOT + 2.3.7 digilib digilib-common-imagej - 2.3-SNAPSHOT + 2.3.7 digilib digilib-common-bioformats - 2.3-SNAPSHOT + 2.3.7 digilib digilib-doc - 2.3-SNAPSHOT + 2.3.7 digilib digilib-pdf - 2.3-SNAPSHOT + 2.3.7 digilib digilib-text - 2.3-SNAPSHOT + 2.3.7 digilib digilib-servlet - 2.3-SNAPSHOT + 2.3.7 digilib digilib-servlet2 - 2.3-SNAPSHOT + 2.3.7 digilib digilib-servlet3 - 2.3-SNAPSHOT + 2.3.7 digilib digilib-webapp - 2.3-SNAPSHOT + 2.3.7 diff -r ef98becd15b1 -r b084694ec618 servlet/pom.xml --- a/servlet/pom.xml Fri Feb 05 19:03:45 2016 +0100 +++ b/servlet/pom.xml Thu Feb 25 10:21:54 2016 +0100 @@ -1,11 +1,10 @@ - + 4.0.0 digilib digilib - 2.3-SNAPSHOT + 2.3.7 digilib-servlet digilib-servlet diff -r ef98becd15b1 -r b084694ec618 servlet2/pom.xml --- a/servlet2/pom.xml Fri Feb 05 19:03:45 2016 +0100 +++ b/servlet2/pom.xml Thu Feb 25 10:21:54 2016 +0100 @@ -1,11 +1,10 @@ - + 4.0.0 digilib digilib - 2.3-SNAPSHOT + 2.3.7 digilib-servlet2 digilib-servlet2 diff -r ef98becd15b1 -r b084694ec618 servlet3/pom.xml --- a/servlet3/pom.xml Fri Feb 05 19:03:45 2016 +0100 +++ b/servlet3/pom.xml Thu Feb 25 10:21:54 2016 +0100 @@ -3,7 +3,7 @@ digilib digilib - 2.3-SNAPSHOT + 2.3.7 digilib-servlet3 digilib-servlet3 diff -r ef98becd15b1 -r b084694ec618 text/pom.xml --- a/text/pom.xml Fri Feb 05 19:03:45 2016 +0100 +++ b/text/pom.xml Thu Feb 25 10:21:54 2016 +0100 @@ -4,7 +4,7 @@ digilib digilib - 2.3-SNAPSHOT + 2.3.7 digilib-text digilib-text diff -r ef98becd15b1 -r b084694ec618 webapp/pom.xml --- a/webapp/pom.xml Fri Feb 05 19:03:45 2016 +0100 +++ b/webapp/pom.xml Thu Feb 25 10:21:54 2016 +0100 @@ -1,12 +1,10 @@ - + 4.0.0 digilib digilib - 2.3-SNAPSHOT + 2.3.7 digilib-webapp digilib-webapp diff -r ef98becd15b1 -r b084694ec618 webapp/src/main/webapp/jquery/jquery.digilib.js --- a/webapp/src/main/webapp/jquery/jquery.digilib.js Fri Feb 05 19:03:45 2016 +0100 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.js Thu Feb 25 10:21:54 2016 +0100 @@ -45,7 +45,7 @@ var defaults = { // version of this script - 'version' : 'jquery.digilib.js 2.3.7d', + 'version' : 'jquery.digilib.js 2.3.8', // logo url 'logoUrl' : 'img/digilib-logo-text1.png', // homepage url (behind logo)