# HG changeset patch # User Robert Casties # Date 1511274218 -3600 # Node ID cf9dcddf4ec64aadfcc3984155c2019edf685b08 # Parent 75a74f7045b482e53f3378cbc93a307fdd3024aa Updated version numbers to 2.5.4. diff -r 75a74f7045b4 -r cf9dcddf4ec6 common-bioformats/pom.xml --- a/common-bioformats/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/common-bioformats/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -3,7 +3,7 @@ digilib digilib - 2.5.3 + 2.5.4 .. digilib-common-bioformats diff -r 75a74f7045b4 -r cf9dcddf4ec6 common-imagej/pom.xml --- a/common-imagej/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/common-imagej/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -3,7 +3,7 @@ digilib digilib - 2.5.3 + 2.5.4 .. digilib-common-imagej diff -r 75a74f7045b4 -r cf9dcddf4ec6 common-jai/pom.xml --- a/common-jai/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/common-jai/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -3,7 +3,7 @@ digilib digilib - 2.5.3 + 2.5.4 .. digilib-common-jai diff -r 75a74f7045b4 -r cf9dcddf4ec6 common/pom.xml --- a/common/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/common/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -6,7 +6,7 @@ digilib digilib - 2.5.3 + 2.5.4 digilib-common diff -r 75a74f7045b4 -r cf9dcddf4ec6 common/src/main/java/digilib/conf/DigilibConfiguration.java --- a/common/src/main/java/digilib/conf/DigilibConfiguration.java Tue Nov 21 15:18:31 2017 +0100 +++ b/common/src/main/java/digilib/conf/DigilibConfiguration.java Tue Nov 21 15:23:38 2017 +0100 @@ -57,11 +57,7 @@ /** digilib version */ public static String getClassVersion() { -<<<<<<< HEAD - return "2.5.3"; -======= - return "2.5.4a"; ->>>>>>> refs/heads/master + return "2.5.4"; } /* non-static getVersion for Java inheritance */ diff -r 75a74f7045b4 -r cf9dcddf4ec6 doc/pom.xml --- a/doc/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/doc/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -3,7 +3,7 @@ digilib digilib - 2.5.3 + 2.5.4 digilib-doc pom diff -r 75a74f7045b4 -r cf9dcddf4ec6 iiif-presentation/pom.xml --- a/iiif-presentation/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/iiif-presentation/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -6,7 +6,7 @@ digilib digilib - 2.5.3 + 2.5.4 digilib-iiif-presentation digilib-iiif-presentation diff -r 75a74f7045b4 -r cf9dcddf4ec6 pdf/pom.xml --- a/pdf/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/pdf/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -4,7 +4,7 @@ digilib digilib - 2.5.3 + 2.5.4 digilib-pdf digilib-pdf diff -r 75a74f7045b4 -r cf9dcddf4ec6 pom.xml --- a/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -8,7 +8,7 @@ digilib digilib - 2.5.3 + 2.5.4 pom digilib @@ -201,62 +201,62 @@ digilib digilib-common - 2.5.3 + 2.5.4 digilib digilib-common-jai - 2.5.3 + 2.5.4 digilib digilib-common-imagej - 2.5.3 + 2.5.4 digilib digilib-common-bioformats - 2.5.3 + 2.5.4 digilib digilib-doc - 2.5.3 + 2.5.4 digilib digilib-pdf - 2.5.3 + 2.5.4 digilib digilib-text - 2.5.3 + 2.5.4 digilib digilib-iiif-presentation - 2.5.3 + 2.5.4 digilib digilib-servlet - 2.5.3 + 2.5.4 digilib digilib-servlet2 - 2.5.3 + 2.5.4 digilib digilib-servlet3 - 2.5.3 + 2.5.4 digilib digilib-webapp - 2.5.3 + 2.5.4 diff -r 75a74f7045b4 -r cf9dcddf4ec6 servlet/pom.xml --- a/servlet/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/servlet/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -5,7 +5,7 @@ digilib digilib - 2.5.3 + 2.5.4 digilib-servlet digilib-servlet diff -r 75a74f7045b4 -r cf9dcddf4ec6 servlet2/pom.xml --- a/servlet2/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/servlet2/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -5,7 +5,7 @@ digilib digilib - 2.5.3 + 2.5.4 digilib-servlet2 digilib-servlet2 diff -r 75a74f7045b4 -r cf9dcddf4ec6 servlet3/pom.xml --- a/servlet3/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/servlet3/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -3,7 +3,7 @@ digilib digilib - 2.5.3 + 2.5.4 digilib-servlet3 digilib-servlet3 diff -r 75a74f7045b4 -r cf9dcddf4ec6 text/pom.xml --- a/text/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/text/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -4,7 +4,7 @@ digilib digilib - 2.5.3 + 2.5.4 digilib-text digilib-text diff -r 75a74f7045b4 -r cf9dcddf4ec6 webapp/pom.xml --- a/webapp/pom.xml Tue Nov 21 15:18:31 2017 +0100 +++ b/webapp/pom.xml Tue Nov 21 15:23:38 2017 +0100 @@ -6,7 +6,7 @@ digilib digilib - 2.5.3 + 2.5.4 digilib-webapp digilib-webapp diff -r 75a74f7045b4 -r cf9dcddf4ec6 webapp/src/main/webapp/jquery/jquery.digilib.js --- a/webapp/src/main/webapp/jquery/jquery.digilib.js Tue Nov 21 15:18:31 2017 +0100 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.js Tue Nov 21 15:23:38 2017 +0100 @@ -45,7 +45,7 @@ var defaults = { // version of this script - 'version' : 'jquery.digilib.js 2.5.3', + 'version' : 'jquery.digilib.js 2.5.4', // logo url 'logoUrl' : 'img/digilib-logo-text1.png', // homepage url (behind logo)