Index: pom.xml
===================================================================
--- pom.xml	(revision 1470)
+++ pom.xml	(working copy)
@@ -3,57 +3,57 @@
     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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>joda-time</groupId>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>joda-time</groupId>
   <artifactId>joda-time-hibernate</artifactId>
   <packaging>jar</packaging>
-  <name>Joda time Hibernate support</name>
-  <version>1.3-SNAPSHOT</version>
-  <description>Contribution to Joda-Time that adds Hibernate support</description>
-  <url>http://joda-time.sourceforge.net/contrib/hibernate</url>
+  <name>Joda time Hibernate support</name>
+  <version>1.3-SNAPSHOT</version>
+  <description>Contribution to Joda-Time that adds Hibernate support</description>
+  <url>http://joda-time.sourceforge.net/contrib/hibernate</url>
   <issueManagement>
-  	<system>Sourceforge</system>
-    <url>http://sourceforge.net/tracker/?atid=617889&amp;group_id=97367&amp;func=browse</url>
-  </issueManagement>
-  <inceptionYear>2005</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Joda Interest list</name>
-      <subscribe>http://lists.sourceforge.net/lists/listinfo/joda-interest</subscribe>
-      <unsubscribe>http://lists.sourceforge.net/lists/listinfo/joda-interest</unsubscribe>
+  	<system>Sourceforge</system>
+    <url>http://sourceforge.net/tracker/?atid=617889&amp;group_id=97367&amp;func=browse</url>
+  </issueManagement>
+  <inceptionYear>2005</inceptionYear>
+  <mailingLists>
+    <mailingList>
+      <name>Joda Interest list</name>
+      <subscribe>http://lists.sourceforge.net/lists/listinfo/joda-interest</subscribe>
+      <unsubscribe>http://lists.sourceforge.net/lists/listinfo/joda-interest</unsubscribe>
       <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=joda-interest</archive>
       <otherArchives>
         <otherArchive>http://n2.nabble.com/Joda-Interest-f219941.html</otherArchive>
       </otherArchives>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>imario</id>
-      <name>Mario Ivankovits</name>
-      <email></email>
-      <roles>
-        <role>Lead developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>gjoseph</id>
-      <name>Gregory Joseph</name>
-      <email></email>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>scolebourne</id>
-      <name>Stephen Colebourne</name>
-      <email></email>
-      <roles>
-        <role>Website and Release manager</role>
-      </roles>
-      <timezone>0</timezone>
-    </developer>
-  </developers>
+    </mailingList>
+  </mailingLists>
+  <developers>
+    <developer>
+      <id>imario</id>
+      <name>Mario Ivankovits</name>
+      <email></email>
+      <roles>
+        <role>Lead developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>gjoseph</id>
+      <name>Gregory Joseph</name>
+      <email></email>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>scolebourne</id>
+      <name>Stephen Colebourne</name>
+      <email></email>
+      <roles>
+        <role>Website and Release manager</role>
+      </roles>
+      <timezone>0</timezone>
+    </developer>
+  </developers>
   <licenses>
     <license>
       <name>Apache 2</name>
@@ -61,47 +61,75 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
-  <scm>
-    <connection>scm:svn:http://joda-time.svn.sourceforge.net/svnroot/joda-time/trunk/JodaTimeContrib/hibernate/</connection>
+  <scm>
+    <connection>scm:svn:http://joda-time.svn.sourceforge.net/svnroot/joda-time/trunk/JodaTimeContrib/hibernate/</connection>
     <developerConnection>scm:svn:https://joda-time.svn.sourceforge.net/svnroot/joda-time/trunk/JodaTimeContrib/hibernate/</developerConnection>
-    <url>http://joda-time.svn.sourceforge.net/viewvc/joda-time/trunk/JodaTimeContrib/hibernate/</url>
-  </scm>
-  <organization>
-    <name>Joda.org</name>
-    <url>http://www.joda.org</url>
-  </organization>
-  <build>
-    <resources>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <directory>.</directory>
-        <includes>
+    <url>http://joda-time.svn.sourceforge.net/viewvc/joda-time/trunk/JodaTimeContrib/hibernate/</url>
+  </scm>
+  <organization>
+    <name>Joda.org</name>
+    <url>http://www.joda.org</url>
+  </organization>
+  
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  
+  <build>
+    <resources>
+      <resource>
+        <targetPath>META-INF</targetPath>
+        <directory>.</directory>
+        <includes>
           <include>LICENSE.txt</include>
-          <include>NOTICE.txt</include>
-        </includes>
-      </resource>
-    </resources>
+          <include>NOTICE.txt</include>
+        </includes>
+      </resource>
+    </resources>
     <plugins>
+      <!-- Use Toolchains to select JDK to be used when building -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-toolchains-plugin</artifactId>
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>toolchain</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <toolchains>
+            <jdk>
+              <version>1.4</version>
+              <vendor>sun</vendor>
+            </jdk>
+          </toolchains>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.1</version>
         <configuration>
           <verbose>true</verbose>
           <fork>true</fork>
-          <executable>C:\java\jdk1.4.2\bin\javac</executable>
-          <compilerVersion>1.4</compilerVersion>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>org/joda/time/contrib/hibernate/**/Test*.java</include>
-          </includes>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+          <includes>
+            <include>org/joda/time/contrib/hibernate/**/Test*.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.6.1</version>
         <configuration>
@@ -158,6 +186,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-5</version>	 
         <configuration>
           <descriptors>
             <descriptor>src/main/assembly/src.xml</descriptor>
@@ -175,20 +204,40 @@
           </execution>
         </executions>
       </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>1.5</version>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>1.6</version>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-      <version>3.0.5</version>
+      <artifactId>hibernate-core</artifactId>
+      <version>3.3.2.GA</version>
+      <scope>compile</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.14</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.5.8</version>
+      <scope>test</scope>
+    </dependency> 
+    <dependency>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.8.0.GA</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.2</version>
@@ -197,7 +246,7 @@
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>1.7.3.3</version>
+      <version>1.8.0.10</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -224,7 +273,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.1</version>
+        <version>3.0.1</version>
         <configuration>
           <configLocation>${basedir}/checkstyle.xml</configLocation>
           <enableRulesSummary>false</enableRulesSummary>
@@ -246,7 +295,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.4.2</version>
+        <version>2.5</version>
         <configuration>
            <showSuccess>true</showSuccess>
         </configuration>
@@ -254,6 +303,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-changes-plugin</artifactId>
+        <version>2.3</version>
         <reportSets>
           <reportSet>
             <reports>
@@ -263,8 +313,8 @@
         </reportSets>
       </plugin>
   	</plugins>
-  </reporting>
-  <distributionManagement>
+  </reporting>
+  <distributionManagement>
     <repository>
       <uniqueVersion>false</uniqueVersion>
       <id>sonatype-joda-staging</id>
@@ -279,11 +329,11 @@
       <url>http://oss.sonatype.org/content/repositories/joda-snapshots</url>
       <layout>default</layout>
     </snapshotRepository>
-    <site>
+    <site>
       <id>sf-web-joda-time-hibernate</id>
       <name>Sourceforge Site</name>
-      <url>scp://shell.sourceforge.net/home/groups/j/jo/joda-time/htdocs/contrib/hibernate</url>
-    </site>
+      <url>scp://shell.sourceforge.net/home/groups/j/jo/joda-time/htdocs/contrib/hibernate</url>
+    </site>
     <downloadUrl>http://oss.sonatype.org/content/repositories/joda-releases</downloadUrl>
-  </distributionManagement>
+  </distributionManagement>
 </project>