Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-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 7CD593E58 for ; Wed, 4 May 2011 20:35:07 +0000 (UTC) Received: (qmail 85490 invoked by uid 500); 4 May 2011 20:35:07 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 85433 invoked by uid 500); 4 May 2011 20:35:07 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 85426 invoked by uid 99); 4 May 2011 20:35:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 May 2011 20:35:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 May 2011 20:35:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7D216238890A; Wed, 4 May 2011 20:34:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1099596 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ pom.xml Date: Wed, 04 May 2011 20:34:43 -0000 To: commits@maven.apache.org From: dennisl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110504203443.7D216238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dennisl Date: Wed May 4 20:34:43 2011 New Revision: 1099596 URL: http://svn.apache.org/viewvc?rev=1099596&view=rev Log: [MSITE-575] Update to maven-doxia-tools 1.4 - merge r1099591 from trunk Modified: maven/plugins/branches/maven-site-plugin-3.x/ (props changed) maven/plugins/branches/maven-site-plugin-3.x/pom.xml Propchange: maven/plugins/branches/maven-site-plugin-3.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 4 20:34:43 2011 @@ -1 +1 @@ -/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170 +/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591 Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=1099596&r1=1099595&r2=1099596&view=diff ============================================================================== --- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original) +++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Wed May 4 20:34:43 2011 @@ -328,7 +328,7 @@ under the License. org.apache.maven.shared maven-doxia-tools - 1.4-SNAPSHOT + 1.4 org.apache.maven