openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From allee8...@apache.org
Subject svn commit: r1444323 - in /openjpa/trunk/openjpa-integration/tck: pom.xml tck2-20110815.xml
Date Sat, 09 Feb 2013 04:12:55 GMT
Author: allee8285
Date: Sat Feb  9 04:12:55 2013
New Revision: 1444323

URL: http://svn.apache.org/r1444323
Log:
OPENJPA-2326: remove ant-nodeps package dependency.

Modified:
    openjpa/trunk/openjpa-integration/tck/pom.xml
    openjpa/trunk/openjpa-integration/tck/tck2-20110815.xml

Modified: openjpa/trunk/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/tck/pom.xml?rev=1444323&r1=1444322&r2=1444323&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/tck/pom.xml Sat Feb  9 04:12:55 2013
@@ -209,13 +209,6 @@
                   </goals>
                 </execution>
               </executions>
-              <dependencies>
-                  <dependency>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-nodeps</artifactId>
-                    <version>1.7.1</version>
-                  </dependency>
-              </dependencies>
             </plugin>
           </plugins>
         </build>

Modified: openjpa/trunk/openjpa-integration/tck/tck2-20110815.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/tck/tck2-20110815.xml?rev=1444323&r1=1444322&r2=1444323&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/tck2-20110815.xml (original)
+++ openjpa/trunk/openjpa-integration/tck/tck2-20110815.xml Sat Feb  9 04:12:55 2013
@@ -346,14 +346,14 @@ create.cmp.tables=false
 
         <!-- We are attempting to change TCK build.xml;s incorrect property name
              for the pluggability test enablement...  -->
-        <replaceregexp file="${tck.dir}/bin/build.xml"
-                   match="persistence.properties.file"
-                   replace="persistence.unit.properties.file.full.path" 
-                   flags="g"/>
-        <replaceregexp file="${tck.dir}/bin/build.xml"
-                   match='replaceregexp file="(.*)/ts.jte"'
-                   replace='replaceregexp flags="g" file="\1/ts.jte"'
-                   />
+        <replace file="${tck.dir}/bin/build.xml">
+            <replacefilter token="persistence.properties.file"
+            	           value="persistence.unit.properties.file.full.path"/>
+        </replace>
+        <replace file="${tck.dir}/bin/build.xml">
+        	<replacetoken><![CDATA[<replaceregexp file="${bin.dir}/ts.jte"]]></replacetoken>
+            <replacevalue><![CDATA[<replaceregexp flags="g" file="${bin.dir}/ts.jte"]]></replacevalue>
+        </replace>
 
         <property name="jpatck.run.tmo" value="7200000" />
         <!-- now run the TCK -->



Mime
View raw message