Index: exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java
===================================================================
--- exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java	(revision 1848780)
+++ exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java	(working copy)
@@ -87,6 +87,14 @@
      */
     protected String dblist;
 
+    /**
+     * Classpath including the dependencies using : as separator between entries.
+     * @parameter property="jdo.tck.dependencyClasspath"
+     *      default-value=""
+     * @required
+     */
+    protected String dependencyClasspath;
+
     protected Collection<String> dbs = new HashSet<String>();
 
     /**
Index: exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
===================================================================
--- exectck/src/main/java/org/apache/jdo/exectck/Enhance.java	(revision 1848780)
+++ exectck/src/main/java/org/apache/jdo/exectck/Enhance.java	(working copy)
@@ -43,7 +43,7 @@
  *
  * @phase integration-test
  */
-public class Enhance extends AbstractMojo {
+public class Enhance extends AbstractTCKMojo {
 
     private static final String[] PC_PKG_DIRS = {
         "org" + File.separator + "apache" + File.separator + "jdo" + File.separator + "tck" + File.separator + "api" + File.separator,
@@ -94,20 +94,6 @@
      */
     private String implLogFile;
     /**
-     * Location of jar files for implementation under test.
-     * @parameter property="project.lib.iut.directory"
-     *      default-value="${basedir}/../lib/iut"
-     * @required
-     */
-    private String iutLibsDirectory;
-    /**
-     * Location of jar files for implementation under test.
-     * @parameter property="project.lib.iut.directory"
-     *      default-value="${basedir}/../lib/jdori"
-     * @required
-     */
-    private String jdoriLibsDirectory;
-    /**
      * List of identity types to be tested.
      * @parameter property="jdo.tck.identitytypes"
      *      default-value="applicationidentity datastoreidentity"
@@ -232,19 +218,8 @@
             try {
                 // Must add enhancedIdDirName first!!
                 cpList1.add((new File(enhancedIdDirName)).toURI().toURL());
-                String[] jars = {"jar"};
-                if (impl.equals("jdori")) {
-                    cpList1.add((new File(jdoriLibsDirectory)).toURI().toURL());
-                    fi = FileUtils.iterateFiles(new File(jdoriLibsDirectory), jars, true);
-                    while (fi.hasNext()) {
-                        cpList1.add(fi.next().toURI().toURL());
-                    }
-                } else {
-                    cpList1.add((new File(iutLibsDirectory)).toURI().toURL());
-                    fi = FileUtils.iterateFiles(new File(iutLibsDirectory), jars, true);
-                    while (fi.hasNext()) {
-                        cpList1.add(fi.next().toURI().toURL());
-                    }
+                for (String dependency : this.dependencyClasspath.split(":")) {
+                    cpList1.add(new File(dependency).toURI().toURL());
                 }
                 enhancerLoader = new URLClassLoader(cpList1.toArray(classPathURLs1),
                         getClass().getClassLoader());
@@ -257,17 +232,11 @@
             // Context classloader for finding log4j.properties
             ClassLoader prevCl = Thread.currentThread().getContextClassLoader();
             try {
-                URL implUrl;
-                if (impl.equals("jdori")) {
-                    implUrl = (new File(jdoriLibsDirectory)).toURI().toURL();
-                } else {
-                     implUrl = (new File(iutLibsDirectory)).toURI().toURL();
-                }
                 URL enhancedClassesUrl = (new File(enhancedIdDirName)).toURI().toURL();
                 // Classes dir needed for org.apache.jdo.tck.util.TCKFileAppender
                 URL classesUrl = (new File(classesDirName)).toURI().toURL();
                 ClassLoader loggingPropsCl =
-                        URLClassLoader.newInstance(new URL[]{implUrl,
+                        URLClassLoader.newInstance(new URL[]{
                         enhancedClassesUrl, classesUrl}, prevCl);
                 Thread.currentThread().setContextClassLoader(loggingPropsCl);
             } catch (Exception e) {
Index: exectck/src/main/java/org/apache/jdo/exectck/Help.java
===================================================================
--- exectck/src/main/java/org/apache/jdo/exectck/Help.java	(revision 1848780)
+++ exectck/src/main/java/org/apache/jdo/exectck/Help.java	(working copy)
@@ -65,8 +65,6 @@
         msg.append("* jdo.tck.identitytypes\n");
         msg.append("  List of identity types to be tested\n");
         msg.append("  Default value is \"applicationidentity datastoreidentity\"\n");
-        msg.append("* project.lib.iut.directory\n");
-        msg.append("  Location of implementation jar files. Default: ${basedir}/../lib/iut\n");
         msg.append("* jdo.tck.impl.logfile\n");
         msg.append("  Location of implementation log file. Default: ${user.dir}/datanucleus.txt\n");
         msg.append("* jdo.tck.doInstallSchema\n");
Index: exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
===================================================================
--- exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java	(revision 1848780)
+++ exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java	(working copy)
@@ -106,20 +106,6 @@
     private String implLogFile;
 
     /**
-     * Location of jar files for implementation under test.
-     * @parameter property="project.lib.iut.directory"
-     *      default-value="${basedir}/../lib/iut"
-     * @required
-     */
-    private String iutLibsDirectory;
-    /**
-     * Location of jar files for implementation under test.
-     * @parameter property="project.lib.iut.directory"
-     *      default-value="${basedir}/../lib/jdori"
-     * @required
-     */
-    private String jdoriLibsDirectory;
-    /**
      * Name of file in src/conf containing pmf properties.
      * @parameter property="jdo.tck.pmfproperties"
      *      default-value="jdori-pmf.properties"
@@ -199,7 +185,7 @@
     /**
      * Helper method returning the trimmed value of the specified property.
      * @param props the Properties object
-     * @param ke the key of the property to be returned
+     * @param key the key of the property to be returned
      * @return the trimmed property value or the empty string if the property is not defined. +     */
     private String getTrimmedPropertyValue (Properties props, String key) {
         String value = props.getProperty(key);
@@ -342,18 +328,8 @@
                     while (fi.hasNext()) {
                         cpList.add(fi.next().toURI().toURL());
                     }
-                    if (impl.equals("iut")) {
-                        fi = FileUtils.iterateFiles(
-                            new File(iutLibsDirectory), jars, true);
-                        while (fi.hasNext()) {
-                            cpList.add(fi.next().toURI().toURL());
-                        }
-                    } else {
-                        fi = FileUtils.iterateFiles(
-                            new File(jdoriLibsDirectory), jars, true);
-                        while (fi.hasNext()) {
-                            cpList.add(fi.next().toURI().toURL());
-                        }
+                    for (String dependency : this.dependencyClasspath.split(":")) {
+                        cpList.add(new File(dependency).toURI().toURL());
                     }
                 } catch (MalformedURLException ex) {
                     ex.printStackTrace();
Index: pom.xml
===================================================================
--- pom.xml	(revision 1848780)
+++ pom.xml	(working copy)
@@ -36,7 +36,6 @@
     <module>parent-pom</module>
     <module>api</module>
     <module>exectck</module>
-    <module>copyjdorijars</module>
     <module>tck</module>
   </modules>
 
Index: tck/pom.xml
===================================================================
--- tck/pom.xml	(revision 1848780)
+++ tck/pom.xml	(working copy)
@@ -62,6 +62,22 @@
         </resources>
         <plugins>
             <plugin>
+                <!-- store dependencies into property dependency.classpath -->
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.8</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>build-classpath</goal>
+                        </goals>
+                        <configuration>
+                            <outputProperty>dependency.classpath</outputProperty>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.jdo</groupId>
                 <artifactId>jdo-exectck</artifactId>
                 <version>3.2-SNAPSHOT</version>
@@ -74,6 +90,10 @@
                             <goal>enhance</goal>
                             <goal>runtck</goal>
                         </goals>
+                        <configuration>
+                            <!-- pass property dependency.classpath to plugin -->
+                            <dependencyClasspath>${dependency.classpath}</dependencyClasspath>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -87,7 +107,7 @@
                     <windowtitle>${project.name} ${pom.currentVersion}</windowtitle>
                 </configuration>
             </plugin>
-	        <plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>2.6</version>
@@ -106,16 +126,67 @@
                     <value>iut</value>
                 </property>
             </activation>
+            <dependencies>
+                <!-- add the iut dependencies here -->
+            </dependencies>
         </profile>
         <profile>
             <id>jdori</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>jdo.tck.impl</name>
+                    <value>jdori</value>
+                </property>
             </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-core</artifactId>
+                    <version>5.2.0-m2</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-rdbms</artifactId>
+                    <version>5.2.0-m2</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jdo</artifactId>
+                    <version>5.2.0-m3-SNAPSHOT</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-jdo-query</artifactId>
+                    <version>5.0.8</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jpa</artifactId>
+                    <version>5.2.0-m2</version>
+                </dependency>
+                <dependency>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                    <version>1.2.16</version>
+                </dependency>
+            </dependencies>
+            <repositories>
+                <repository>
+                    <id>DataNucleus Nightly</id>
+                    <url>http://www.datanucleus.org/downloads/maven2-nightly</url>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </repository>
+            </repositories>
         </profile>
     </profiles>
     <dependencies>
-        <dependency>
+      <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo-api</artifactId>
         </dependency>
@@ -124,24 +195,14 @@
             <artifactId>junit</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-api-jdo</artifactId>
-            <version>5.2.0-m3-SNAPSHOT</version>
+             <groupId>commons-logging</groupId>
+             <artifactId>commons-logging</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-jdo-query</artifactId>
-            <version>5.0.8</version>
+             <groupId>javax.transaction</groupId>
+             <artifactId>javax.transaction-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-		    <groupId>javax.transaction</groupId>
-	    	<artifactId>javax.transaction-api</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
         </dependency>
@@ -186,4 +247,5 @@
             </plugin>
         </plugins>
     </reporting>
+
 </project>