From cd17e12620714822fde5b9513b0cf05a3ada6920 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 15 Apr 2013 23:33:51 +1200
Subject: [PATCH] Merge API into Server to simplify forking/branching across
 API and Implementation

---
 .gitignore |  2 ++
 pom.xml    | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 77344b780..87459042e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
+*.autofetch
 *.sql
 .classpath
 .project
 .settings/
 target/
 logs/
+log/
diff --git a/pom.xml b/pom.xml
index 00120be36..83f09aaae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,11 +8,11 @@
   </parent>
 
   <groupId>org.avaje.ebeanorm</groupId>
-  <artifactId>avaje-ebeanorm-server</artifactId>
-  <version>3.1.3-SNAPSHOT</version>
+  <artifactId>avaje-ebeanorm</artifactId>
+  <version>3.2.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>avaje-ebeanorm-server</name>
+  <name>avaje-ebeanorm</name>
   <url>http://www.avaje.org</url>
 
   <properties>
@@ -43,6 +43,12 @@
 
   <dependencies>
 
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>persistence-api</artifactId>
+      <version>1.0</version>
+    </dependency>
+    
     <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>jta</artifactId>
@@ -64,12 +70,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.avaje.ebeanorm</groupId>
-      <artifactId>avaje-ebeanorm-api</artifactId>
-      <version>[3.1.2-SNAPSHOT]</version>
-    </dependency>
-
     <dependency>
       <groupId>org.avaje.ebeanorm</groupId>
       <artifactId>avaje-ebeanorm-agent</artifactId>