Skip to content
Snippets Groups Projects
Commit 6f1ca5dd authored by Keith Donald's avatar Keith Donald Committed by Mic
Browse files

format

parent 6d0d36f3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 64 additions and 66 deletions
pom.xml
+ 64
− 66
View file @ 6f1ca5dd
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<slf4j.version>1.5.10</slf4j.version> <slf4j.version>1.5.10</slf4j.version>
</properties> </properties>
<dependencies> <dependencies>
<!-- Spring --> <!-- Spring -->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
<exclusion> <exclusion>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.logging</artifactId> <artifactId>com.springsource.org.apache.commons.logging</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
...@@ -41,32 +41,32 @@ ...@@ -41,32 +41,32 @@
<artifactId>org.springframework.web.servlet</artifactId> <artifactId>org.springframework.web.servlet</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<!-- AspectJ --> <!-- AspectJ -->
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.weaver</artifactId> <artifactId>com.springsource.org.aspectj.weaver</artifactId>
<version>1.6.5.RELEASE</version> <version>1.6.5.RELEASE</version>
</dependency> </dependency>
<!-- Logging --> <!-- Logging -->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>com.springsource.slf4j.api</artifactId> <artifactId>com.springsource.slf4j.api</artifactId>
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId> <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>com.springsource.slf4j.log4j</artifactId> <artifactId>com.springsource.slf4j.log4j</artifactId>
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.log4j</groupId> <groupId>org.apache.log4j</groupId>
<artifactId>com.springsource.org.apache.log4j</artifactId> <artifactId>com.springsource.org.apache.log4j</artifactId>
...@@ -79,8 +79,8 @@ ...@@ -79,8 +79,8 @@
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.dbcp</artifactId> <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
<version>1.2.2.osgi</version> <version>1.2.2.osgi</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hsqldb</groupId> <groupId>org.hsqldb</groupId>
<artifactId>com.springsource.org.hsqldb</artifactId> <artifactId>com.springsource.org.hsqldb</artifactId>
...@@ -89,13 +89,11 @@ ...@@ -89,13 +89,11 @@
</dependency> </dependency>
<!-- MySQL JDBC Connector --> <!-- MySQL JDBC Connector -->
<!-- <!--
<dependency> <dependency> <groupId>com.mysql.jdbc</groupId>
<groupId>com.mysql.jdbc</groupId> <artifactId>com.springsource.com.mysql.jdbc</artifactId>
<artifactId>com.springsource.com.mysql.jdbc</artifactId> <version>5.1.6</version> </dependency>
<version>5.1.6</version> -->
</dependency>
-->
<!-- Hibernate --> <!-- Hibernate -->
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
...@@ -103,20 +101,20 @@ ...@@ -103,20 +101,20 @@
<version>3.3.2.GA</version> <version>3.3.2.GA</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<!-- JPA --> <!-- JPA -->
<dependency> <dependency>
<groupId>javax.persistence</groupId> <groupId>javax.persistence</groupId>
<artifactId>com.springsource.javax.persistence</artifactId> <artifactId>com.springsource.javax.persistence</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<!-- Toplink JPA Provider --> <!-- Toplink JPA Provider -->
<dependency> <dependency>
<groupId>com.oracle.toplink.essentials</groupId> <groupId>com.oracle.toplink.essentials</groupId>
<artifactId>com.springsource.oracle.toplink.essentials</artifactId> <artifactId>com.springsource.oracle.toplink.essentials</artifactId>
<version>2.0.0.b41-beta2</version> <version>2.0.0.b41-beta2</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<!-- Hibernate JPA Provider --> <!-- Hibernate JPA Provider -->
<dependency> <dependency>
...@@ -129,20 +127,20 @@ ...@@ -129,20 +127,20 @@
<exclusion> <exclusion>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.logging</artifactId> <artifactId>com.springsource.org.apache.commons.logging</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>com.springsource.org.hibernate.annotations</artifactId> <artifactId>com.springsource.org.hibernate.annotations</artifactId>
<version>3.4.0.GA</version> <version>3.4.0.GA</version>
<optional>true</optional> <optional>true</optional>
<exclusions> <exclusions>
<!-- Exclude Commons Logging in favor of SLF4j --> <!-- Exclude Commons Logging in favor of SLF4j -->
<exclusion> <exclusion>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.logging</artifactId> <artifactId>com.springsource.org.apache.commons.logging</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Open JPA Provider --> <!-- Open JPA Provider -->
...@@ -156,8 +154,8 @@ ...@@ -156,8 +154,8 @@
<exclusion> <exclusion>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.logging</artifactId> <artifactId>com.springsource.org.apache.commons.logging</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Servlet --> <!-- Servlet -->
...@@ -182,7 +180,7 @@ ...@@ -182,7 +180,7 @@
<groupId>org.apache.taglibs</groupId> <groupId>org.apache.taglibs</groupId>
<artifactId>com.springsource.org.apache.taglibs.standard</artifactId> <artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
<version>1.1.2</version> <version>1.1.2</version>
</dependency> </dependency>
<!-- Rome RSS --> <!-- Rome RSS -->
<dependency> <dependency>
...@@ -209,13 +207,13 @@ ...@@ -209,13 +207,13 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>org.springframework.test</artifactId> <artifactId>org.springframework.test</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.transaction</groupId> <groupId>javax.transaction</groupId>
<artifactId>com.springsource.javax.transaction</artifactId> <artifactId>com.springsource.javax.transaction</artifactId>
<version>1.1.0</version> <version>1.1.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -247,28 +245,28 @@ ...@@ -247,28 +245,28 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<verbose>true</verbose> <verbose>true</verbose>
<source>1.5</source> <source>1.5</source>
<target>1.5</target> <target>1.5</target>
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<includes> <includes>
<include>**/*Tests.java</include> <include>**/*Tests.java</include>
</includes> </includes>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<configuration> <configuration>
<warName>petclinic</warName> <warName>petclinic</warName>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</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