Mercurial > hg > digilib

changeset 1179:d4990c1463e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upped all maven version numbers to 2.2. dito for Scaler servlets.
author robcast
date Thu, 04 Apr 2013 12:43:43 +0200
parents 2dd7116ccad3
children 5abbf21fdf9f
files common-bioformats/pom.xml common-imagej/pom.xml common-jai/pom.xml common/pom.xml pdf/pom.xml pom.xml servlet/pom.xml servlet2/pom.xml servlet2/src/main/java/digilib/servlet/Scaler.java servlet2/src/main/java/digilib/servlet/ScalerNoThread.java servlet3/pom.xml servlet3/src/main/java/digilib/servlet/Scaler.java text/pom.xml webapp/pom.xml
diffstat 14 files changed, 24 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/common-bioformats/pom.xml	Thu Apr 04 12:20:29 2013 +0200
+++ b/common-bioformats/pom.xml	Thu Apr 04 12:43:43 2013 +0200
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>digilib-common-bioformats</artifactId>
--- a/common-imagej/pom.xml	Thu Apr 04 12:20:29 2013 +0200
+++ b/common-imagej/pom.xml	Thu Apr 04 12:43:43 2013 +0200
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>digilib-common-imagej</artifactId>
--- a/common-jai/pom.xml	Thu Apr 04 12:20:29 2013 +0200
+++ b/common-jai/pom.xml	Thu Apr 04 12:43:43 2013 +0200
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>digilib-common-jai</artifactId>
--- a/common/pom.xml	Thu Apr 04 12:20:29 2013 +0200
+++ b/common/pom.xml	Thu Apr 04 12:43:43 2013 +0200
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
   </parent>
   <artifactId>digilib-common</artifactId>
   <name>digilib-common</name>
--- a/pdf/pom.xml	Thu Apr 04 12:20:29 2013 +0200
+++ b/pdf/pom.xml	Thu Apr 04 12:43:43 2013 +0200
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.1-SNAPSHOT</version>
+		<version>2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>digilib-pdf</artifactId>
 	<name>digilib-pdf</name>
--- a/pom.xml	Thu Apr 04 12:20:29 2013 +0200
+++ b/pom.xml	Thu Apr 04 12:43:43 2013 +0200
@@ -5,7 +5,7 @@
 
 	<groupId>digilib</groupId>
 	<artifactId>digilib</artifactId>
-	<version>2.1-SNAPSHOT</version>
+	<version>2.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>digilib</name>
@@ -134,11 +134,6 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.jdom</groupId>
-				<artifactId>jdom</artifactId>
-				<version>1.1.3</version>
-			</dependency>
-			<dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
 				<version>1.2.14</version>
@@ -147,52 +142,52 @@
 			<dependency>
 				<groupId>digilib</groupId>
 				<artifactId>digilib-common</artifactId>
-				<version>2.1-SNAPSHOT</version>
+				<version>2.2-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>digilib</groupId>
 				<artifactId>digilib-common-jai</artifactId>
-				<version>2.1-SNAPSHOT</version>
+				<version>2.2-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>digilib</groupId>
 				<artifactId>digilib-common-imagej</artifactId>
-				<version>2.1-SNAPSHOT</version>
+				<version>2.2-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>digilib</groupId>
 				<artifactId>digilib-common-bioformats</artifactId>
-				<version>2.1-SNAPSHOT</version>
+				<version>2.2-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>digilib</groupId>
 				<artifactId>digilib-pdf</artifactId>
-				<version>2.1-SNAPSHOT</version>
+				<version>2.2-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>digilib</groupId>
 				<artifactId>digilib-text</artifactId>
-				<version>2.1-SNAPSHOT</version>
+				<version>2.2-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>digilib</groupId>
 				<artifactId>digilib-servlet</artifactId>
-				<version>2.1-SNAPSHOT</version>
+				<version>2.2-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>digilib</groupId>
 				<artifactId>digilib-servlet2</artifactId>
-				<version>2.1-SNAPSHOT</version>
+				<version>2.2-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>digilib</groupId>
 				<artifactId>digilib-servlet3</artifactId>
-				<version>2.1-SNAPSHOT</version>
+				<version>2.2-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>digilib</groupId>
 				<artifactId>digilib-webapp</artifactId>
-				<version>2.1-SNAPSHOT</version>
+				<version>2.2-SNAPSHOT</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
--- a/servlet/pom.xml	Thu Apr 04 12:20:29 2013 +0200
+++ b/servlet/pom.xml	Thu Apr 04 12:43:43 2013 +0200
@@ -5,7 +5,7 @@
   <parent>
     <groupId>digilib</groupId>
     <artifactId>digilib</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
   </parent>
   <artifactId>digilib-servlet</artifactId>
   <name>digilib-servlet</name>
--- a/servlet2/pom.xml	Thu Apr 04 12:20:29 2013 +0200
+++ b/servlet2/pom.xml	Thu Apr 04 12:43:43 2013 +0200
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
   </parent>
   <artifactId>digilib-servlet2</artifactId>
   <name>digilib-servlet2</name>
--- a/servlet2/src/main/java/digilib/servlet/Scaler.java	Thu Apr 04 12:20:29 2013 +0200
+++ b/servlet2/src/main/java/digilib/servlet/Scaler.java	Thu Apr 04 12:43:43 2013 +0200
@@ -61,7 +61,7 @@
     private static final long serialVersionUID = -5439198888139362735L;
 
     /** digilib servlet version (for all components) */
-    public static final String version = "2.1.6 noasync";
+    public static final String version = "2.2.0 noasync";
 
     /** servlet error codes */
     public static enum Error {
--- a/servlet2/src/main/java/digilib/servlet/ScalerNoThread.java	Thu Apr 04 12:20:29 2013 +0200
+++ b/servlet2/src/main/java/digilib/servlet/ScalerNoThread.java	Thu Apr 04 12:43:43 2013 +0200
@@ -55,7 +55,7 @@
     private static final long serialVersionUID = 1450947819851623306L;
 
     /** digilib servlet version (for all components) */
-    public static final String version = "2.1.6 nothread";
+    public static final String version = "2.2.0 nothread";
 
     /** servlet error codes */
     public static enum Error {
--- a/servlet3/pom.xml	Thu Apr 04 12:20:29 2013 +0200
+++ b/servlet3/pom.xml	Thu Apr 04 12:43:43 2013 +0200
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>digilib</artifactId>
     <groupId>digilib</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
   </parent>
   <artifactId>digilib-servlet3</artifactId>
   <name>digilib-servlet3</name>
--- a/servlet3/src/main/java/digilib/servlet/Scaler.java	Thu Apr 04 12:20:29 2013 +0200
+++ b/servlet3/src/main/java/digilib/servlet/Scaler.java	Thu Apr 04 12:43:43 2013 +0200
@@ -58,7 +58,7 @@
     private static final long serialVersionUID = 5289386646192471549L;
 
     /** digilib servlet version (for all components) */
-    public static final String version = "2.1.6 async";
+    public static final String version = "2.2.0 async";
 
     /** servlet error codes */
     public static enum Error {
--- a/text/pom.xml	Thu Apr 04 12:20:29 2013 +0200
+++ b/text/pom.xml	Thu Apr 04 12:43:43 2013 +0200
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.1-SNAPSHOT</version>
+		<version>2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>digilib-text</artifactId>
 	<name>digilib-text</name>
--- a/webapp/pom.xml	Thu Apr 04 12:20:29 2013 +0200
+++ b/webapp/pom.xml	Thu Apr 04 12:43:43 2013 +0200
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>digilib</artifactId>
 		<groupId>digilib</groupId>
-		<version>2.1-SNAPSHOT</version>
+		<version>2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>digilib-webapp</artifactId>
 	<name>digilib-webapp</name>