diff --git a/geowebcache/arcgiscache/pom.xml b/geowebcache/arcgiscache/pom.xml
index 3db394ffb..b8171d3e7 100644
--- a/geowebcache/arcgiscache/pom.xml
+++ b/geowebcache/arcgiscache/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-arcgiscache</artifactId>
diff --git a/geowebcache/core/pom.xml b/geowebcache/core/pom.xml
index b0cda32d6..78e49f531 100644
--- a/geowebcache/core/pom.xml
+++ b/geowebcache/core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-core</artifactId>
diff --git a/geowebcache/diskquota/bdb/pom.xml b/geowebcache/diskquota/bdb/pom.xml
index 56143a2c4..f23586005 100644
--- a/geowebcache/diskquota/bdb/pom.xml
+++ b/geowebcache/diskquota/bdb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>gwc-diskquota</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-diskquota-bdb</artifactId>
diff --git a/geowebcache/diskquota/core/pom.xml b/geowebcache/diskquota/core/pom.xml
index d7d70b9a9..59801a793 100644
--- a/geowebcache/diskquota/core/pom.xml
+++ b/geowebcache/diskquota/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>gwc-diskquota</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-diskquota-core</artifactId>
diff --git a/geowebcache/diskquota/jdbc/pom.xml b/geowebcache/diskquota/jdbc/pom.xml
index de77d0f7e..b7c006230 100644
--- a/geowebcache/diskquota/jdbc/pom.xml
+++ b/geowebcache/diskquota/jdbc/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>gwc-diskquota</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-diskquota-jdbc</artifactId>
diff --git a/geowebcache/diskquota/pom.xml b/geowebcache/diskquota/pom.xml
index b69cca116..85018db5f 100644
--- a/geowebcache/diskquota/pom.xml
+++ b/geowebcache/diskquota/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-diskquota</artifactId>
diff --git a/geowebcache/distributed/pom.xml b/geowebcache/distributed/pom.xml
index 23b1cd52b..f58f7f7a1 100644
--- a/geowebcache/distributed/pom.xml
+++ b/geowebcache/distributed/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-distributed</artifactId>
diff --git a/geowebcache/georss/pom.xml b/geowebcache/georss/pom.xml
index 664f71b00..8870b2b01 100644
--- a/geowebcache/georss/pom.xml
+++ b/geowebcache/georss/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-georss</artifactId>
diff --git a/geowebcache/gmaps/pom.xml b/geowebcache/gmaps/pom.xml
index 7f8423e4b..6f7060b75 100644
--- a/geowebcache/gmaps/pom.xml
+++ b/geowebcache/gmaps/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-gmaps</artifactId>
diff --git a/geowebcache/kml/pom.xml b/geowebcache/kml/pom.xml
index b1b000cf4..8cf46f4cb 100644
--- a/geowebcache/kml/pom.xml
+++ b/geowebcache/kml/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-kml</artifactId>
diff --git a/geowebcache/pom.xml b/geowebcache/pom.xml
index 3567f677e..35b3efad2 100644
--- a/geowebcache/pom.xml
+++ b/geowebcache/pom.xml
@@ -5,12 +5,12 @@
   <groupId>org.geowebcache</groupId>
   <artifactId>geowebcache</artifactId>
   <packaging>pom</packaging>
-  <version>1.7-SNAPSHOT</version>
+  <version>1.7.3</version>
   <name>geowebcache</name>
   <url>http://geowebcache.org</url>
 
   <properties>
-    <gt.version>13-SNAPSHOT</gt.version>
+    <gt.version>13.3</gt.version>
     <jts.version>1.13</jts.version>
     <spring.version>3.1.1.RELEASE</spring.version>
     <restlet.version>1.0.8</restlet.version>
@@ -600,7 +600,7 @@
             <descriptor>release/war.xml</descriptor>
             <descriptor>release/doc.xml</descriptor>
           </descriptors>
-          <finalName>geowebcache-1.7-SNAPSHOT</finalName>
+          <finalName>geowebcache-1.7.3</finalName>
           <outputDirectory>${project.build.directory}/release</outputDirectory>
         </configuration>
       </plugin>
diff --git a/geowebcache/pom.xml~ b/geowebcache/pom.xml~
new file mode 100644
index 000000000..70ebf37bf
--- /dev/null
+++ b/geowebcache/pom.xml~
@@ -0,0 +1,656 @@
+<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/maven-v4_0_0.xsd">
+  <!-- mvn -Dtest=StorageBrokerTest -Dmaven.test.jvmargs='-XX:+HeapDumpOnOutOfMemoryError -Xms32m -Xmx32m' test -->  
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.geowebcache</groupId>
+  <artifactId>geowebcache</artifactId>
+  <packaging>pom</packaging>
+  <version>1.5.4</version>
+  <name>geowebcache</name>
+  <url>http://geowebcache.org</url>
+
+  <properties>
+    <gt.version>11-SNAPSHOT</gt.version>
+    <jts.version>1.13</jts.version>
+    <spring.version>3.1.1.RELEASE</spring.version>
+    <restlet.version>1.0.8</restlet.version>
+    <xstream.version>1.4.3</xstream.version>
+    <acegi.version>1.0.7</acegi.version>
+    <commons-logging.version>1.1.1</commons-logging.version>
+    <commons-io.version>2.1</commons-io.version>
+    <commons-dbcp.version>1.3</commons-dbcp.version>
+    <commons-lang.version>2.4</commons-lang.version>
+    <commons-collections.version>3.1</commons-collections.version>
+    <guava.version>11.0.1</guava.version>
+    <log4j.version>1.2.14</log4j.version>
+    <h2.version>1.1.119</h2.version>
+    <postgresql.version>8.4-701.jdbc3</postgresql.version>
+    <oracle.version></oracle.version>
+    <java.awt.headless>true</java.awt.headless>
+    <jalopy.phase>disabled</jalopy.phase>
+    <jalopy.srcExcludesPattern>disabled</jalopy.srcExcludesPattern>
+    <test.maxHeapSize>64M</test.maxHeapSize>
+    <maven.test.jvmargs></maven.test.jvmargs>
+    <imageio-ext.version>1.1.10</imageio-ext.version>
+  </properties>
+  
+  <repositories>
+    <repository>
+      <id>boundless</id>
+      <name>Boundless Maven Repository</name>
+      <url>http://repo.boundlessgeo.com/main</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>osgeo</id>
+      <name>Open Source Geospatial Foundation Repository</name>
+      <url>http://download.osgeo.org/webdav/geotools/</url>
+    </repository>
+    <repository>
+      <id>codehaus</id>
+      <name>Code Haus</name>
+      <url>http://repository.codehaus.org</url>
+    </repository>
+    <repository>
+      <id>maven-restlet</id>
+      <name>Public online Restlet repository</name>
+      <url>http://maven.restlet.org</url>
+    </repository>
+    <repository>
+      <id>oracleReleases</id>
+      <name>Oracle Released Java Packages</name>
+      <url>http://download.oracle.com/maven</url>
+      <layout>default</layout>
+    </repository>
+  </repositories>
+ 
+  <distributionManagement>
+    <repository>
+      <id>boundless</id>
+      <name>Boundless</name>
+      <url>http://repo.boundlessgeo.com/main</url>
+      <uniqueVersion>false</uniqueVersion>
+    </repository>
+    <snapshotRepository>
+      <id>boundless</id>
+      <uniqueVersion>false</uniqueVersion>
+      <name>Boundless Maven Repository</name>
+      <url>http://repo.boundlessgeo.com/main</url>
+     </snapshotRepository>
+  </distributionManagement>
+
+ <dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.geowebcache</groupId>
+      <artifactId>gwc-core</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>${commons-logging.version}</version>
+      <exclusions>
+    <exclusion>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework</artifactId>
+    </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>${commons-dbcp.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>${commons-io.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>${commons-lang.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>${commons-collections.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
+    
+	<!-- PNG Encoder dependencies -->
+	<dependency>
+      <groupId>it.geosolutions.imageio-ext</groupId>
+      <artifactId>imageio-ext-png</artifactId>
+      <version>${imageio-ext.version}</version>
+    </dependency>
+    
+    <dependency>
+		<groupId>it.geosolutions.imageio-ext</groupId>
+		<artifactId>imageio-ext-streams</artifactId>
+		<version>${imageio-ext.version}</version>
+	</dependency>
+	
+    <!-- dependency>
+      <groupId>jcs</groupId>
+      <artifactId>jcs</artifactId>
+      <version>1.3</version>
+      <exclusions>
+    <exclusion>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+    </exclusion>
+    <exclusion>
+      <groupId>berkeleydb</groupId>
+      <artifactId>berkeleydb</artifactId>
+    </exclusion>
+    <exclusion>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+    </exclusion>
+      </exclusions>
+    </dependency -->
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-integration</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>2.5.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymockclassextension</artifactId>
+      <version>2.5.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+     <groupId>org.mockito</groupId>
+     <artifactId>mockito-all</artifactId>
+     <version>1.8.5</version>
+    </dependency>
+    <dependency>
+      <groupId>httpunit</groupId>
+      <artifactId>httpunit</artifactId>
+      <version>1.6</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.mockrunner</groupId>
+      <artifactId>mockrunner</artifactId>
+      <version>0.3.6</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <version>1.3</version>
+    </dependency>
+    
+    <!-- Spring dependencies -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+
+    <!-- This is for Acegi -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>${spring.version}</version>
+      <!-- optional>true</optional -->
+    </dependency>
+   
+    <!--  Jetty starter dependencies -->
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.20</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-2.0</artifactId>
+      <version>6.1.20</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl104-over-slf4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+     <groupId>org.freemarker</groupId>
+     <artifactId>freemarker</artifactId>
+     <version>2.3.18</version> <!-- track same version than GeoServer -->
+    </dependency>
+
+    <!-- restlet.org dependencies -->
+    <dependency>
+      <groupId>org.restlet</groupId>
+      <artifactId>org.restlet</artifactId>
+      <version>${restlet.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.noelios.restlet</groupId>
+      <artifactId>com.noelios.restlet</artifactId>
+      <version>${restlet.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.noelios.restlet</groupId>
+      <artifactId>com.noelios.restlet.ext.simple</artifactId>
+      <version>${restlet.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.restlet</groupId>
+      <artifactId>org.restlet.ext.freemarker</artifactId>
+      <version>${restlet.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.restlet</groupId>
+      <artifactId>org.restlet.ext.spring</artifactId>
+      <version>${restlet.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.restlet</groupId>
+      <artifactId>org.restlet.ext.json</artifactId>
+      <version>${restlet.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.noelios.restlet</groupId>
+      <artifactId>com.noelios.restlet.ext.servlet</artifactId>
+      <version>${restlet.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>net.sf.json-lib</groupId>
+      <artifactId>json-lib</artifactId>
+      <version>2.1</version>
+      <classifier>jdk13</classifier>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.thoughtworks.xstream</groupId>
+      <artifactId>xstream</artifactId>
+      <version>${xstream.version}</version>
+    </dependency>
+    
+    <!-- acegi dependencies -->
+    <dependency>
+      <groupId>org.acegisecurity</groupId>
+      <artifactId>acegi-security</artifactId>
+      <version>${acegi.version}</version>
+      <exclusions>
+    <exclusion>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-remoting</artifactId>
+    </exclusion>
+    <exclusion>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+    </exclusion>
+    <exclusion>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-support</artifactId>
+    </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+
+    <dependency>
+      <!-- StAX is the reference implementation of the StAX API -->
+      <groupId>stax</groupId>
+      <artifactId>stax</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>${h2.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgresql.version}</version>
+    </dependency>
+
+    <dependency>
+      <artifactId>ojdbc14</artifactId>
+      <groupId>com.oracle</groupId>
+      <version>${oracle.version}</version>
+    </dependency>
+
+    <!-- Berkeley DB JE -->
+    <dependency>
+      <groupId>com.sleepycat</groupId>
+      <artifactId>je</artifactId>
+      <version>4.1.10</version>
+    </dependency>
+
+  </dependencies>
+ </dependencyManagement>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <configuration>
+          <formats>
+            <format>html</format>
+            <format>xml</format>
+          </formats>
+        </configuration>
+      </plugin>
+     <!-- javadoc -->
+     <plugin>
+      <artifactId>maven-javadoc-plugin</artifactId>
+      <configuration>
+       <source>1.5</source>
+       <version>false</version>
+       <noqualifier>all</noqualifier>
+       <maxmemory>256M</maxmemory>
+       <encoding>ISO-8859-1</encoding>
+       <additionalparam>-keywords</additionalparam>
+       <tags>
+        <tag>
+         <name>todo</name>
+         <placement>tfmc</placement>
+         <head>TODO:</head>
+        </tag>
+        <tag>
+         <name>task</name>
+         <placement>tfmc</placement>
+         <head>TODO:</head>
+        </tag>
+        <tag>
+         <name>revisit</name>
+         <placement>tfmc</placement>
+         <head>TODO:</head>
+        </tag>
+       </tags>
+       <links>
+        <link>http://java.sun.com/j2se/1.5/docs/api</link>
+        <link>http://docs.geotools.org/stable/javadocs/</link>
+       </links>
+      </configuration>
+     </plugin>
+ 
+    </plugins>
+  </reporting>
+
+ 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>buildnumber-maven-plugin</artifactId>
+        <version>1.0-beta-3</version>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>create</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
+          <items>
+            <item>timestamp</item>
+          </items>
+          <doCheck>false</doCheck>
+          <doUpdate>false</doUpdate>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addClasspath>false</addClasspath>
+            </manifest>
+            <manifestEntries>
+              <Specification-Title>org.geowebcache</Specification-Title>
+              <Specification-Version>${project.version}</Specification-Version>
+              <Specification-Vendor>${pom.url}</Specification-Vendor>
+              <Implementation-Title>org.geowebcache</Implementation-Title>
+              <Implementation-Version>${build.branch}/${build.commit.id}</Implementation-Version>
+              <Implementation-Vendor>${pom.url}</Implementation-Vendor>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+
+     <plugin>
+    <groupId>org.codehaus.mojo</groupId>
+    <artifactId>tomcat-maven-plugin</artifactId>
+    <configuration>
+      <url>http://localhost:8080/manager</url>
+      <server>localhost</server>
+    </configuration>
+      </plugin>
+      
+      <plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-compiler-plugin</artifactId>
+    <configuration>
+      <source>1.5</source>
+      <target>1.5</target>
+    </configuration>
+      </plugin>
+      
+      <plugin>
+    <artifactId>maven-source-plugin</artifactId>
+    <configuration>
+      <attach>true</attach>
+    </configuration>
+    <executions>
+      <execution>
+        <id>attach-sources</id>
+        <goals>
+          <goal>jar</goal>
+        </goals>
+      </execution>
+    </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>pertest</forkMode>
+          <argLine>${maven.test.jvmargs}</argLine>
+        </configuration>
+      </plugin>
+
+      <!-- initialize git revision info -->
+      <plugin>
+        <groupId>pl.project13.maven</groupId>
+        <artifactId>git-commit-id-plugin</artifactId>
+        <version>2.0.4</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>revision</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <prefix>build</prefix>
+          <failOnNoGitDirectory>false</failOnNoGitDirectory>
+          <skipPoms>false</skipPoms>
+        </configuration>
+      </plugin>
+
+     <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2</version>
+        <configuration>
+          <!--descriptorRefs>
+            <descriptorRef>project</descriptorRef>
+          </descriptorRefs-->
+          <descriptors>
+            <descriptor>release/src.xml</descriptor>
+            <descriptor>release/war.xml</descriptor>
+            <descriptor>release/doc.xml</descriptor>
+          </descriptors>
+          <finalName>geowebcache-1.5.4</finalName>
+          <outputDirectory>${project.build.directory}/release</outputDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+    
+    <extensions>
+      <extension>
+    <groupId>org.apache.maven.wagon</groupId>
+    <artifactId>wagon-webdav</artifactId>
+    <version>1.0-beta-2</version>
+      </extension>
+    </extensions>
+    
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>cobertura-maven-plugin</artifactId>
+          <version>2.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  
+  <profiles>
+    <profile>
+      <id>deploy.boundless</id>
+      <distributionManagement>
+        <repository>
+          <id>boundless</id>
+          <uniqueVersion>false</uniqueVersion>
+          <name>Boundless Maven Repository</name>
+          <url>http://repo.boundlessgeo.com/main</url>
+        </repository>
+        <snapshotRepository>
+          <id>boundless</id>
+          <uniqueVersion>false</uniqueVersion>
+          <name>Boundless Maven Repository</name>
+          <url>http://repo.boundlessgeo.com/main</url>
+        </snapshotRepository>
+      </distributionManagement>
+    </profile>
+  </profiles>
+
+  <modules>
+    <module>core</module>
+    <module>georss</module>
+    <module>gmaps</module>
+    <module>kml</module>
+    <module>rest</module>
+    <module>tms</module>
+    <module>ve</module>
+    <module>wms</module>
+    <module>wmts</module>
+    <module>web</module>
+    <module>diskquota</module>
+    <module>arcgiscache</module>
+  </modules>
+</project>
diff --git a/geowebcache/release/doc.xml b/geowebcache/release/doc.xml
index a33e804e9..1029a7610 100644
--- a/geowebcache/release/doc.xml
+++ b/geowebcache/release/doc.xml
@@ -7,7 +7,7 @@
 	<fileSets>
 		<fileSet>
 			<directory>../documentation/en/user/build/html</directory>
-			<outputDirectory>geowebcache-1.7-SNAPSHOT/doc</outputDirectory>
+			<outputDirectory>geowebcache-1.7.3/doc</outputDirectory>
 			<includes>
 				<include>**/*</include>
 			</includes>
diff --git a/geowebcache/release/doc.xml~ b/geowebcache/release/doc.xml~
new file mode 100644
index 000000000..22b09468b
--- /dev/null
+++ b/geowebcache/release/doc.xml~
@@ -0,0 +1,16 @@
+<assembly>
+	<id>doc</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>../documentation/en/user/build/html</directory>
+			<outputDirectory>geowebcache-1.6-SNAPSHOT/doc</outputDirectory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+</assembly>
diff --git a/geowebcache/release/src.xml b/geowebcache/release/src.xml
index f7af8f4b9..87199fb4f 100644
--- a/geowebcache/release/src.xml
+++ b/geowebcache/release/src.xml
@@ -7,7 +7,7 @@
   <fileSets>
     <fileSet>
       <directory>${project.basedir}</directory>
-      <outputDirectory>geowebcache-1.7-SNAPSHOT/</outputDirectory>
+      <outputDirectory>geowebcache-1.7.3/</outputDirectory>
       <useDefaultExcludes>true</useDefaultExcludes>
       <excludes>
         <exclude>**/${project.build.directory}/**</exclude>
diff --git a/geowebcache/release/src.xml~ b/geowebcache/release/src.xml~
new file mode 100644
index 000000000..83ecf06b1
--- /dev/null
+++ b/geowebcache/release/src.xml~
@@ -0,0 +1,26 @@
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}</directory>
+      <outputDirectory>geowebcache-1.6-SNAPSHOT/</outputDirectory>
+      <useDefaultExcludes>true</useDefaultExcludes>
+      <excludes>
+        <exclude>**/${project.build.directory}/**</exclude>
+        <exclude>target</exclude>
+        <exclude>**/target/**</exclude>
+        <exclude>.settings</exclude>
+        <exclude>**/.settings/**</exclude>
+        <exclude>**/.settings</exclude>
+        <exclude>.project</exclude>
+        <exclude>**/.project</exclude>
+        <exclude>.classpath</exclude>
+        <exclude>**/.classpath</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/geowebcache/rest/pom.xml b/geowebcache/rest/pom.xml
index 8b77e79c1..21e47cf50 100644
--- a/geowebcache/rest/pom.xml
+++ b/geowebcache/rest/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-rest</artifactId>
diff --git a/geowebcache/stylesheet.css b/geowebcache/stylesheet.css
new file mode 100644
index 000000000..158e0b361
--- /dev/null
+++ b/geowebcache/stylesheet.css
@@ -0,0 +1,38 @@
+body { background-color: #FFFFFF; }
+
+p { margin: 3px; }
+
+.TableHeadingColor     { background: #CCCCFF }
+.TableSubHeadingColor  { background: #EEEEFF }
+.TableRowColor         { background: #FFFFFF }
+
+.NavBarCell1    { background-color:#EEEEFF;}/* Light mauve */
+.NavBarCell1Rev { background-color:#00008B;}/* Dark Blue */
+.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;}
+.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
+
+.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
+.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
+
+.FrameTitleFont   { font-size: normal; font-family: normal }
+.FrameHeadingFont { font-size: normal; font-family: normal }
+.FrameItemFont    { font-size: normal; font-family: normal }
+
+div.code span.elem { color: darkred; }
+div.code span.attr { color: red; }
+div.code span.cont { color: black; }
+div.code span.oper { color: blue; }
+div.code span.comm { color: grey; }
+div.code span.cdat { color: black; }
+div.code span.proc { color: lightseagreen; }
+div.code span.doct { color: dark-blue; }
+div.code span.anno { color: #888888; }
+
+div.hierar { margin-left: 1em; text-indent: 0em; border-style:solid; border-width:1px; border-color: #D0D0D0;}
+ul { margin-top: 0px; margin-bottom: 0px; }
+li { margin-top: 0px; margin-bottom: 0px; }
+
+dt { font-weight: bold; }
+
+.anno { color: #888888; }
+.smal { font-size: 60%; font-weight: bold; }
diff --git a/geowebcache/tms/pom.xml b/geowebcache/tms/pom.xml
index dd3f86ea1..eec90d3f0 100644
--- a/geowebcache/tms/pom.xml
+++ b/geowebcache/tms/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-tms</artifactId>
diff --git a/geowebcache/ve/pom.xml b/geowebcache/ve/pom.xml
index 614c4d9bd..647b94a34 100644
--- a/geowebcache/ve/pom.xml
+++ b/geowebcache/ve/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-ve</artifactId>
diff --git a/geowebcache/web/pom.xml b/geowebcache/web/pom.xml
index b4101698e..9b4ec6c37 100644
--- a/geowebcache/web/pom.xml
+++ b/geowebcache/web/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-web</artifactId>
diff --git a/geowebcache/wms/pom.xml b/geowebcache/wms/pom.xml
index 59b8f62d2..ebc3c0ea4 100644
--- a/geowebcache/wms/pom.xml
+++ b/geowebcache/wms/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-wms</artifactId>
diff --git a/geowebcache/wmts/pom.xml b/geowebcache/wmts/pom.xml
index 815ff1c5b..a166b3aa9 100644
--- a/geowebcache/wmts/pom.xml
+++ b/geowebcache/wmts/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.3</version>
   </parent>
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-wmts</artifactId>