Skip to content

Commit

Permalink
excluded hibernate 3.0.5 from joda-time hibernate import
Browse files Browse the repository at this point in the history
  • Loading branch information
Joachim Meyer authored and Joachim Meyer committed Apr 27, 2011
1 parent 0693230 commit 58290cf
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 28 deletions.
14 changes: 7 additions & 7 deletions org.alibrary.backend/.settings/org.eclipse.wst.common.component
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="alibrary-backend">
<wb-resource deploy-path="/" source-path="/src/main/java"/>
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
</wb-module>
</project-modules>
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="alibrary-backend">
<wb-resource deploy-path="/" source-path="/src/main/java"/>
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
</wb-module>
</project-modules>
6 changes: 6 additions & 0 deletions org.alibrary.backend/pom.xml
Expand Up @@ -69,6 +69,12 @@
<groupId>joda-time</groupId>
<artifactId>joda-time-hibernate</artifactId>
<version>1.2</version>
<exclusions>
<exclusion>
<artifactId>hibernate</artifactId>
<groupId>org.hibernate</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
26 changes: 13 additions & 13 deletions org.alibrary.frontend/.settings/org.eclipse.wst.common.component
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="alibrary-frontend">
<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/resources"/>
<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/alibrary-backend/alibrary-backend">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="alibrary-frontend"/>
<property name="java-output-path" value="/alibrary-frontend/target/classes"/>
</wb-module>
</project-modules>
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="alibrary-frontend">
<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/resources"/>
<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/org.alibrary.backend/org.alibrary.backend">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="alibrary-frontend"/>
<property name="java-output-path" value="/alibrary-frontend/target/classes"/>
</wb-module>
</project-modules>
16 changes: 8 additions & 8 deletions org.alibrary.frontend/.settings/org.maven.ide.eclipse.prefs
@@ -1,8 +1,8 @@
#Mon Jan 31 21:14:32 CET 2011
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
resolveWorkspaceProjects=true
resourceFilterGoals=process-resources resources\:testResources
skipCompilerPlugin=true
version=1
#Wed Apr 27 18:50:39 CEST 2011
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
resolveWorkspaceProjects=true
resourceFilterGoals=process-resources resources\:testResources
skipCompilerPlugin=true
version=1

0 comments on commit 58290cf

Please sign in to comment.