X-Git-Url: https://juplo.de/gitweb/?p=website;a=blobdiff_plain;f=pom.xml;h=fd91c8d9a688f00cb1cb3cb2e599e305b9176b72;hp=4f823317a324b2f4898753a0d4fb212a3b5c1539;hb=b1956189d89ac7e824c209039f3c82926294549e;hpb=aa23c197b723965e54f06bc5746cd7729dd29dd6

diff --git a/pom.xml b/pom.xml
index 4f823317..fd91c8d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,10 +42,10 @@
     <jsp-api.version>2.2.1</jsp-api.version>
     <jstl.version>1.2</jstl.version>
     <servlet-api.version>3.0.1</servlet-api.version>
-    <slf4j.version>1.5.8</slf4j.version>
-    <springframework.version>3.2.4.RELEASE</springframework.version>
-    <tiles.version>3.0.1</tiles.version>
-    <wro4j.version>1.7.2</wro4j.version>
+    <slf4j.version>1.6.1</slf4j.version>
+    <springframework.version>4.0.6.RELEASE</springframework.version>
+    <thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
+    <wro4j.version>1.7.3-SNAPSHOT</wro4j.version>
 
   </properties>
 
@@ -57,19 +57,25 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
       <version>${springframework.version}</version>
+      <exclusions>
+        <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
-    <!-- Tiles -->
+    <!-- Thymeleaf -->
     <dependency>
-      <groupId>org.apache.tiles</groupId>
-      <artifactId>tiles-core</artifactId>
-      <version>${tiles.version}</version>
+      <groupId>org.thymeleaf</groupId>
+      <artifactId>thymeleaf</artifactId>
+      <version>${thymeleaf.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.tiles</groupId>
-      <artifactId>tiles-jsp</artifactId>
-      <version>${tiles.version}</version>
+      <groupId>org.thymeleaf</groupId>
+      <artifactId>thymeleaf-spring4</artifactId>
+      <version>${thymeleaf.version}</version>
       <scope>runtime</scope>
     </dependency>
 
@@ -159,6 +165,7 @@
         <configuration>
           <warSourceExcludes>
             WEB-INF/wro.*,
+            js/**,
             less/**
           </warSourceExcludes>
         </configuration>