Author: snoopdave
Date: Wed Aug 7 13:35:49 2013
New Revision: 1511304
URL: http://svn.apache.org/r1511304
Log:
Revert to EclipseLink
Modified:
roller/trunk/app/pom.xml
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1511304&r1=1511303&r2=1511304&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Wed Aug 7 13:35:49 2013
@@ -35,11 +35,11 @@
placed in the src/test/resources/roller-custom.properties
file.
-->
- <!--dependency>
+ <dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
<version>2.5.0</version>
- </dependency-->
+ </dependency>
<!-- Alternative testing with Hibernate (used by default
with JBoss
@@ -48,7 +48,6 @@
org.javassist:javassist:3.15.0 cannot replace differently named
javassist:javassist:3.11.0
always provided by struts2-spring-plugin so filtering it out;
already provided by JBoss anyway
- -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
@@ -60,6 +59,7 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
<groupId>org.slf4j</groupId>
