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

diff --git a/pom.xml b/pom.xml
index 5cda65fc..256cbbc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,9 +42,12 @@
     <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-extras.version>2.1.1.RELEASE</thymeleaf-extras.version>
+    <tiles.version>2.2.2</tiles.version>
+    <wro4j.version>1.7.3-SNAPSHOT</wro4j.version>
 
   </properties>
 
@@ -56,6 +59,58 @@
       <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>
+
+    <!-- Thymeleaf -->
+    <dependency>
+      <groupId>org.thymeleaf</groupId>
+      <artifactId>thymeleaf</artifactId>
+      <version>${thymeleaf.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.thymeleaf</groupId>
+      <artifactId>thymeleaf-spring4</artifactId>
+      <version>${thymeleaf.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.thymeleaf.extras</groupId>
+      <artifactId>thymeleaf-extras-tiles2</artifactId>
+      <version>${thymeleaf-extras.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.thymeleaf</groupId>
+          <artifactId>thymeleaf</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.thymeleaf</groupId>
+          <artifactId>thymeleaf-spring4</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.thymeleaf.extras</groupId>
+      <artifactId>thymeleaf-extras-tiles2-spring4</artifactId>
+      <version>${thymeleaf-extras.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.thymeleaf</groupId>
+          <artifactId>thymeleaf</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.thymeleaf</groupId>
+          <artifactId>thymeleaf-spring4</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>runtime</scope>
     </dependency>
 
     <!-- Tiles -->
@@ -63,13 +118,18 @@
       <groupId>org.apache.tiles</groupId>
       <artifactId>tiles-core</artifactId>
       <version>${tiles.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl-over-slf4j</artifactId>
+        </exclusion>
+      </exclusions>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tiles</groupId>
-      <artifactId>tiles-jsp</artifactId>
+      <artifactId>tiles-servlet</artifactId>
       <version>${tiles.version}</version>
-      <scope>runtime</scope>
     </dependency>
 
     <!-- Servlet -->
@@ -104,6 +164,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>
 
@@ -136,17 +202,33 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.lesscss</groupId>
-        <artifactId>lesscss-maven-plugin</artifactId>
-        <version>1.3.3</version>
+        <groupId>ro.isdc.wro4j</groupId>
+        <artifactId>wro4j-maven-plugin</artifactId>
+        <version>${wro4j.version}</version>
+        <configuration>
+          <wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
+          <cssDestinationFolder>${project.build.directory}/${project.build.finalName}/css/</cssDestinationFolder>
+          <jsDestinationFolder>${project.build.directory}/${project.build.finalName}/js/</jsDestinationFolder>
+        </configuration>
         <executions>
           <execution>
+            <phase>prepare-package</phase>
             <goals>
-              <goal>compile</goal>
+              <goal>run</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <warSourceExcludes>
+            WEB-INF/wro.*,
+            js/**,
+            less/**
+          </warSourceExcludes>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
@@ -163,6 +245,101 @@
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
+        <configuration>
+          <webApp>
+            <overrideDescriptor>${project.basedir}/src/test/resources/jetty-web.xml</overrideDescriptor>
+          </webApp>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>ro.isdc.wro4j</groupId>
+            <artifactId>wro4j-core</artifactId>
+            <version>${wro4j.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>ro.isdc.wro4j</groupId>
+            <artifactId>wro4j-extensions</artifactId>
+            <version>${wro4j.version}</version>
+            <exclusions>
+              <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.google.javascript</groupId>
+                <artifactId>closure-compiler</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.github.lltyk</groupId>
+                <artifactId>dojo-shrinksafe</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.jruby</groupId>
+                <artifactId>jruby-core</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.jruby</groupId>
+                <artifactId>jruby-stdlib</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>me.n4u.sass</groupId>
+                <artifactId>sass-gems</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>nz.co.edmi</groupId>
+                <artifactId>bourbon-gem-jar</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.codehaus.gmaven.runtime</groupId>
+                <artifactId>gmaven-runtime-1.7</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.webjars</groupId>
+                <artifactId>jshint</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.webjars</groupId>
+                <artifactId>emberjs</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.webjars</groupId>
+                <artifactId>handlebars</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.webjars</groupId>
+                <artifactId>coffee-script</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.webjars</groupId>
+                <artifactId>jslint</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.webjars</groupId>
+                <artifactId>json2</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.webjars</groupId>
+                <artifactId>jquery</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -173,6 +350,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>