Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

General polish of dependency and project setup. #12

Merged
merged 4 commits into from

2 participants

@olivergierke
Owner

Updated project and plugin dependencies to current ones (some plugins weren't even resolvable from Maven Central). Polished dependency setup (removed unnecessary exclusion, added necessary ones). Update core libraries to more up-to-date versions (Hibernate, HSQL, JUnit etc.).

olivergierke added some commits
@olivergierke olivergierke Updated plugin dependencies in booking-mvc example.
- Compiler plugin 2.3.2 -> 3.0
- Tomcat plugin 2.0-SNAPSHOT -> 2.1
- Surefire plugin 2.12 -> 2.14
4356488
@olivergierke olivergierke Upgraded dependency versions.
- Spring 3.2.1 -> 3.2.2
- Slf4j 1.6.1 -> 1.7.5
- Log4j 1.2.15 -> 1.2.16 (allows getting rid of exclusions)
- HSQLDB 1.8.0.10 -> 2.2.9
- Hibernate 3.5.0 -> 4.2.0
- JodaTime 1.6 -> 2.2
- JodaTime JPS Tags 1.0.2 -> 1.1.1
- Easymock 2.5.2 -> 3.1
- JUnit 3.8.2 -> 4.11
d76d897
@olivergierke olivergierke Added current Jetty plugin to enable mvn jetty:run. 5782d44
@olivergierke olivergierke Polished dependency declaration.
Explicitly declare spring-sop to avoid unnecessary exclusions. Excluded Commons Logging explicitly to make sure the Slf4j bridge kicks in.
0495da6
@rstoyanchev rstoyanchev merged commit 0495da6 into from
@rstoyanchev
Collaborator

This has been merged. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 7, 2013
  1. @olivergierke

    Updated plugin dependencies in booking-mvc example.

    olivergierke authored
    - Compiler plugin 2.3.2 -> 3.0
    - Tomcat plugin 2.0-SNAPSHOT -> 2.1
    - Surefire plugin 2.12 -> 2.14
  2. @olivergierke

    Upgraded dependency versions.

    olivergierke authored
    - Spring 3.2.1 -> 3.2.2
    - Slf4j 1.6.1 -> 1.7.5
    - Log4j 1.2.15 -> 1.2.16 (allows getting rid of exclusions)
    - HSQLDB 1.8.0.10 -> 2.2.9
    - Hibernate 3.5.0 -> 4.2.0
    - JodaTime 1.6 -> 2.2
    - JodaTime JPS Tags 1.0.2 -> 1.1.1
    - Easymock 2.5.2 -> 3.1
    - JUnit 3.8.2 -> 4.11
  3. @olivergierke
  4. @olivergierke

    Polished dependency declaration.

    olivergierke authored
    Explicitly declare spring-sop to avoid unnecessary exclusions. Excluded Commons Logging explicitly to make sure the Slf4j bridge kicks in.
This page is out of date. Refresh to see the latest.
Showing with 41 additions and 49 deletions.
  1. +41 −49 booking-mvc/pom.xml
View
90 booking-mvc/pom.xml
@@ -9,10 +9,10 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
- <springframework-version>3.2.1.RELEASE</springframework-version>
+ <springframework-version>3.2.2.RELEASE</springframework-version>
<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
<webflow-version>2.4.0.M1</webflow-version>
- <slf4j-version>1.6.1</slf4j-version>
+ <slf4j-version>1.7.5</slf4j-version>
<thymeleaf-version>2.0.15</thymeleaf-version>
<thymeleaf-extras-tiles2-version>2.0.0</thymeleaf-extras-tiles2-version>
<thymeleaf-extras-springsecurity3-version>2.0.0</thymeleaf-extras-springsecurity3-version>
@@ -62,6 +62,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${springframework-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -79,47 +85,46 @@
<version>${springframework-version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${springframework-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-webflow</artifactId>
<version>${webflow-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-js</artifactId>
<version>${webflow-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${springsecurity-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>${springsecurity-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>${springsecurity-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- </exclusions>
+ <version>${springsecurity-version}</version>
</dependency>
<!-- Logging -->
@@ -142,25 +147,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.15</version>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.2.16</version>
<scope>runtime</scope>
</dependency>
@@ -168,13 +155,13 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
+ <version>2.2.9</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.5.0-Final</version>
+ <version>4.2.0.Final</version>
</dependency>
<!-- Servlet -->
@@ -244,12 +231,12 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>1.6</version>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time-jsptags</artifactId>
- <version>1.0.2</version>
+ <version>1.1.1</version>
<scope>runtime</scope>
</dependency>
@@ -257,13 +244,13 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.5.2</version>
+ <version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -280,7 +267,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -289,7 +276,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
+ <version>2.14</version>
<configuration>
<junitArtifactName>junit:junit</junitArtifactName>
<includes>
@@ -300,7 +287,12 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>9.0.0.v20130308</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Something went wrong with that request. Please try again.