X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=pom.xml;h=8a51c8546c2f8c4481d6e7dda944996c551fd65b;hb=refs%2Fheads%2Fwebsite;hp=8af44c82c0617aa07557391c729aeb4de0a8ce59;hpb=0aae9ac342885e8ae9681e758c793b704d175987;p=website

diff --git a/pom.xml b/pom.xml
index 8af44c82..8a51c854 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,12 @@
 
 
   <groupId>de.juplo</groupId>
-  <artifactId>branding</artifactId>
-  <name>Juplo - branding</name>
+  <artifactId>website</artifactId>
+  <name>Juplo - Website</name>
+  <description>WAR, that deliveres one ore more statically defined websites with thymeleaf-power layout-sugar</description>
   <version>1.0-SNAPSHOT</version>
   <packaging>war</packaging>
-  <url>http://www.juplo.de/branding</url>
+  <url>http://www.juplo.de/website</url>
 
 
   <prerequisites>
@@ -18,9 +19,9 @@
 
 
   <scm>
-    <connection>scm:git:http://juplo.de/git/branding</connection>
-    <developerConnection>scm:git:ssh://juplo.de:/var/lib/git/juplo/branding</developerConnection>
-    <url>http://juplo.de/gitweb/?p=branding;a=summary</url>
+    <connection>scm:git:http://juplo.de/git/website</connection>
+    <developerConnection>scm:git:ssh://juplo.de:/var/lib/git/juplo/website</developerConnection>
+    <url>http://juplo.de/gitweb/?p=website;a=summary</url>
   </scm>
 
 
@@ -41,10 +42,14 @@
     <!-- Verwendete Versionen -->
     <jsp-api.version>2.2.1</jsp-api.version>
     <jstl.version>1.2</jstl.version>
+    <juplo-dialect.version>1.0.0</juplo-dialect.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>3.0.3.RELEASE</thymeleaf.version>
+    <thymeleaf-layout-dialect.version>2.2.0</thymeleaf-layout-dialect.version>
+    <thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
+    <thymeproxy.version>1.0.0</thymeproxy.version>
 
   </properties>
 
@@ -56,19 +61,49 @@
       <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>
+    <dependency>
+      <groupId>de.juplo</groupId>
+      <artifactId>thymeproxy</artifactId>
+      <version>${thymeproxy.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>de.juplo.thymeleaf</groupId>
+      <artifactId>juplo-dialect</artifactId>
+      <version>${juplo-dialect.version}</version>
       <scope>runtime</scope>
     </dependency>
 
@@ -104,6 +139,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>
 
@@ -123,29 +164,27 @@
 
 
   <build>
-    <finalName>branding</finalName>
+    <finalName>website</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
           <encoding>utf8</encoding>
           <showWarnings>true</showWarnings>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.lesscss</groupId>
-        <artifactId>lesscss-maven-plugin</artifactId>
-        <version>1.3.3</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>src/main/frontend/dist</directory>
+            </resource>
+          </webResources>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -163,6 +202,15 @@
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
+        <configuration>
+          <webApp>
+            <resourceBases>
+              <resourceBase>src/main/frontend/dist</resourceBase>
+              <resourceBase>src/main/webapp</resourceBase>
+            </resourceBases>
+          </webApp>
+          <useTestScope>true</useTestScope>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>