Mercurial > hg > digilib

changeset 1459:a1f51d39f23b release-2.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch 1616ea71929011a65382875784591b4c8f543633
author robcast
date Fri, 13 Nov 2015 17:32:28 +0100
parents ca07154c4dd2 (diff) 1616ea719290 (current diff)
children 42fb22288b55
files common/src/main/java/digilib/conf/DigilibConfiguration.java webapp/src/main/webapp/jquery/jquery.digilib.js
diffstat 15 files changed, 33 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Nov 13 17:29:29 2015 +0100
+++ b/.hgtags	Fri Nov 13 17:32:28 2015 +0100
@@ -7,3 +7,6 @@
 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
--- a/common-bioformats/pom.xml	Fri Nov 13 17:29:29 2015 +0100
+++ b/common-bioformats/pom.xml	Fri Nov 13 17:32:28 2015 +0100
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.3-SNAPSHOT</version>
+    <version>2.3.6</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>digilib-common-bioformats</artifactId>
--- a/common-imagej/pom.xml	Fri Nov 13 17:29:29 2015 +0100
+++ b/common-imagej/pom.xml	Fri Nov 13 17:32:28 2015 +0100
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.3-SNAPSHOT</version>
+    <version>2.3.6</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>digilib-common-imagej</artifactId>
--- a/common-jai/pom.xml	Fri Nov 13 17:29:29 2015 +0100
+++ b/common-jai/pom.xml	Fri Nov 13 17:32:28 2015 +0100
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.3-SNAPSHOT</version>
+    <version>2.3.6</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>digilib-common-jai</artifactId>
--- a/common/pom.xml	Fri Nov 13 17:29:29 2015 +0100
+++ b/common/pom.xml	Fri Nov 13 17:32:28 2015 +0100
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.3.6</version>
 	</parent>
 	
 	<artifactId>digilib-common</artifactId>
--- a/common/src/main/java/digilib/conf/DigilibConfiguration.java	Fri Nov 13 17:29:29 2015 +0100
+++ b/common/src/main/java/digilib/conf/DigilibConfiguration.java	Fri Nov 13 17:32:28 2015 +0100
@@ -57,7 +57,7 @@
 
     /** digilib version */
     public static String getClassVersion() {
-        return "2.3.7a";
+        return "2.3.7";
     }
 
     /* non-static getVersion for Java inheritance */
--- a/doc/pom.xml	Fri Nov 13 17:29:29 2015 +0100
+++ b/doc/pom.xml	Fri Nov 13 17:32:28 2015 +0100
@@ -3,7 +3,7 @@
   <parent>
     <groupId>digilib</groupId>
     <artifactId>digilib</artifactId>
-    <version>2.3-SNAPSHOT</version>
+    <version>2.3.6</version>
   </parent>
   <artifactId>digilib-doc</artifactId>
   <packaging>pom</packaging>
--- a/pdf/pom.xml	Fri Nov 13 17:29:29 2015 +0100
+++ b/pdf/pom.xml	Fri Nov 13 17:32:28 2015 +0100
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.3.6</version>
 	</parent>
 	<artifactId>digilib-pdf</artifactId>
 	<name>digilib-pdf</name>
--- a/pom.xml	Fri Nov 13 17:29:29 2015 +0100
+++ b/pom.xml	Fri Nov 13 17:32:28 2015 +0100
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <properties>
@@ -9,7 +8,7 @@
 
   <groupId>digilib</groupId>
   <artifactId>digilib</artifactId>
-  <version>2.3-SNAPSHOT</version>
+  <version>2.3.6</version>
   <packaging>pom</packaging>
 
   <name>digilib</name>
@@ -80,6 +79,7 @@
     <connection>scm:hg:http://hg.code.sf.net/p/digilib/code</connection>
     <developerConnection>scm:hg:https://hg.code.sf.net/p/digilib/code</developerConnection>
     <url>https://sourceforge.net/p/digilib/code/ci/default/tree</url>
+    <tag>release-2.3.6</tag>
   </scm>
   <issueManagement>
     <system>Trac</system>
@@ -196,57 +196,57 @@
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-common</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.3.6</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-common-jai</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.3.6</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-common-imagej</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.3.6</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-common-bioformats</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.3.6</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-doc</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.3.6</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-pdf</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.3.6</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-text</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.3.6</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-servlet</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.3.6</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-servlet2</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.3.6</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-servlet3</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.3.6</version>
       </dependency>
       <dependency>
         <groupId>digilib</groupId>
         <artifactId>digilib-webapp</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.3.6</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
--- a/servlet/pom.xml	Fri Nov 13 17:29:29 2015 +0100
+++ b/servlet/pom.xml	Fri Nov 13 17:32:28 2015 +0100
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>digilib</groupId>
     <artifactId>digilib</artifactId>
-    <version>2.3-SNAPSHOT</version>
+    <version>2.3.6</version>
   </parent>
   <artifactId>digilib-servlet</artifactId>
   <name>digilib-servlet</name>
--- a/servlet2/pom.xml	Fri Nov 13 17:29:29 2015 +0100
+++ b/servlet2/pom.xml	Fri Nov 13 17:32:28 2015 +0100
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.3-SNAPSHOT</version>
+    <version>2.3.6</version>
   </parent>
   <artifactId>digilib-servlet2</artifactId>
   <name>digilib-servlet2</name>
--- a/servlet3/pom.xml	Fri Nov 13 17:29:29 2015 +0100
+++ b/servlet3/pom.xml	Fri Nov 13 17:32:28 2015 +0100
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.3-SNAPSHOT</version>
+    <version>2.3.6</version>
   </parent>
   <artifactId>digilib-servlet3</artifactId>
   <name>digilib-servlet3</name>
--- a/text/pom.xml	Fri Nov 13 17:29:29 2015 +0100
+++ b/text/pom.xml	Fri Nov 13 17:32:28 2015 +0100
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.3.6</version>
 	</parent>
 	<artifactId>digilib-text</artifactId>
 	<name>digilib-text</name>
--- a/webapp/pom.xml	Fri Nov 13 17:29:29 2015 +0100
+++ b/webapp/pom.xml	Fri Nov 13 17:32:28 2015 +0100
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.3-SNAPSHOT</version>
+		<version>2.3.6</version>
 	</parent>
 	<artifactId>digilib-webapp</artifactId>
 	<name>digilib-webapp</name>
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Fri Nov 13 17:29:29 2015 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Fri Nov 13 17:32:28 2015 +0100
@@ -45,7 +45,7 @@
 
     var defaults = {
         // version of this script
-        'version' : 'jquery.digilib.js 2.3.7a',
+        'version' : 'jquery.digilib.js 2.3.7',
         // logo url
         'logoUrl' : 'img/digilib-logo-text1.png',
         // homepage url (behind logo)