Return-Path: 
 <commits-return-6403-apmail-gump-commits-archive=www.apache.org@gump.apache.org>
X-Original-To: apmail-gump-commits-archive@www.apache.org
Delivered-To: apmail-gump-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 698411059D
	for <apmail-gump-commits-archive@www.apache.org>;
 Mon,  9 Feb 2015 19:03:07 +0000 (UTC)
Received: (qmail 40052 invoked by uid 500); 9 Feb 2015 19:02:57 -0000
Mailing-List: contact commits-help@gump.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@gump.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@gump.apache.org>
List-Post: <mailto:commits@gump.apache.org>
List-Id: <commits.gump.apache.org>
Reply-To: general@gump.apache.org
Delivered-To: mailing list commits@gump.apache.org
Received: (qmail 40031 invoked by uid 99); 9 Feb 2015 19:02:57 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Feb 2015 19:02:57 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 A48FEAC006A
	for <commits@gump.apache.org>; Mon,  9 Feb 2015 19:02:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1658543 - in /gump/metadata: profile/ project/
 repository/
Date: Mon, 09 Feb 2015 19:02:57 -0000
To: commits@gump.apache.org
From: bodewig@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150209190257.A48FEAC006A@hades.apache.org>

Author: bodewig
Date: Mon Feb  9 19:02:57 2015
New Revision: 1658543

URL: http://svn.apache.org/r1658543
Log:
add a packaged hamcrest for Ant builds

Added:
    gump/metadata/project/java-hamcrest.xml
      - copied, changed from r1658415, gump/metadata/project/hamcrest.xml
Removed:
    gump/metadata/repository/hamcrest.xml
Modified:
    gump/metadata/profile/gump.xml
    gump/metadata/project/commons-proper.xml
    gump/metadata/project/easymock.xml
    gump/metadata/project/google-guava.xml
    gump/metadata/project/hamcrest.xml
    gump/metadata/project/junit.xml
    gump/metadata/project/objenesis.xml
    gump/metadata/project/pdfbox.xml
    gump/metadata/project/tika.xml
    gump/metadata/project/xmlunit.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1658543&r1=1658542&r2=1658543&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Mon Feb  9 19:02:57 2015
@@ -115,6 +115,7 @@
   <module href="project/packaged-google-guava.xml" />
   <module href="project/hamcrest.xml" />
   <module href="project/jacoco.xml"/>
+  <module href="project/java-hamcrest.xml" />
   <module href="project/javacc.xml"/>
   <module href="project/jdepend.xml"/>
   <module href="project/jsch.xml"/>
@@ -149,6 +150,7 @@
   <project name="packaged-excalibur" package="apache-attic"/>
   <project name="excalibur-legacy" package="apache-attic"/>
   <project name="packaged-google-guava" package="guava"/>
+  <project name="hamcrest"         package="hamcrest"/>
   <project name="jacocoant"        package="jacoco"/>
   <project name="jaf"              package="jaf-1.1ea"/>
   <project name="jakarta-regexp"   package="apache-attic"/>
@@ -174,7 +176,6 @@
   <repository href="repository/eclipse.xml"/>
   <repository href="repository/github.xml" />
   <repository href="repository/google-guava.xml" />
-  <repository href="repository/hamcrest.xml"/>
   <repository href="repository/javanet.svn.xml"/>
   <repository href="repository/javanet.xml"/>
   <repository href="repository/jboss-svn.xml"/>

Modified: gump/metadata/project/commons-proper.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-proper.xml?rev=1658543&r1=1658542&r2=1658543&view=diff
==============================================================================
--- gump/metadata/project/commons-proper.xml (original)
+++ gump/metadata/project/commons-proper.xml Mon Feb  9 19:02:57 2015
@@ -185,7 +185,6 @@
     <option project="commons-collections"/>
     <option project="commons-lang"/>
     <option project="junit"/>
-    <option project="hamcrest-java"/>
     <jar name="exec/target/commons-exec-*[0-9T].jar"/>
   </project>
 
@@ -211,7 +210,6 @@
 
     <option project="commons-lang" />
     <option project="junit" />
-    <option project="hamcrest-java"/>
     <jar name="io/target/commons-io-*[0-9T].jar"/>
   </project>
   
@@ -316,7 +314,6 @@
       <property name="skipTests" value="true"/>
     </mvn3>
     <option project="junit"/>
-    <option project="hamcrest-java"/>
 
     <jar name="net/target/commons-net-[0-9T]*[0-9T].jar" id="commons-net"/>
     <jar name="net/target/commons-net-ftp-*[0-9T].jar"

Modified: gump/metadata/project/easymock.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/easymock.xml?rev=1658543&r1=1658542&r2=1658543&view=diff
==============================================================================
--- gump/metadata/project/easymock.xml (original)
+++ gump/metadata/project/easymock.xml Mon Feb  9 19:02:57 2015
@@ -28,7 +28,6 @@ EasyMock is a Java library that provides
     <pom name="pom.xml" id="easymock-parent"/>
     <mvn3install/>
     <option project="junit"/>
-    <option project="hamcrest-java"/>
   </project>
 
   <project name="easymock">

Modified: gump/metadata/project/google-guava.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/google-guava.xml?rev=1658543&r1=1658542&r2=1658543&view=diff
==============================================================================
--- gump/metadata/project/google-guava.xml (original)
+++ gump/metadata/project/google-guava.xml Mon Feb  9 19:02:57 2015
@@ -44,7 +44,6 @@
     <mvn3install artifactId="guava-parent" />
     <pom name="pom.xml" id="guava-parent" />
     <option project="junit" />
-    <option project="hamcrest-java"/>
   </project>
 
 <!--  

Modified: gump/metadata/project/hamcrest.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/hamcrest.xml?rev=1658543&r1=1658542&r2=1658543&view=diff
==============================================================================
--- gump/metadata/project/hamcrest.xml (original)
+++ gump/metadata/project/hamcrest.xml Mon Feb  9 19:02:57 2015
@@ -25,22 +25,9 @@
   </description>
   <redistributable/>
 
-  <git repository="github" dir="/hamcrest/JavaHamcrest"/>
-  
-  <project name="java-hamcrest">
-    <package>org.hamcrest</package>
-    <gradle debug="true" separateLocalRepository="true"/>
-
-    <option project="bootstrap-ant"/>
-
-    <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="build/libs/java-hamcrest-*[0-9T].jar" id="hamcrest-core"/>
+    <jar name="hamcrest-core-1.3.jar" id="hamcrest-core"/>
   </project>
 </module>

Copied: gump/metadata/project/java-hamcrest.xml (from r1658415, gump/metadata/project/hamcrest.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/java-hamcrest.xml?p2=gump/metadata/project/java-hamcrest.xml&p1=gump/metadata/project/hamcrest.xml&r1=1658415&r2=1658543&rev=1658543&view=diff
==============================================================================
--- gump/metadata/project/hamcrest.xml (original)
+++ gump/metadata/project/java-hamcrest.xml Mon Feb  9 19:02:57 2015
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module name="hamcrest" groupId="org.hamcrest">
+<module name="java-hamcrest" groupId="org.hamcrest">
 
   <url href="http://hamcrest.org/JavaHamcrest/"/>
   <description>
@@ -36,11 +36,4 @@
     <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="build/libs/java-hamcrest-*[0-9T].jar" id="hamcrest-core"/>
-  </project>
 </module>

Modified: gump/metadata/project/junit.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/junit.xml?rev=1658543&r1=1658542&r2=1658543&view=diff
==============================================================================
--- gump/metadata/project/junit.xml (original)
+++ gump/metadata/project/junit.xml Mon Feb  9 19:02:57 2015
@@ -31,7 +31,6 @@
       <property name="skipTests" value="true"/>
     </mvn3>
 
-    <!-- option project="hamcrest-java"/ -->
     <jar name="target/junit-*[0-9T].jar"/>
     <pom name="pom.xml"/>
     <nag from="Gump Integration &lt;general@gump.apache.org&gt;"
@@ -41,7 +40,6 @@
   <project name="test-junit">
     <mvn3 goal="test" separateLocalRepository="junit"/>
     <depend project="junit"/>
-    <option project="hamcrest-java"/>
     <nag from="Gump Integration &lt;general@gump.apache.org&gt;"
          to="David Saff &lt;david@saff.net&gt;" />
   </project>

Modified: gump/metadata/project/objenesis.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/objenesis.xml?rev=1658543&r1=1658542&r2=1658543&view=diff
==============================================================================
--- gump/metadata/project/objenesis.xml (original)
+++ gump/metadata/project/objenesis.xml Mon Feb  9 19:02:57 2015
@@ -30,7 +30,6 @@
     <pom name="pom.xml" id="objenesis-parent"/>
     <mvn3install/>
     <option project="junit"/>
-    <option project="hamcrest-java"/>
     <license name="LICENSE.txt"/>
   </project>
 

Modified: gump/metadata/project/pdfbox.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/pdfbox.xml?rev=1658543&r1=1658542&r2=1658543&view=diff
==============================================================================
--- gump/metadata/project/pdfbox.xml (original)
+++ gump/metadata/project/pdfbox.xml Mon Feb  9 19:02:57 2015
@@ -29,7 +29,6 @@
     <mvn3install basedir="parent"/>
     <option project="commons-collections"/>
     <option project="junit"/>
-    <option project="hamcrest-java"/>
   </project>
 
   <project name="fontbox">

Modified: gump/metadata/project/tika.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tika.xml?rev=1658543&r1=1658542&r2=1658543&view=diff
==============================================================================
--- gump/metadata/project/tika.xml (original)
+++ gump/metadata/project/tika.xml Mon Feb  9 19:02:57 2015
@@ -30,8 +30,6 @@
     <mvn3install basedir="tika-parent"/>
     <option project="commons-collections"/>
     <option project="junit"/>
-    <option project="hamcrest-java"/>
-    <!--option project="velocity-engine"/-->
   </project>
 
   <project name="tika-core">

Modified: gump/metadata/project/xmlunit.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/xmlunit.xml?rev=1658543&r1=1658542&r2=1658543&view=diff
==============================================================================
--- gump/metadata/project/xmlunit.xml (original)
+++ gump/metadata/project/xmlunit.xml Mon Feb  9 19:02:57 2015
@@ -29,7 +29,6 @@
     <package>org.custommonkey.xmlunit</package>
     <mvn3 goal="package" />
     <option project="junit"/>
-    <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"/>