shard project
This commit is contained in:
parent
43cdf3a172
commit
52245244d6
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
|
@ -11,8 +11,8 @@
|
|||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
|
||||
</component>
|
||||
</module>
|
8
pom.xml
8
pom.xml
|
@ -12,7 +12,7 @@
|
|||
|
||||
<groupId>com.loafle</groupId>
|
||||
<artifactId>maven_archetype_spring_webapp</artifactId>
|
||||
<version>4.2.0-RELEASE</version>
|
||||
<version>4.3.0-RELEASE</version>
|
||||
<name>maven_archetype_spring_webapp</name>
|
||||
<packaging>maven-archetype</packaging>
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
|||
<extension>
|
||||
<groupId>org.apache.maven.archetype</groupId>
|
||||
<artifactId>archetype-packaging</artifactId>
|
||||
<version>2.4</version>
|
||||
<version>3.0.0</version>
|
||||
</extension>
|
||||
</extensions>
|
||||
|
||||
|
@ -30,13 +30,13 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-archetype-plugin</artifactId>
|
||||
<version>2.4</version>
|
||||
<version>3.0.0</version>
|
||||
<extensions>true</extensions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>2.4</version>
|
||||
<version>3.0.2</version>
|
||||
<configuration>
|
||||
<includeEmptyDirs>true</includeEmptyDirs>
|
||||
</configuration>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>com.loafle</groupId>
|
||||
<artifactId>maven_parent_spring</artifactId>
|
||||
<version>4.2.0-RELEASE</version>
|
||||
<version>4.3.0-RELEASE</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
@ -25,9 +25,16 @@
|
|||
<!--<java-version>1.8</java-version>-->
|
||||
|
||||
<javax.servlet.version>3.1.0</javax.servlet.version>
|
||||
<springsecurity.version>4.0.3.RELEASE</springsecurity.version>
|
||||
<hibernate.version>5.0.6.Final</hibernate.version>
|
||||
<javax.el.version>3.0</javax.el.version>
|
||||
<javax.transaction.version>1.1</javax.transaction.version>
|
||||
<springsecurity.version>4.2.0.RELEASE</springsecurity.version>
|
||||
<javax.transaction.version>1.1</javax.transaction.version>
|
||||
<hibernate.version>5.2.4.Final</hibernate.version>
|
||||
<hibernate.validator.version>5.3.1.Final</hibernate.validator.version>
|
||||
<jackson.version>2.5.0</jackson.version>
|
||||
<thymeleaf.spring4.version>3.0.2.RELEASE</thymeleaf.spring4.version>
|
||||
<thymeleaf.extras.version>3.0.0</thymeleaf.extras.version>
|
||||
<thymeleaf.layout.dialect.version>2.0.5</thymeleaf.layout.dialect.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
@ -92,7 +99,7 @@
|
|||
<dependency>
|
||||
<groupId>org.thymeleaf</groupId>
|
||||
<artifactId>thymeleaf-spring4</artifactId>
|
||||
<version>2.1.4.RELEASE</version>
|
||||
<version>${thymeleaf.spring4.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>javassist</artifactId>
|
||||
|
@ -103,12 +110,12 @@
|
|||
<dependency>
|
||||
<groupId>org.thymeleaf.extras</groupId>
|
||||
<artifactId>thymeleaf-extras-springsecurity4</artifactId>
|
||||
<version>2.1.2.RELEASE</version>
|
||||
<version>${thymeleaf.extras.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>nz.net.ultraq.thymeleaf</groupId>
|
||||
<artifactId>thymeleaf-layout-dialect</artifactId>
|
||||
<version>1.3.1</version>
|
||||
<version>${thymeleaf.layout.dialect.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Servlet -->
|
||||
|
@ -127,19 +134,19 @@
|
|||
<dependency>
|
||||
<groupId>org.hibernate</groupId>
|
||||
<artifactId>hibernate-validator</artifactId>
|
||||
<version>5.2.2.Final</version>
|
||||
<version>${hibernate.validator.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.transaction</groupId>
|
||||
<artifactId>jta</artifactId>
|
||||
<version>1.1</version>
|
||||
<version>${javax.transaction.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.el</groupId>
|
||||
<artifactId>el-api</artifactId>
|
||||
<version>2.2</version>
|
||||
<version>${javax.el.version}</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
|
Loading…
Reference in New Issue
Block a user