<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>
<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>
<!-- 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-extras.version>2.1.1.RELEASE</thymeleaf-extras.version>
- <tiles.version>2.2.2</tiles.version>
- <wro4j.version>1.7.3-SNAPSHOT</wro4j.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>
<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>
+ <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-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>
+ <artifactId>thymeleaf-extras-conditionalcomments</artifactId>
+ <version>${thymeleaf-extras-conditionalcomments.version}</version>
<scope>runtime</scope>
</dependency>
-
- <!-- Tiles -->
<dependency>
- <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>
+ <groupId>de.juplo</groupId>
+ <artifactId>thymeproxy</artifactId>
+ <version>${thymeproxy.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-servlet</artifactId>
- <version>${tiles.version}</version>
+ <groupId>de.juplo.thymeleaf</groupId>
+ <artifactId>juplo-dialect</artifactId>
+ <version>${juplo-dialect.version}</version>
+ <scope>runtime</scope>
</dependency>
<!-- Servlet -->
<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>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>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <warSourceExcludes>
- WEB-INF/wro.*,
- js/**,
- less/**
- </warSourceExcludes>
+ <webResources>
+ <resource>
+ <directory>src/main/frontend/dist</directory>
+ </resource>
+ </webResources>
</configuration>
</plugin>
<plugin>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<webApp>
- <overrideDescriptor>${project.basedir}/src/test/resources/jetty-web.xml</overrideDescriptor>
+ <resourceBases>
+ <resourceBase>src/main/frontend/dist</resourceBase>
+ <resourceBase>src/main/webapp</resourceBase>
+ </resourceBases>
</webApp>
+ <useTestScope>true</useTestScope>
</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>
projects / website / blobdiff