Author: dblevins Date: Thu May 27 21:02:52 2010 New Revision: 948998 URL: http://svn.apache.org/viewvc?rev=948998&view=rev Log: svn merge -r 948240:948241 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=948241&view=rev ------------------------------------------------------------------------ r948241 | djencks | 2010-05-25 16:00:14 -0700 (Tue, 25 May 2010) | 1 line make maven 3 happier ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.x/ (props changed) openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) openejb/branches/openejb-3.1.x/pom.xml Propchange: openejb/branches/openejb-3.1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 21:02:52 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 -/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022 +/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241 Propchange: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 21:02:52 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593 -/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241 Propchange: openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 21:02:52 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593 -/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241 Modified: openejb/branches/openejb-3.1.x/pom.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/pom.xml?rev=948998&r1=948997&r2=948998&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/pom.xml (original) +++ openejb/branches/openejb-3.1.x/pom.xml Thu May 27 21:02:52 2010 @@ -27,6 +27,7 @@ <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>6</version> + <relativePath /> </parent> <groupId>org.apache.openejb</groupId>
