svn commit: r1540146 - in /tomee: sandbox/patched-libraries/openjpa-2.3.0/ tomee/branches/tomee-1.6.0/deps/openjpa/

[db...@apache.org]

Author: dblevins
Date: Fri Nov  8 18:39:18 2013
New Revision: 1540146

URL: http://svn.apache.org/r1540146
Log:
move outside the branch due to maven shade plugin complications.
we need the jar and pom that creates *after* shading

Added:
    tomee/sandbox/patched-libraries/openjpa-2.3.0/   (props changed)
      - copied from r1540144, tomee/tomee/branches/tomee-1.6.0/deps/openjpa/
Removed:
    tomee/tomee/branches/tomee-1.6.0/deps/openjpa/

Propchange: tomee/sandbox/patched-libraries/openjpa-2.3.0/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov  8 18:39:18 2013
@@ -0,0 +1,15 @@
+.*
+openjpa-database
+target
+subs
+*.bat
+enhance.xml
+user.dict
+wip
+patches
+bin
+*.log
+maven-eclipse.xml
+*.iml
+*.ipr
+*.iws

Propchange: tomee/sandbox/patched-libraries/openjpa-2.3.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov  8 18:39:18 2013
@@ -0,0 +1,6 @@
+/openjpa/branches/1.0.x:736493
+/openjpa/branches/2.0.x:1504611
+/openjpa/branches/2.1.x:1415379,1415398,1485010,1513249,1517838,1530146,1533218,1533280,1539188
+/openjpa/branches/2.2.1.x:1415367,1415413,1415425,1504719,1508186,1530347,1533222,1539193
+/openjpa/branches/2.2.x:1384400,1415459-1415460,1415469,1485013,1530364,1533223
+/openjpa/trunk:1530368,1535760,1535838,1536439,1536455,1536595