Überschriftengrößen überarbeitet

[website] / pom.xml

diff --git a/pom.xml b/pom.xml
index 6eea9ba..1e84957 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -42,10 +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>
-    <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>
+    <thymeleaf-layout-dialect.version>1.2.5</thymeleaf-layout-dialect.version>
+    <thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
 
   </properties>
 
@@ -57,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>
 
@@ -105,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>
 
@@ -137,31 +162,30 @@
         </configuration>
       </plugin>
       <plugin>
-        <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>
+        <groupId>org.lesscss</groupId>
+        <artifactId>lesscss-maven-plugin</artifactId>
+        <version>1.7.0.1.1</version>
         <executions>
           <execution>
-            <phase>prepare-package</phase>
             <goals>
-              <goal>run</goal>
+              <goal>compile</goal>
             </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>
-            WEB-INF/wro.*,
-            js/**,
-            less/**
-          </warSourceExcludes>
+          <warSourceExcludes>less/**</warSourceExcludes>
         </configuration>
       </plugin>
       <plugin>
@@ -182,99 +206,12 @@
         <artifactId>jetty-maven-plugin</artifactId>
         <configuration>
           <webApp>
-            <overrideDescriptor>${project.basedir}/src/test/resources/jetty-web.xml</overrideDescriptor>
+            <resourceBases>
+              <resourceBase>src/main/webapp</resourceBase>
+              <resourceBase>target/${project.build.finalName}</resourceBase>
+            </resourceBases>
           </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>