diff --git a/openjpa-persistence-locking/.classpath b/openjpa-persistence-locking/.classpath
new file mode 100644
index 000000000..0e3b12cd8
--- /dev/null
+++ b/openjpa-persistence-locking/.classpath
@@ -0,0 +1,4 @@
+<classpath>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
diff --git a/openjpa-persistence-locking/.project b/openjpa-persistence-locking/.project
new file mode 100644
index 000000000..732c3ad5b
--- /dev/null
+++ b/openjpa-persistence-locking/.project
@@ -0,0 +1,13 @@
+<projectDescription>
+  <name>openjpa-persistence-locking</name>
+  <comment>OpenJPA Persistence Locking Tests</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file
diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml
index 3963f9b46..7e72880f3 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -1,38 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-    <!--
-        Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the
-        NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF
-        licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file
-        except in compliance with the License. You may obtain a copy of the License at
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
 
-        http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-        either express or implied. See the License for the specific language governing permissions and limitations under
-        the License.
-    -->
-    <!-- 
-    Maven release plugin requires the project tag to be on a single line. 
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!--
+    Maven release plugin requires the project tag to be on a single line.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa-persistence-locking</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA Persistence Locking</name>
-    <description>OpenJPA Persistence Locking tests</description>
-    <url>http://openjpa.apache.org</url>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-persistence-locking</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Persistence Locking Tests</name>
+    <description>OpenJPA Persistence Locking Tests</description>
+
     <properties>
         <dbcp.maxActive>10</dbcp.maxActive>
         <dbcp.maxIdle>5</dbcp.maxIdle>
         <dbcp.minIdle>2</dbcp.minIdle>
         <dbcp.maxWait>10000</dbcp.maxWait>
         <dbcp.args>MaxActive=${dbcp.maxActive},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}</dbcp.args>
+        <!-- have to use a larger waitTimeout to avoid lockmgr test failures -->
         <derby.locks.waitTimeout>60</derby.locks.waitTimeout>
         <derby.locks.deadlockTimeout>5</derby.locks.deadlockTimeout>
         <tests.openjpa.allowfailure>ignore</tests.openjpa.allowfailure>
@@ -601,7 +610,6 @@
                             <name>derby.locks.deadlockTimeout</name>
                             <value>${derby.locks.deadlockTimeout}</value>
                         </property>
-                        <!-- following causes lockmgr test failures  -->
                         <property>
                             <name>derby.locks.waitTimeout</name>
                             <value>${derby.locks.waitTimeout}</value>