* 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 83bf1f9fd2e1a9a55f9cacb085669568b06b49ec. * fix dependency issues * minor fix * minor fix * minor fix * cleanup generated files * fix commons-logging issue * add parent to pom * cleanup parent dependencies * cleanup pom
		
			
				
	
	
		
			188 lines
		
	
	
		
			6.5 KiB
		
	
	
	
		
			XML
		
	
	
	
	
	
			
		
		
	
	
			188 lines
		
	
	
		
			6.5 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>
 | |
|     <version>0.1-SNAPSHOT</version>
 | |
|     <artifactId>spring-mvc-velocity</artifactId>
 | |
| 
 | |
|     <name>spring-mvc-velocity</name>
 | |
|     <packaging>war</packaging>
 | |
| 
 | |
|     <parent>
 | |
|         <groupId>com.baeldung</groupId>
 | |
|         <artifactId>parent-modules</artifactId>
 | |
|         <version>1.0.0-SNAPSHOT</version>
 | |
|     </parent>
 | |
| 
 | |
|     <dependencies>
 | |
| 
 | |
|         <!-- Spring -->
 | |
| 
 | |
|         <dependency>
 | |
|             <groupId>org.springframework</groupId>
 | |
|             <artifactId>spring-web</artifactId>
 | |
|             <version>${org.springframework.version}</version>
 | |
|         </dependency>
 | |
|         <dependency>
 | |
|             <groupId>org.springframework</groupId>
 | |
|             <artifactId>spring-webmvc</artifactId>
 | |
|             <version>${org.springframework.version}</version>
 | |
|         </dependency>
 | |
|         <dependency>
 | |
|             <groupId>org.springframework</groupId>
 | |
|             <artifactId>spring-core</artifactId>
 | |
|             <version>${org.springframework.version}</version>
 | |
|         </dependency>
 | |
|         <dependency>
 | |
|             <groupId>org.springframework</groupId>
 | |
|             <artifactId>spring-context-support</artifactId>
 | |
|             <version>${org.springframework.version}</version>
 | |
|         </dependency>
 | |
| 
 | |
|         <!-- web -->
 | |
| 
 | |
|         <dependency>
 | |
|             <groupId>javax.servlet</groupId>
 | |
|             <artifactId>javax.servlet-api</artifactId>
 | |
|             <version>${javax.servlet-api.version}</version>
 | |
|             <scope>provided</scope>
 | |
|         </dependency>
 | |
| 
 | |
|         <dependency>
 | |
|             <groupId>org.apache.velocity</groupId>
 | |
|             <artifactId>velocity</artifactId>
 | |
|             <version>${velocity.version}</version>
 | |
|         </dependency>
 | |
| 
 | |
|         <dependency>
 | |
|             <groupId>org.apache.velocity</groupId>
 | |
|             <artifactId>velocity-tools</artifactId>
 | |
|             <version>${velocity-tools.version}</version>
 | |
|             <exclusions>
 | |
|                 <exclusion>
 | |
|                     <artifactId>commons-logging</artifactId>
 | |
|                     <groupId>commons-logging</groupId>
 | |
|                 </exclusion>
 | |
|             </exclusions>
 | |
|         </dependency>
 | |
| 
 | |
|         <!-- test scoped -->
 | |
|         <dependency>
 | |
|             <groupId>org.powermock</groupId>
 | |
|             <artifactId>powermock-module-junit4</artifactId>
 | |
|             <version>${powermock.version}</version>
 | |
|             <scope>test</scope>
 | |
|         </dependency>
 | |
|         <dependency>
 | |
|             <groupId>org.powermock</groupId>
 | |
|             <artifactId>powermock-api-mockito</artifactId>
 | |
|             <version>${powermock.version}</version>
 | |
|             <scope>test</scope>
 | |
|         </dependency>
 | |
|         <dependency>
 | |
|             <groupId>org.springframework</groupId>
 | |
|             <artifactId>spring-test</artifactId>
 | |
|             <version>${org.springframework.version}</version>
 | |
|             <scope>test</scope>
 | |
|         </dependency>
 | |
| 
 | |
|     </dependencies>
 | |
| 
 | |
|     <build>
 | |
|         <finalName>spring-mvc-velocity</finalName>
 | |
|         <resources>
 | |
|             <resource>
 | |
|                 <directory>src/main/resources</directory>
 | |
|                 <filtering>true</filtering>
 | |
|             </resource>
 | |
|         </resources>
 | |
| 
 | |
|         <plugins>
 | |
| 
 | |
|             <plugin>
 | |
|                 <groupId>org.apache.maven.plugins</groupId>
 | |
|                 <artifactId>maven-war-plugin</artifactId>
 | |
|                 <version>${maven-war-plugin.version}</version>
 | |
|                 <configuration>
 | |
|                     <failOnMissingWebXml>false</failOnMissingWebXml>
 | |
|                 </configuration>
 | |
|             </plugin>
 | |
| 
 | |
|             <plugin>
 | |
|                 <groupId>org.apache.maven.plugins</groupId>
 | |
|                 <artifactId>maven-surefire-plugin</artifactId>
 | |
|                 <configuration>
 | |
|                     <forkCount>3</forkCount>
 | |
|                     <reuseForks>true</reuseForks>
 | |
|                     <excludes>
 | |
|                         <exclude>**/*IntegrationTest.java</exclude>
 | |
|                     </excludes>
 | |
|                     <systemPropertyVariables>
 | |
|                         <!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
 | |
|                     </systemPropertyVariables>
 | |
|                 </configuration>
 | |
|             </plugin>
 | |
| 
 | |
|         </plugins>
 | |
| 
 | |
|     </build>
 | |
| 
 | |
|     <profiles>
 | |
|         <profile>
 | |
|             <id>integration</id>
 | |
|             <build>
 | |
|                 <plugins>
 | |
|                     <plugin>
 | |
|                         <groupId>org.apache.maven.plugins</groupId>
 | |
|                         <artifactId>maven-surefire-plugin</artifactId>
 | |
|                         <executions>
 | |
|                             <execution>
 | |
|                                 <phase>integration-test</phase>
 | |
|                                 <goals>
 | |
|                                     <goal>test</goal>
 | |
|                                 </goals>
 | |
|                                 <configuration>
 | |
|                                     <excludes>
 | |
|                                         <exclude>**/*LiveTest.java</exclude>
 | |
|                                     </excludes>
 | |
|                                     <includes>
 | |
|                                         <include>**/*IntegrationTest.java</include>
 | |
|                                     </includes>
 | |
|                                 </configuration>
 | |
|                             </execution>
 | |
|                         </executions>
 | |
|                         <configuration>
 | |
|                             <systemPropertyVariables>
 | |
|                                 <test.mime>json</test.mime>
 | |
|                             </systemPropertyVariables>
 | |
|                         </configuration>
 | |
|                     </plugin>
 | |
|                 </plugins>
 | |
|             </build>
 | |
|         </profile>
 | |
|     </profiles>
 | |
| 
 | |
|     <properties>
 | |
|         <!-- Spring -->
 | |
|         <org.springframework.version>4.3.4.RELEASE</org.springframework.version>
 | |
| 
 | |
| 
 | |
|         <!-- testing -->
 | |
|         <powermock.version>1.6.6</powermock.version>
 | |
| 
 | |
|         <httpcore.version>4.4.5</httpcore.version>
 | |
|         <httpclient.version>4.5.2</httpclient.version>
 | |
| 
 | |
|         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
 | |
|         <velocity.version>1.7</velocity.version>
 | |
|         <velocity-tools.version>2.0</velocity-tools.version>
 | |
|         <rest-assured.version>2.9.0</rest-assured.version>
 | |
| 
 | |
|         <!-- Maven plugins -->
 | |
|         <maven-war-plugin.version>2.6</maven-war-plugin.version>
 | |
|         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
 | |
|         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
 | |
| 
 | |
|     </properties>
 | |
| 
 | |
| </project> |