Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-05-23 04:09:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

finally got rid of commons logging

Browse source
This commit is contained in:
Keith Donald 2009-12-17 18:51:44 +00:00 committed by Mic
parent 905d9824b0
commit 57e17d32b2
2 changed files with 60 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.settings/org.eclipse.wst.common.component
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0"> <project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="org.springframework.samples.petclinic"> <wb-module deploy-name="org.springframework.samples.petclinic">
<wb-resource deploy-path="/" source-path="/src/main/webapp"/> <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<property name="java-output-path" value="target/classes"/> <property name="java-output-path" value="target/classes"/>
<property name="context-root" value="petclinic"/> <property name="context-root" value="petclinic"/>
</wb-module> </wb-module>
</project-modules> </project-modules>

71
pom.xml
View file

@ -19,23 +19,13 @@
<artifactId>org.springframework.context</artifactId> <artifactId>org.springframework.context</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
<exclusions> <exclusions>
<!-- Exclude Commons Logging in favor of SLF4j (see 'Logging' Dependency Config below) --> <!-- Exclude Commons Logging in favor of SLF4j -->
<exclusion> <exclusion>
<groupId>org.apache.commons.logging</groupId> <groupId>org.apache.commons.logging</groupId>
<artifactId>com.springsource.org.apache.commons.logging</artifactId> <artifactId>com.springsource.org.apache.commons.logging</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.aspects</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.weaver</artifactId>
<version>1.6.5.RELEASE</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>org.springframework.orm</artifactId> <artifactId>org.springframework.orm</artifactId>
@ -52,6 +42,20 @@
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<!-- AspectJ -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.weaver</artifactId>
<version>1.6.5.RELEASE</version>
<scope>optional</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.aspects</artifactId>
<version>${spring.version}</version>
<scope>optional</scope>
</dependency>
<!-- Logging --> <!-- Logging -->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -102,6 +106,7 @@
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>com.springsource.org.hibernate</artifactId> <artifactId>com.springsource.org.hibernate</artifactId>
<version>3.3.2.GA</version> <version>3.3.2.GA</version>
<scope>optional</scope>
</dependency> </dependency>
<!-- JPA --> <!-- JPA -->
@ -109,26 +114,56 @@
<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>
<scope>optional</scope>
</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>
<scope>optional</scope>
</dependency> </dependency>
<!-- Hibernate JPA Provider --> <!-- Hibernate JPA Provider -->
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>com.springsource.org.hibernate.ejb</artifactId> <artifactId>com.springsource.org.hibernate.ejb</artifactId>
<version>3.4.0.GA</version> <version>3.4.0.GA</version>
<scope>runtime</scope> <scope>optional</scope>
<exclusions>
<!-- Exclude Commons Logging in favor of SLF4j -->
<exclusion>
<groupId>org.apache.commons.logging</groupId>
<artifactId>com.springsource.org.apache.commons.logging</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>com.springsource.org.hibernate.annotations</artifactId>
<version>3.4.0.GA</version>
<scope>optional</scope>
<exclusions>
<!-- Exclude Commons Logging in favor of SLF4j -->
<exclusion>
<groupId>org.apache.commons.logging</groupId>
<artifactId>com.springsource.org.apache.commons.logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Open JPA Provider --> <!-- Open JPA Provider -->
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>com.springsource.org.apache.openjpa</artifactId> <artifactId>com.springsource.org.apache.openjpa</artifactId>
<version>1.1.0</version> <version>1.1.0</version>
<scope>runtime</scope> <scope>optional</scope>
<exclusions>
<!-- Exclude Commons Logging in favor of SLF4j -->
<exclusion>
<groupId>org.apache.commons.logging</groupId>
<artifactId>com.springsource.org.apache.commons.logging</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- Servlet --> <!-- Servlet -->
@ -188,13 +223,7 @@
<version>1.1.0</version> <version>1.1.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>com.springsource.org.hibernate.annotations</artifactId>
<version>3.4.0.GA</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>
<repository> <repository>