# HG changeset patch
# User Robert Casties <r0bcas7@gmail.com>
# 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 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.5.3</version>
+    <version>2.5.4</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>digilib-common-bioformats</artifactId>
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 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.5.3</version>
+    <version>2.5.4</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>digilib-common-imagej</artifactId>
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 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.5.3</version>
+    <version>2.5.4</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>digilib-common-jai</artifactId>
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 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.5.3</version>
+		<version>2.5.4</version>
 	</parent>
 	
 	<artifactId>digilib-common</artifactId>
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 @@
   <parent>
     <groupId>digilib</groupId>
     <artifactId>digilib</artifactId>
-    <version>2.5.3</version>
+    <version>2.5.4</version>
   </parent>
   <artifactId>digilib-doc</artifactId>
   <packaging>pom</packaging>
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 @@
 	<parent>
 		<groupId>digilib</groupId>
 		<artifactId>digilib</artifactId>
-		<version>2.5.3</version>
+		<version>2.5.4</version>
 	</parent>
 	<artifactId>digilib-iiif-presentation</artifactId>
 	<name>digilib-iiif-presentation</name>
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 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.5.3</version>
+		<version>2.5.4</version>
 	</parent>
 	<artifactId>digilib-pdf</artifactId>
 	<name>digilib-pdf</name>
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 @@
 
   <groupId>digilib</groupId>
   <artifactId>digilib</artifactId>
-  <version>2.5.3</version>
+  <version>2.5.4</version>
   <packaging>pom</packaging>
 
   <name>digilib</name>
@@ -201,62 +201,62 @@
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-common</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-common-jai</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-common-imagej</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-common-bioformats</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-doc</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-pdf</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-text</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-iiif-presentation</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-servlet</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-servlet2</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-servlet3</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-webapp</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
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 @@
   <parent>
     <groupId>digilib</groupId>
     <artifactId>digilib</artifactId>
-    <version>2.5.3</version>
+    <version>2.5.4</version>
   </parent>
   <artifactId>digilib-servlet</artifactId>
   <name>digilib-servlet</name>
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 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.5.3</version>
+    <version>2.5.4</version>
   </parent>
   <artifactId>digilib-servlet2</artifactId>
   <name>digilib-servlet2</name>
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 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.5.3</version>
+    <version>2.5.4</version>
   </parent>
   <artifactId>digilib-servlet3</artifactId>
   <name>digilib-servlet3</name>
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 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.5.3</version>
+		<version>2.5.4</version>
 	</parent>
 	<artifactId>digilib-text</artifactId>
 	<name>digilib-text</name>
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 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.5.3</version>
+		<version>2.5.4</version>
 	</parent>
 	<artifactId>digilib-webapp</artifactId>
 	<name>digilib-webapp</name>
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)