X-Git-Url: https://juplo.de/gitweb/?p=website;a=blobdiff_plain;f=pom.xml;h=1e849578ae11284dcb66b44553a0d1dcc4b04d35;hp=5cda65fcf8adbb1ee9828f56b5e160ba0e64435f;hb=40f9a579c5324f56a938e262fe8c708228cf6c83;hpb=d53a4e6b1196f66f6f1768c013a4d9759be70dd2

diff --git a/pom.xml b/pom.xml
index 5cda65fc..1e849578 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,9 +42,11 @@
     <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>
+    <slf4j.version>1.6.1</slf4j.version>
+    <springframework.version>4.0.6.RELEASE</springframework.version>
+    <thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
+    <thymeleaf-layout-dialect.version>1.2.5</thymeleaf-layout-dialect.version>
+    <thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
 
   </properties>
 
@@ -56,19 +58,37 @@
       <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>
+    <dependency>
+      <groupId>nz.net.ultraq.thymeleaf</groupId>
+      <artifactId>thymeleaf-layout-dialect</artifactId>
+      <version>${thymeleaf-layout-dialect.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.thymeleaf.extras</groupId>
+      <artifactId>thymeleaf-extras-conditionalcomments</artifactId>
+      <version>${thymeleaf-extras-conditionalcomments.version}</version>
       <scope>runtime</scope>
     </dependency>
 
@@ -104,6 +124,12 @@
       <version>${slf4j.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>runtime</scope>
+    </dependency>
 
   </dependencies>
 
@@ -138,7 +164,7 @@
       <plugin>
         <groupId>org.lesscss</groupId>
         <artifactId>lesscss-maven-plugin</artifactId>
-        <version>1.3.3</version>
+        <version>1.7.0.1.1</version>
         <executions>
           <execution>
             <goals>
@@ -146,6 +172,21 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <includes>
+            <include>base.less</include>
+            <include>screen.less</include>
+            <include>print.less</include>
+          </includes>
+          <sourceDirectory>${project.basedir}/src/main/webapp/less</sourceDirectory>
+          <outputDirectory>${project.build.directory}/${project.build.finalName}/css</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <warSourceExcludes>less/**</warSourceExcludes>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -163,6 +204,14 @@
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
+        <configuration>
+          <webApp>
+            <resourceBases>
+              <resourceBase>src/main/webapp</resourceBase>
+              <resourceBase>target/${project.build.finalName}</resourceBase>
+            </resourceBases>
+          </webApp>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -173,6 +222,11 @@
           <uriEncoding>UTF-8</uriEncoding>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>com.google.appengine</groupId>
+        <artifactId>appengine-maven-plugin</artifactId>
+        <version>1.8.2</version>
+      </plugin>
     </plugins>
   </build>