Skip to content
Snippets Groups Projects
Commit 8e268b73 authored by Mic's avatar Mic
Browse files

Merge branch 'migration-to-Spring-4.0.0'

parents 8a671459 377bc630
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 25 additions and 18 deletions
pom.xml
+ 25
− 18
View file @ 8e268b73
...@@ -16,14 +16,14 @@ ...@@ -16,14 +16,14 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Spring --> <!-- Spring -->
<spring-framework.version>3.2.5.RELEASE</spring-framework.version> <spring-framework.version>4.0.0.RELEASE</spring-framework.version>
<spring-data-jpa.version>1.4.2.RELEASE</spring-data-jpa.version> <spring-data-jpa.version>1.4.2.RELEASE</spring-data-jpa.version>
<!-- Java EE / Java SE dependencies --> <!-- Java EE / Java SE dependencies -->
<jsp.version>2.2</jsp.version> <jsp.version>2.2</jsp.version>
<jstl.version>1.2</jstl.version> <jstl.version>1.2</jstl.version>
<servlet.version>2.5</servlet.version> <tomcat.servlet.version>7.0.30</tomcat.servlet.version>
<jaxb-impl.version>2.2.7</jaxb-impl.version> <jaxb-impl.version>2.2.7</jaxb-impl.version>
<!-- Hibernate / JPA --> <!-- Hibernate / JPA -->
...@@ -75,22 +75,29 @@ ...@@ -75,22 +75,29 @@
<version>${jadira-usertype-core.version}</version> <version>${jadira-usertype-core.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>org.apache.tomcat</groupId>
<artifactId>jstl</artifactId> <artifactId>tomcat-servlet-api</artifactId>
<version>${jstl.version}</version> <version>${tomcat.servlet.version}</version>
</dependency> <scope>provided</scope>
<dependency> </dependency>
<groupId>javax.servlet</groupId> <dependency>
<artifactId>servlet-api</artifactId> <groupId>javax.servlet.jsp</groupId>
<version>${servlet.version}</version> <artifactId>jsp-api</artifactId>
<scope>provided</scope> <version>2.1</version>
</dependency> <scope>provided</scope>
<dependency> </dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId> <dependency>
<version>${jsp.version}</version> <groupId>org.glassfish.web</groupId>
<scope>provided</scope> <artifactId>jstl-impl</artifactId>
</dependency> <version>1.2</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>com.sun.xml.bind</groupId> <groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId> <artifactId>jaxb-impl</artifactId>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment