diff --git a/pom.xml b/pom.xml
index 459e1d6..297dbd9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     </licenses>
 
     <organization>
-        <name>The Thymeleaf Team</name>
+    <name>The THYMELEAF team</name>
         <url>http://www.thymeleaf.org</url>
     </organization>
   
@@ -50,20 +50,29 @@
   
     <developers>
         <developer>
-            <id>zemi</id>
-            <name>Jose Miguel Samper</name>
-            <email>jmiguelsamper AT users.sourceforge.net</email>
-            <roles>
-                <role>Project developer</role>
-            </roles>
+          <id>danielfernandez</id>
+          <name>Daniel Fernandez</name>
+          <email>daniel.fernandez AT 11thlabs DOT org</email>
+          <roles>
+            <role>Project Admin</role>
+            <role>Lead Developer</role>
+          </roles>
         </developer>
         <developer>
-            <id>dfernandez</id>
-            <name>Daniel Fernandez</name>
-            <email>dfernandez AT users.sourceforge.net</email>
-            <roles>
-                <role>Project admin</role>
-            </roles>
+          <id>jmiguelsamper</id>
+          <name>Jose Miguel Samper</name>
+          <email>jmiguelsamper AT users DOT sourceforge DOT net</email>
+          <roles>
+            <role>Developer</role>
+          </roles>
+        </developer>
+        <developer>
+          <id>ultraq</id>
+          <name>Emanuel Rabina</name>
+          <email>emanuelrabina AT gmail DOT com</email>
+          <roles>
+            <role>Developer</role>
+          </roles>
         </developer>
     </developers>
   
@@ -95,9 +104,11 @@
     </repositories>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compile.source>1.6</maven.compile.source>
+        <maven.compile.target>1.6</maven.compile.target>
+        <project.build.sourceEncoding>US-ASCII</project.build.sourceEncoding>
+        <thymeleaf.version>3.0.10-SNAPSHOT</thymeleaf.version>
         <springframework.version>4.3.3.RELEASE</springframework.version>
-        <thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
     </properties>
 
     <build>
@@ -123,20 +134,29 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <debug>false</debug>
+                  <source>${maven.compile.source}</source>
+                  <target>${maven.compile.target}</target>
+                  <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
       
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.7</version>
+                <version>3.1.0</version>
+                <configuration>
+                  <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.2.2</version>
                 <configuration>
-                    <encoding>UTF-8</encoding>
+                  <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
 
@@ -144,7 +164,8 @@
                 <groupId>org.apache.tomcat.maven</groupId>
                 <artifactId>tomcat7-maven-plugin</artifactId>
                 <version>2.2</version>
-            </plugin>                        
+            </plugin>
+
         </plugins>
         
     </build>
@@ -159,13 +180,13 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.2-beta-5</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>make-assembly-dist</id>
                                 <phase>package</phase>
                                 <goals>
-                                    <goal>attached</goal>
+                                  <goal>single</goal>
                                 </goals>
                                 <configuration>
                                     <descriptors>