* upgrade to spring boot 1.5.2
* add full update to REST API
* modify ratings controller
* upgrade herold
* fix integration test
* fix integration test
* minor fix
* fix integration test
* fix integration test
* minor cleanup
* minor cleanup
* remove log4j properties
* use standard logbook.xml
* remove log4j dependencies
* remove commons-logging
* merge
* fix conflict
* exclude commons-logging dependency
* cleanup
* minor fix
* minor fix
* fix dependency issues
* Revert "fix dependency issues"
This reverts commit 83bf1f9fd2.
* fix dependency issues
* minor fix
* minor fix
* minor fix
* cleanup generated files
* fix commons-logging issue
* add parent to pom
104 lines
3.4 KiB
XML
104 lines
3.4 KiB
XML
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<groupId>com.baeldung</groupId>
|
|
<artifactId>spring-mvc-tiles</artifactId>
|
|
<version>0.0.1-SNAPSHOT</version>
|
|
<packaging>war</packaging>
|
|
<name>spring-mvc-tiles</name>
|
|
<description>Integrating Spring MVC with Apache Tiles</description>
|
|
|
|
<parent>
|
|
<groupId>com.baeldung</groupId>
|
|
<artifactId>parent-modules</artifactId>
|
|
<version>1.0.0-SNAPSHOT</version>
|
|
</parent>
|
|
|
|
<properties>
|
|
<springframework.version>4.3.4.RELEASE</springframework.version>
|
|
<apache-tiles.version>3.0.7</apache-tiles.version>
|
|
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
|
|
<javax.servlet.jsp-api.version>2.3.1</javax.servlet.jsp-api.version>
|
|
<jstl.version>1.2</jstl.version>
|
|
|
|
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
|
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
|
</properties>
|
|
|
|
<dependencies>
|
|
<!-- Spring -->
|
|
<dependency>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-core</artifactId>
|
|
<version>${springframework.version}</version>
|
|
<exclusions>
|
|
<exclusion>
|
|
<artifactId>commons-logging</artifactId>
|
|
<groupId>commons-logging</groupId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-web</artifactId>
|
|
<version>${springframework.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-webmvc</artifactId>
|
|
<version>${springframework.version}</version>
|
|
</dependency>
|
|
<!-- Apache Tiles -->
|
|
<dependency>
|
|
<groupId>org.apache.tiles</groupId>
|
|
<artifactId>tiles-jsp</artifactId>
|
|
<version>${apache-tiles.version}</version>
|
|
</dependency>
|
|
|
|
<!-- Servlet+JSP+JSTL -->
|
|
<dependency>
|
|
<groupId>javax.servlet</groupId>
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
<version>${javax.servlet-api.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>javax.servlet.jsp</groupId>
|
|
<artifactId>javax.servlet.jsp-api</artifactId>
|
|
<version>${javax.servlet.jsp-api.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>javax.servlet</groupId>
|
|
<artifactId>jstl</artifactId>
|
|
<version>${jstl.version}</version>
|
|
</dependency>
|
|
|
|
</dependencies>
|
|
|
|
<build>
|
|
<pluginManagement>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
<version>${maven-compiler-plugin.version}</version>
|
|
<configuration>
|
|
<source>1.8</source>
|
|
<target>1.8</target>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-war-plugin</artifactId>
|
|
<version>${maven-war-plugin.version}</version>
|
|
<configuration>
|
|
<warSourceDirectory>src/main/webapp</warSourceDirectory>
|
|
<warName>spring-mvc-tiles</warName>
|
|
<failOnMissingWebXml>false</failOnMissingWebXml>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
</pluginManagement>
|
|
<finalName>spring-mvc-tiles</finalName>
|
|
</build>
|
|
</project>
|