From 11c4af6dbbb7ef377122b967d5a9594bba3947c0 Mon Sep 17 00:00:00 2001
From: Erik Forkalsrud <erik@forkalsrud.org>
Date: Sat, 3 Jul 2010 17:17:43 -0700
Subject: [PATCH 1/6] standardize logging to slf4j -> log4j

---
 pom.xml | 48 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 196bb6d..fd6dce4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,12 @@
       <artifactId>velocity-tools</artifactId>
       <version>2.0-beta3</version>
       <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.drewnoakes</groupId>
@@ -118,6 +124,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.7</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.sleepycat</groupId>
@@ -127,9 +134,39 @@
     <!--
     <dependency><groupId>com.caucho</groupId><artifactId>resin</artifactId><version>3.1.8</version></dependency>
     -->
-    <dependency><groupId>org.springframework</groupId><artifactId>spring-webmvc</artifactId><version>3.0.0.RELEASE</version></dependency>
-    <dependency><groupId>org.springframework</groupId><artifactId>spring-context</artifactId><version>3.0.0.RELEASE</version></dependency>
-    <dependency><groupId>org.springframework</groupId><artifactId>spring-orm</artifactId><version>3.0.0.RELEASE</version></dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>3.0.0.RELEASE</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.0.RELEASE</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+      <version>3.0.0.RELEASE</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
@@ -150,6 +187,11 @@
       <artifactId>jul-to-slf4j</artifactId>
       <version>1.5.10</version>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.5.10</version>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>

From 382409c4383b9a287247212005bb4a47c668e70e Mon Sep 17 00:00:00 2001
From: Erik Forkalsrud <erik@forkalsrud.org>
Date: Sat, 3 Jul 2010 17:19:13 -0700
Subject: [PATCH 2/6] [maven-release-plugin] prepare release album-0.19

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fd6dce4..851c285 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>org.forkalsrud</groupId>
   <artifactId>album</artifactId>
   <packaging>war</packaging>
-  <version>0.19-SNAPSHOT</version>
+  <version>0.19</version>
   <name>Photo Album</name>
   <url>http://forkalsrud.org:8080/</url>
   <developers>

From 0d12759128127c0021df4e7cfed23586428b156d Mon Sep 17 00:00:00 2001
From: Erik Forkalsrud <erik@forkalsrud.org>
Date: Sat, 3 Jul 2010 17:43:35 -0700
Subject: [PATCH 3/6] update scm url  (album -> album.git)

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 851c285..ff2387b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,9 +26,9 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <scm>
-  	<url>forkalsrud.org</url>
-    <developerConnection>scm:git:ssh://forkalsrud.org/home/gitroot/album</developerConnection>
-    <connection>scm:git:ssh://forkalsrud.org/home/gitroot/album</connection>
+    <url>forkalsrud.org</url>
+    <developerConnection>scm:git:ssh://forkalsrud.org/home/gitroot/album.git</developerConnection>
+    <connection>scm:git:ssh://forkalsrud.org/home/gitroot/album.git</connection>
   </scm>
   <build>
     <finalName>photo</finalName>

From 0e4398a7dfb54d25925b1e0afaddbe3f150d5915 Mon Sep 17 00:00:00 2001
From: Erik Forkalsrud <erik@forkalsrud.org>
Date: Sat, 3 Jul 2010 17:45:55 -0700
Subject: [PATCH 4/6] revert 382409c4383b9a287247212005bb4a47c668e70e

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ff2387b..5315e4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>org.forkalsrud</groupId>
   <artifactId>album</artifactId>
   <packaging>war</packaging>
-  <version>0.19</version>
+  <version>0.19-SNAPSHOT</version>
   <name>Photo Album</name>
   <url>http://forkalsrud.org:8080/</url>
   <developers>

From 307eda46ea16f8ad02eac0c387b3741ac9b8fd39 Mon Sep 17 00:00:00 2001
From: Erik Forkalsrud <erik@forkalsrud.org>
Date: Sat, 3 Jul 2010 17:46:35 -0700
Subject: [PATCH 5/6] [maven-release-plugin] prepare release album-0.19

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5315e4c..ff2387b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>org.forkalsrud</groupId>
   <artifactId>album</artifactId>
   <packaging>war</packaging>
-  <version>0.19-SNAPSHOT</version>
+  <version>0.19</version>
   <name>Photo Album</name>
   <url>http://forkalsrud.org:8080/</url>
   <developers>

From aae802f8e7c023a8926f310a3b80f0d01ad63dec Mon Sep 17 00:00:00 2001
From: Erik Forkalsrud <erik@forkalsrud.org>
Date: Sat, 3 Jul 2010 17:46:36 -0700
Subject: [PATCH 6/6] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ff2387b..aa5bebb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>org.forkalsrud</groupId>
   <artifactId>album</artifactId>
   <packaging>war</packaging>
-  <version>0.19</version>
+  <version>0.20-SNAPSHOT</version>
   <name>Photo Album</name>
   <url>http://forkalsrud.org:8080/</url>
   <developers>