gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1658317 - in /gump/metadata/project: ant.xml hamcrest.xml poi.xml tomcat-tc7.xml tomcat-tc8.xml tomcat-trunk.xml xmlunit.xml
Date Mon, 09 Feb 2015 08:10:56 GMT
Author: bodewig
Date: Mon Feb  9 08:10:55 2015
New Revision: 1658317

URL: http://svn.apache.org/r1658317
Log:
Try to build hamcrest using Gradle

TBH I don't expect the "new" hamcrest (2.x) to work as a replacement
for Hamcrest 1.x at all.

Modified:
    gump/metadata/project/ant.xml
    gump/metadata/project/hamcrest.xml
    gump/metadata/project/poi.xml
    gump/metadata/project/tomcat-tc7.xml
    gump/metadata/project/tomcat-tc8.xml
    gump/metadata/project/tomcat-trunk.xml
    gump/metadata/project/xmlunit.xml

Modified: gump/metadata/project/ant.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/ant.xml?rev=1658317&r1=1658316&r2=1658317&view=diff
==============================================================================
--- gump/metadata/project/ant.xml (original)
+++ gump/metadata/project/ant.xml Mon Feb  9 08:10:55 2015
@@ -94,7 +94,7 @@
     <option project="jdepend" runtime="true"/>
     <option project="jsch" runtime="true"/>
     <option project="junit"/>
-    <option project="hamcrest-java" ids="hamcrest-core"/>
+    <option project="hamcrest-java"/>
     <option project="logging-log4j-12" runtime="true"/>
     <option project="oro" runtime="true"/>
 

Modified: gump/metadata/project/hamcrest.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/hamcrest.xml?rev=1658317&r1=1658316&r2=1658317&view=diff
==============================================================================
--- gump/metadata/project/hamcrest.xml (original)
+++ gump/metadata/project/hamcrest.xml Mon Feb  9 08:10:55 2015
@@ -17,7 +17,7 @@
 -->
 <module name="hamcrest" groupId="org.hamcrest">
 
-  <url href="http://code.google.com/p/hamcrest/"/>
+  <url href="http://hamcrest.org/JavaHamcrest/"/>
   <description>
     Provides a library of matcher objects (also known as constraints
     or predicates) allowing 'match' rules to be defined declaratively,
@@ -27,40 +27,20 @@
 
  <git repository="github" dir="/hamcrest/JavaHamcrest"/>
   
-  <project name="hamcrest-java">
+  <project name="java-hamcrest">
     <package>org.hamcrest</package>
-    <ant  target="bigjar">
-      <property name="version" value="@@DATE@@"/>
-    </ant>
-
-    <depend project="bootstrap-ant"/>
-    <!-- depend project="qdox" / -->
-    <depend project="jarjar" />
+    <gradle />
 
-    <work nested="build/temp/hamcrest-api-@@DATE@@.jar.contents"/>
-    <work nested="build/temp/hamcrest-generator-@@DATE@@.jar.contents"/>
-    <work nested="build/temp/hamcrest-core-@@DATE@@.jar.contents"/>
-    <work nested="build/temp/hamcrest-integration-@@DATE@@.jar.contents"/>
-    <work nested="build/temp/hamcrest-library-@@DATE@@.jar.contents"/>
-    <work nested="build/hamcrest-api-@@DATE@@-tests.jar"/>
-    <work nested="build/hamcrest-integration-@@DATE@@-tests.jar"/>
-    <work nested="build/hamcrest-generator-@@DATE@@-tests.jar"/>
-    <work nested="build/hamcrest-library-@@DATE@@-tests.jar"/>
-    <work nested="build/hamcrest-core-@@DATE@@-tests.jar"/>
-    <work nested="lib/integration/ant-junit-1.8.4.jar"/>
-    <work nested="lib/integration/junit-dep-4.11.jar"/>
-    <work nested="lib/integration/easymock-2.2.jar"/>
-    <work nested="lib/integration/jmock-1.10RC1.jar"/>
-    <work nested="lib/integration/testng-6.5.2.jar"/>
-    <work nested="lib/generator/qdox-2.0-M2.jar"/>
+    <option project="bootstrap-ant"/>
 
-    <home nested="build" />
+    <license name="LICENSE.txt" />
+    <jar name="build/libs/java-hamcrest-*[0-9T].jar"/>
+  </project>
 
+  <project name="hamcrest-java">
+    <package>org.hamcrest</package>
+    <depend project="java-hamcrest"/>
     <license name="LICENSE.txt" />
-    <jar name="hamcrest-api-@@DATE@@.jar" id="hamcrest-api"/>
-    <jar name="hamcrest-all-@@DATE@@.jar" id="hamcrest-all"/>
-    <jar name="hamcrest-all-@@DATE@@.jar" id="hamcrest-core"/>
-    <jar name="hamcrest-generator-@@DATE@@.jar" id="hamcrest-generator"/>
-    <jar name="hamcrest-library-@@DATE@@.jar" id="hamcrest-library"/>
+    <jar name="build/libs/java-hamcrest-*[0-9T].jar"/>
   </project>
 </module>

Modified: gump/metadata/project/poi.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/poi.xml?rev=1658317&r1=1658316&r2=1658317&view=diff
==============================================================================
--- gump/metadata/project/poi.xml (original)
+++ gump/metadata/project/poi.xml Mon Feb  9 08:10:55 2015
@@ -35,7 +35,7 @@
         <depend project="commons-collections"/>
         <depend project="commons-lang"/>
         <depend project="junit"/>
-        <depend project="hamcrest-java" ids="hamcrest-core"/>
+        <depend project="hamcrest-java"/>
         <depend project="xml-apis"/>
         <depend project="xml-xerces"/>
         <depend project="xalan"/>
@@ -117,7 +117,7 @@
      <depend project="commons-lang"/>
      <depend project="jacocoant"/>
      <depend project="junit"/>
-     <depend project="hamcrest-java" ids="hamcrest-core"/>
+     <depend project="hamcrest-java"/>
      <depend project="xml-apis"/>
      <depend project="xml-xerces"/>
      <depend project="xalan"/>

Modified: gump/metadata/project/tomcat-tc7.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc7.xml?rev=1658317&r1=1658316&r2=1658317&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc7.xml (original)
+++ gump/metadata/project/tomcat-tc7.xml Mon Feb  9 08:10:55 2015
@@ -118,7 +118,7 @@
       <property name="tomcat-native.tar.gz" project="commons-daemon"
               id="native-distro" reference="outputpath" />
       <depend property="junit.jar" project="junit" id="junit"/>
-      <depend property="hamcrest.jar" project="hamcrest-java" id="hamcrest-core"/>
+      <depend property="hamcrest.jar" project="hamcrest-java"/>
       <property name="commons-pool.home" project="commons-pool"
                 path="." />
       <property name="commons-dbcp.home" project="commons-dbcp"
@@ -162,7 +162,7 @@
       <property name="tomcat-native.tar.gz" project="commons-daemon"
               id="native-distro" reference="outputpath" />
       <depend property="junit.jar" project="junit" id="junit"/>
-      <depend property="hamcrest.jar" project="hamcrest-java" id="hamcrest-core"/>
+      <depend property="hamcrest.jar" project="hamcrest-java"/>
       <property name="commons-pool.home" project="commons-pool"
                 path="." />
       <property name="commons-dbcp.home" project="commons-dbcp"

Modified: gump/metadata/project/tomcat-tc8.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc8.xml?rev=1658317&r1=1658316&r2=1658317&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc8.xml (original)
+++ gump/metadata/project/tomcat-tc8.xml Mon Feb  9 08:10:55 2015
@@ -91,7 +91,7 @@
       <property name="tomcat-native.tar.gz" project="commons-daemon"
               id="native-distro" reference="outputpath" />
       <depend property="junit.jar" project="junit" id="junit"/>
-      <depend property="hamcrest.jar" project="hamcrest-java" id="hamcrest-core"/>
+      <depend property="hamcrest.jar" project="hamcrest-java"/>
       <depend property="cglib.jar" project="cglib" id="cglib" />
       <depend property="objenesis.jar" project="objenesis" id="objenesis" />
       <depend property="easymock.jar" project="easymock" id="easymock" />
@@ -132,7 +132,7 @@
       <property name="tomcat-native.tar.gz" project="commons-daemon"
               id="native-distro" reference="outputpath" />
       <depend property="junit.jar" project="junit" id="junit"/>
-      <depend property="hamcrest.jar" project="hamcrest-java" id="hamcrest-core"/>
+      <depend property="hamcrest.jar" project="hamcrest-java"/>
       <depend property="cglib.jar" project="cglib" id="cglib" />
       <depend property="objenesis.jar" project="objenesis" id="objenesis" />
       <depend property="easymock.jar" project="easymock" id="easymock" />
@@ -173,7 +173,7 @@
       <property name="tomcat-native.tar.gz" project="commons-daemon"
               id="native-distro" reference="outputpath" />
       <depend property="junit.jar" project="junit" id="junit"/>
-      <depend property="hamcrest.jar" project="hamcrest-java" id="hamcrest-core"/>
+      <depend property="hamcrest.jar" project="hamcrest-java"/>
       <depend property="cglib.jar" project="cglib" id="cglib" />
       <depend property="objenesis.jar" project="objenesis" id="objenesis" />
       <depend property="easymock.jar" project="easymock" id="easymock" />
@@ -214,7 +214,7 @@
       <property name="tomcat-native.tar.gz" project="commons-daemon"
               id="native-distro" reference="outputpath" />
       <depend property="junit.jar" project="junit" id="junit"/>
-      <depend property="hamcrest.jar" project="hamcrest-java" id="hamcrest-core"/>
+      <depend property="hamcrest.jar" project="hamcrest-java"/>
       <depend property="cglib.jar" project="cglib" id="cglib" />
       <depend property="objenesis.jar" project="objenesis" id="objenesis" />
       <depend property="easymock.jar" project="easymock" id="easymock" />

Modified: gump/metadata/project/tomcat-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1658317&r1=1658316&r2=1658317&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-trunk.xml Mon Feb  9 08:10:55 2015
@@ -91,7 +91,7 @@
       <property name="tomcat-native.tar.gz" project="commons-daemon"
               id="native-distro" reference="outputpath" />
       <depend property="junit.jar" project="junit" id="junit"/>
-      <depend property="hamcrest.jar" project="hamcrest-java" id="hamcrest-core"/>
+      <depend property="hamcrest.jar" project="hamcrest-java"/>
       <depend property="cglib.jar" project="cglib" id="cglib" />
       <depend property="objenesis.jar" project="objenesis" id="objenesis" />
       <depend property="easymock.jar" project="easymock" id="easymock" />
@@ -131,7 +131,7 @@
       <property name="tomcat-native.tar.gz" project="commons-daemon"
               id="native-distro" reference="outputpath" />
       <depend property="junit.jar" project="junit" id="junit"/>
-      <depend property="hamcrest.jar" project="hamcrest-java" id="hamcrest-core"/>
+      <depend property="hamcrest.jar" project="hamcrest-java"/>
       <depend property="cglib.jar" project="cglib" id="cglib" />
       <depend property="objenesis.jar" project="objenesis" id="objenesis" />
       <depend property="easymock.jar" project="easymock" id="easymock" />
@@ -171,7 +171,7 @@
       <property name="tomcat-native.tar.gz" project="commons-daemon"
               id="native-distro" reference="outputpath" />
       <depend property="junit.jar" project="junit" id="junit"/>
-      <depend property="hamcrest.jar" project="hamcrest-java" id="hamcrest-core"/>
+      <depend property="hamcrest.jar" project="hamcrest-java"/>
       <depend property="cglib.jar" project="cglib" id="cglib" />
       <depend property="objenesis.jar" project="objenesis" id="objenesis" />
       <depend property="easymock.jar" project="easymock" id="easymock" />

Modified: gump/metadata/project/xmlunit.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/xmlunit.xml?rev=1658317&r1=1658316&r2=1658317&view=diff
==============================================================================
--- gump/metadata/project/xmlunit.xml (original)
+++ gump/metadata/project/xmlunit.xml Mon Feb  9 08:10:55 2015
@@ -29,7 +29,7 @@
     <package>org.custommonkey.xmlunit</package>
     <mvn3 goal="package" />
     <option project="junit"/>
-    <option project="hamcrest-java" ids="hamcrest-core"/>
+    <option project="hamcrest-java"/>
     <jar name="xmlunit-core/target/xmlunit-core-*[0-9T].jar" id="xmlunit-core"/>
     <jar name="xmlunit-matchers/target/xmlunit-matchers-*[0-9T].jar" id="xmlunit-matchers"/>
     <jar name="xmlunit-legacy/target/xmlunit-legacy-*[0-9T].jar" id="xmlunit-legacy"/>



Mime
View raw message