Voomra/skeleton-springmvc
Archived
0
Fork 0
Code Activity

Merge branch 'master' into thymeleaf

Browse Source 
# Conflicts:
#	src/main/java/ru/dmitriymx/skeleton/springmvc/WebApp.java
This commit is contained in:
DmitriyMX
2018-09-23 14:44:27 +03:00
parent 2c4ca9fec0 350e80eb6a
commit 85541e2e36
5 changed files with 90 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
pom.xml
View File

@@ -7,14 +7,17 @@
<groupId>ru.dmitriymx.skeleton</groupId>
<artifactId>spring-mvc</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<slf4j.version>1.7.21</slf4j.version>
<spring.version>4.2.5.RELEASE</spring.version>
<jetty.version>9.4.0.v20161208</jetty.version>
<slf4j.version>1.7.25</slf4j.version>
<log4j.version>2.11.1</log4j.version>
<spring.version>5.1.0.RELEASE</spring.version>
<jetty.version>9.4.12.v20180830</jetty.version>
<dependencies.dir>lib</dependencies.dir>
<main.class>ru.dmitriymx.skeleton.springmvc.WebApp</main.class>
</properties>
<dependencies>
@@ -30,9 +33,14 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
<!-- SPRING -->
@@ -69,7 +77,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.16</version>
<version>1.18.2</version>
</dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
@@ -85,7 +93,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.8.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -95,11 +103,43 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.15</version>
<version>2.22.0</version>
<configuration>
<argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>${dependencies.dir}/</classpathPrefix>
<mainClass>${main.class}</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<outputDirectory>${project.build.directory}/${dependencies.dir}/</outputDirectory>
<excludeScope>provided</excludeScope>
</configuration>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>