X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=pom.xml;h=8a51c8546c2f8c4481d6e7dda944996c551fd65b;hb=refs%2Fheads%2Fwebsite;hp=1e849578ae11284dcb66b44553a0d1dcc4b04d35;hpb=4e18dd333d44513a1b51aeb8ef4cd6ee4f911b2b;p=website

diff --git a/pom.xml b/pom.xml
index 1e849578..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,12 +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.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.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>
 
@@ -91,6 +94,18 @@
       <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>
 
     <!-- Servlet -->
     <dependency>
@@ -149,43 +164,26 @@
 
 
   <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.7.0.1.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <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>less/**</warSourceExcludes>
+          <webResources>
+            <resource>
+              <directory>src/main/frontend/dist</directory>
+            </resource>
+          </webResources>
         </configuration>
       </plugin>
       <plugin>
@@ -207,10 +205,11 @@
         <configuration>
           <webApp>
             <resourceBases>
+              <resourceBase>src/main/frontend/dist</resourceBase>
               <resourceBase>src/main/webapp</resourceBase>
-              <resourceBase>target/${project.build.finalName}</resourceBase>
             </resourceBases>
           </webApp>
+          <useTestScope>true</useTestScope>
         </configuration>
       </plugin>
       <plugin>