From commitsmarcuslynn@example.org Sun May 1 08:20:47 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id 42B342174 for <marcuslynn@example.org>; Sun, 1 May 2011 08:20:47 +0000 (UTC) Received: (qmail 61181 invoked by uid 500); 1 May 2011 08:20:47 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 61082 invoked by uid 500); 1 May 2011 08:20:46 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 61075 invoked by uid 99); 1 May 2011 08:20:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 08:20:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 08:20:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 02CEE23888C2; Sun, 1 May 2011 08:20:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098228 - /maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh Date: Sun, 01 May 2011 08:20:24 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> Author: hboutemy Date: Sun May 1 08:20:24 2011 New Revision: 1098228 URL: http://svn.apache.org/viewvc?rev=1098228&view=rev Log: improved test output in case of failure to understand what's happening on Apache's Jenkins Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh?rev=1098228&r1=1098227&r2=1098228&view=diff ============================================================================== --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh Sun May 1 08:20:24 2011 @@ -45,19 +45,20 @@ try System.err.println( "index.jsp file is missing or a directory." ); return false; } - FileInputStream fis = new FileInputStream ( param ); - String paramContent = IOUtil.toString ( fis ); + String paramContent = FileUtils.fileRead( param ); - String javaVersion = System.getProperty("java.version"); + String javaVersion = System.getProperty( "java.version" ); int indexOf = paramContent.indexOf( "<td>java version : " + javaVersion + "</td>" ); - if ( indexOf < 0) + if ( indexOf < 0 ) { - System.err.println( "index.jsp not contains <td>java version : " + javaVersion + "</td>" ); + paramContent = paramContent.substring( paramContent.indexOf( "<td>java version : " ) ); + System.err.println( "index.jsp not contains <td>java version : " + javaVersion + "</td> but " + + paramContent.substring( 0, paramContent.indexOf( "</td>" ) + 5 ) ); return false; } - indexOf = paramContent.indexOf("<td>okitworks</td>"); - if ( indexOf < 0) + indexOf = paramContent.indexOf("<td>okitworks</td>" ); + if ( indexOf < 0 ) { System.err.println( "index.jsp not contains <td>okitworks</td>" ); return false; From commitsmarcuslynn@example.org Sun May 1 09:40:14 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id C85B72378 for <marcuslynn@example.org>; Sun, 1 May 2011 09:40:14 +0000 (UTC) Received: (qmail 89945 invoked by uid 500); 1 May 2011 09:40:14 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 89900 invoked by uid 500); 1 May 2011 09:40:14 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 89893 invoked by uid 99); 1 May 2011 09:40:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 09:40:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 09:40:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 619AC23889C5; Sun, 1 May 2011 09:39:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098231 - /maven/shared/trunk/maven-shared-resources/ Date: Sun, 01 May 2011 09:39:53 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> Author: dennisl Date: Sun May 1 09:39:53 2011 New Revision: 1098231 URL: http://svn.apache.org/viewvc?rev=1098231&view=rev Log: Created directory 'maven/shared/trunk/maven-shared-resources'. Added: maven/shared/trunk/maven-shared-resources/ From commitsmarcuslynn@example.org Sun May 1 09:41:17 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id EDBE12415 for <marcuslynn@example.org>; Sun, 1 May 2011 09:41:16 +0000 (UTC) Received: (qmail 92269 invoked by uid 500); 1 May 2011 09:41:16 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 92191 invoked by uid 500); 1 May 2011 09:41:16 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 92184 invoked by uid 99); 1 May 2011 09:41:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 09:41:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 09:41:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9BB7A23889F7; Sun, 1 May 2011 09:40:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098232 - /maven/shared/trunk/maven-shared-resources/src/ Date: Sun, 01 May 2011 09:40:53 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dennisl Date: Sun May 1 09:40:53 2011 New Revision: 1098232 URL: http://svn.apache.org/viewvc?rev=1098232&view=rev Log: Created directory 'maven/shared/trunk/maven-shared-resources/src'. Added: maven/shared/trunk/maven-shared-resources/src/ From commitsmarcuslynn@example.org Sun May 1 09:41:48 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id 385B02437 for <marcuslynn@example.org>; Sun, 1 May 2011 09:41:48 +0000 (UTC) Received: (qmail 92715 invoked by uid 500); 1 May 2011 09:41:48 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 92576 invoked by uid 500); 1 May 2011 09:41:48 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 92569 invoked by uid 99); 1 May 2011 09:41:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 09:41:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 09:41:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1840023889C5; Sun, 1 May 2011 09:41:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098234 - /maven/shared/trunk/maven-shared-resources/src/main/ Date: Sun, 01 May 2011 09:41:25 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dennisl Date: Sun May 1 09:41:24 2011 New Revision: 1098234 URL: http://svn.apache.org/viewvc?rev=1098234&view=rev Log: Created directory 'maven/shared/trunk/maven-shared-resources/src/main'. Added: maven/shared/trunk/maven-shared-resources/src/main/ From commitsmarcuslynn@example.org Sun May 1 09:44:13 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id 98ED2249B for <marcuslynn@example.org>; Sun, 1 May 2011 09:44:13 +0000 (UTC) Received: (qmail 93642 invoked by uid 500); 1 May 2011 09:44:13 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 93585 invoked by uid 500); 1 May 2011 09:44:13 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 93578 invoked by uid 99); 1 May 2011 09:44:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 09:44:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 09:44:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8404423889C5; Sun, 1 May 2011 09:43:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098237 - in /maven: plugins/trunk/maven-gpg-plugin/src/main/resources/ shared/trunk/maven-shared-resources/src/main/resources/ Date: Sun, 01 May 2011 09:43:49 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> Author: dennisl Date: Sun May 1 09:43:49 2011 New Revision: 1098237 URL: http://svn.apache.org/viewvc?rev=1098237&view=rev Log: Move resources used in sending the release announcement to a shared component. Added: maven/shared/trunk/maven-shared-resources/src/main/resources/ - copied from r1098236, maven/plugins/trunk/maven-gpg-plugin/src/main/resources/ Removed: maven/plugins/trunk/maven-gpg-plugin/src/main/resources/ From commitsmarcuslynn@example.org Sun May 1 09:54:53 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id CA54B2A21 for <marcuslynn@example.org>; Sun, 1 May 2011 09:54:53 +0000 (UTC) Received: (qmail 96258 invoked by uid 500); 1 May 2011 09:54:53 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 96205 invoked by uid 500); 1 May 2011 09:54:53 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 96196 invoked by uid 99); 1 May 2011 09:54:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 09:54:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 09:54:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DF38C2388980; Sun, 1 May 2011 09:54:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098239 - /maven/shared/trunk/maven-shared-resources/pom.xml Date: Sun, 01 May 2011 09:54:29 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dennisl Date: Sun May 1 09:54:29 2011 New Revision: 1098239 URL: http://svn.apache.org/viewvc?rev=1098239&view=rev Log: Add a POM for the project. Added: maven/shared/trunk/maven-shared-resources/pom.xml (with props) Added: maven/shared/trunk/maven-shared-resources/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-resources/pom.xml?rev=1098239&view=auto ============================================================================== --- maven/shared/trunk/maven-shared-resources/pom.xml (added) +++ maven/shared/trunk/maven-shared-resources/pom.xml Sun May 1 09:54:29 2011 @@ -0,0 +1,54 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-shared-components</artifactId> + <version>16</version> + <relativePath>../maven-shared-components/pom.xml</relativePath> + </parent> + + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-shared-resources</artifactId> + <version>1-SNAPSHOT</version> + + <name>Maven Shared Resources</name> + <description>A collection of templates that are specific to the Maven project.</description> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-resources/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-resources/</developerConnection> + <url>http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-resources/</url> + </scm> + + <issueManagement> + <system>jira</system> + <url>http://jira.codehaus.org/browse/MSHARED/component/14715</url> + </issueManagement> + + <ciManagement> + <system>Jenkins</system> + <url>https://builds.apache.org/hudson/job/maven-shared/</url> + </ciManagement> +</project> Propchange: maven/shared/trunk/maven-shared-resources/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/shared/trunk/maven-shared-resources/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id From commitsmarcuslynn@example.org Sun May 1 09:56:12 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id B7B642A79 for <marcuslynn@example.org>; Sun, 1 May 2011 09:56:12 +0000 (UTC) Received: (qmail 96787 invoked by uid 500); 1 May 2011 09:56:12 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 96713 invoked by uid 500); 1 May 2011 09:56:12 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 96705 invoked by uid 99); 1 May 2011 09:56:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 09:56:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 09:56:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0CC552388994; Sun, 1 May 2011 09:55:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098241 - /maven/shared/trunk/pom.xml Date: Sun, 01 May 2011 09:55:49 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dennisl Date: Sun May 1 09:55:48 2011 New Revision: 1098241 URL: http://svn.apache.org/viewvc?rev=1098241&view=rev Log: Add maven-shared-resources to the aggregator POM. Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=1098241&r1=1098240&r2=1098241&view=diff ============================================================================== --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Sun May 1 09:55:48 2011 @@ -61,6 +61,7 @@ under the License. <module>maven-shared-io</module> <module>maven-shared-jar</module> <module>maven-shared-monitor</module> + <module>maven-shared-resources</module> <module>maven-verifier</module> </modules> From commitsmarcuslynn@example.org Sun May 1 10:32:09 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id 2F60121A2 for <marcuslynn@example.org>; Sun, 1 May 2011 10:32:09 +0000 (UTC) Received: (qmail 23112 invoked by uid 500); 1 May 2011 10:32:08 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 23041 invoked by uid 500); 1 May 2011 10:32:08 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 23031 invoked by uid 99); 1 May 2011 10:32:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 10:32:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 10:32:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1AB9A23888CF; Sun, 1 May 2011 10:31:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098247 - /maven/plugins/trunk/maven-gpg-plugin/pom.xml Date: Sun, 01 May 2011 10:31:45 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dennisl Date: Sun May 1 10:31:44 2011 New Revision: 1098247 URL: http://svn.apache.org/viewvc?rev=1098247&view=rev Log: Add a dependency on maven-shared-resources, which contains the resources used to create the announcement, to maven-changes-plugin. Modified: maven/plugins/trunk/maven-gpg-plugin/pom.xml Modified: maven/plugins/trunk/maven-gpg-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/pom.xml?rev=1098247&r1=1098246&r2=1098247&view=diff ============================================================================== --- maven/plugins/trunk/maven-gpg-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-gpg-plugin/pom.xml Sun May 1 10:31:44 2011 @@ -110,6 +110,13 @@ under the License. <fromDeveloperId>${apache.availid}</fromDeveloperId> <smtpHost>${smtp.host}</smtpHost> </configuration> + <dependencies> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-shared-resources</artifactId> + <version>1-SNAPSHOT</version> + </dependency> + </dependencies> </plugin> </plugins> </pluginManagement> From commitsmarcuslynn@example.org Sun May 1 11:08:55 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id 8D98021FB for <marcuslynn@example.org>; Sun, 1 May 2011 11:08:55 +0000 (UTC) Received: (qmail 40561 invoked by uid 500); 1 May 2011 11:08:55 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 40516 invoked by uid 500); 1 May 2011 11:08:55 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 40509 invoked by uid 99); 1 May 2011 11:08:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 11:08:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 11:08:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8A1EE23889F7; Sun, 1 May 2011 11:08:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098256 - in /maven/shared/trunk/maven-shared-resources/src/site: ./ apt/ apt/index.apt.vm apt/usage.apt.vm site.xml Date: Sun, 01 May 2011 11:08:33 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> Author: dennisl Date: Sun May 1 11:08:33 2011 New Revision: 1098256 URL: http://svn.apache.org/viewvc?rev=1098256&view=rev Log: Add a site. Added: maven/shared/trunk/maven-shared-resources/src/site/ maven/shared/trunk/maven-shared-resources/src/site/apt/ maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm (with props) maven/shared/trunk/maven-shared-resources/src/site/apt/usage.apt.vm (with props) maven/shared/trunk/maven-shared-resources/src/site/site.xml (with props) Added: maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm?rev=1098256&view=auto ============================================================================== --- maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm (added) +++ maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm Sun May 1 11:08:33 2011 @@ -0,0 +1,49 @@ + ------ + Introduction + ------ + Dennis Lundberg + ------ + 2011-05-01 + ------ + +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you under the Apache License, Version 2.0 (the +~~ "License"); you may not use this file except in compliance +~~ with the License. You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, +~~ software distributed under the License is distributed on an +~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +~~ KIND, either express or implied. See the License for the +~~ specific language governing permissions and limitations +~~ under the License. + +Maven Shared Resources + + This is a collection of templates that are specific to the Maven project. They + are probably not of interest to projects other than Apache Maven. + + Below you will find a listing of the resources that can be found in the + current version (${project.version}) of Maven Shared Resources. They are + listed by which plugin they are meant to be used with. + + +* Maven Changes Plugin + +** org/apache/maven/plugins/announcement.vm + + This is a template that can be used by Maven Changes Plugin to create and send + an announcement e-mail for one of our plugins. It will create an announcement + e-mail that conforms to the "Promote the release" section of our + {{{http://maven.apache.org/developers/release/maven-project-release-procedure.html#Promote_the_release}release procedure}}. + + +* Usage + + General instructions on how to use the Maven Shared Resources can be found on + the {{{./usage.html}usage page}}. Propchange: maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm ------------------------------------------------------------------------------ svn:eol-style = native Added: maven/shared/trunk/maven-shared-resources/src/site/apt/usage.apt.vm URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-resources/src/site/apt/usage.apt.vm?rev=1098256&view=auto ============================================================================== --- maven/shared/trunk/maven-shared-resources/src/site/apt/usage.apt.vm (added) +++ maven/shared/trunk/maven-shared-resources/src/site/apt/usage.apt.vm Sun May 1 11:08:33 2011 @@ -0,0 +1,109 @@ + ------ + Usage + ------ + Dennis Lundberg + ------ + 2011-05-01 + ------ + +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you under the Apache License, Version 2.0 (the +~~ "License"); you may not use this file except in compliance +~~ with the License. You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, +~~ software distributed under the License is distributed on an +~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +~~ KIND, either express or implied. See the License for the +~~ specific language governing permissions and limitations +~~ under the License. + +Usage + + There are a couple things you need to do to use Maven Shared Resources. First + you need to give the plugin that will use the resources access to them. After + that you configure the plugin to actually use the resources. + + +* Add the resources to the plugin + + First you add maven-shared-resources as a dependency to a plugin in your + <<<pom.xml>>>. This is done to give the plugin access to the resources within + the maven-shared-resources JAR file. In this example we will use the resources + in Maven Changes Plugin. + ++----------+ +<project> + ... + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-changes-plugin</artifactId> + <version>2.4</version> + <configuration> + ... + </configuration> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <executions> + ... + </executions> + </plugin> + </plugins> + </build> + ... +</project> ++----------+ + + +* Configure the plugin to use the resources + + Now you can use the resources in the plugin. You can use them as if they + existed in your own project, like this: + ++----------+ +<project> + ... + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-changes-plugin</artifactId> + <version>2.4</version> + <configuration> + <templateDirectory>org/apache/maven/plugins</templateDirectory> + </configuration> + <dependencies> + ... + </dependencies> + <executions> + ... + </executions> + </plugin> + </plugins> + </build> + ... +</project> ++----------+ + + +* Execute the plugin + + All is now set up to make use of the resources in the plugin for your project. + Execute the plugin like you would normally do, to see the resources put to + practical use. + ++----------+ +mvn changes:announcement-generate ++----------+ Propchange: maven/shared/trunk/maven-shared-resources/src/site/apt/usage.apt.vm ------------------------------------------------------------------------------ svn:eol-style = native Added: maven/shared/trunk/maven-shared-resources/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-resources/src/site/site.xml?rev=1098256&view=auto ============================================================================== --- maven/shared/trunk/maven-shared-resources/src/site/site.xml (added) +++ maven/shared/trunk/maven-shared-resources/src/site/site.xml Sun May 1 11:08:33 2011 @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd"> + <body> + <menu name="Overview"> + <item name="Introduction" href="index.html"/> + <item name="Usage" href="usage.html"/> + </menu> + </body> +</project> Propchange: maven/shared/trunk/maven-shared-resources/src/site/site.xml ------------------------------------------------------------------------------ svn:eol-style = native From commitsmarcuslynn@example.org Sun May 1 11:10:08 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id 91849222D for <marcuslynn@example.org>; Sun, 1 May 2011 11:10:08 +0000 (UTC) Received: (qmail 40865 invoked by uid 500); 1 May 2011 11:10:08 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 40809 invoked by uid 500); 1 May 2011 11:10:08 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 40802 invoked by uid 99); 1 May 2011 11:10:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 11:10:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 11:10:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 07D3A23889F7; Sun, 1 May 2011 11:09:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098257 - /maven/shared/trunk/maven-shared-resources/ Date: Sun, 01 May 2011 11:09:45 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dennisl Date: Sun May 1 11:09:44 2011 New Revision: 1098257 URL: http://svn.apache.org/viewvc?rev=1098257&view=rev Log: Ignore target folder and IDEA project files. Modified: maven/shared/trunk/maven-shared-resources/ (props changed) Propchange: maven/shared/trunk/maven-shared-resources/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun May 1 11:09:44 2011 @@ -0,0 +1,4 @@ +target +*.iml +*.ipr +*.iws From commitsmarcuslynn@example.org Sun May 1 11:10:38 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id E67AE22EB for <marcuslynn@example.org>; Sun, 1 May 2011 11:10:38 +0000 (UTC) Received: (qmail 41827 invoked by uid 500); 1 May 2011 11:10:38 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 41742 invoked by uid 500); 1 May 2011 11:10:38 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 41735 invoked by uid 99); 1 May 2011 11:10:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 11:10:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 11:10:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D7A762388A39; Sun, 1 May 2011 11:10:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098258 - in /maven/shared/trunk/maven-shared-resources/src/site: apt/index.apt.vm apt/usage.apt.vm site.xml Date: Sun, 01 May 2011 11:10:17 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> Author: dennisl Date: Sun May 1 11:10:17 2011 New Revision: 1098258 URL: http://svn.apache.org/viewvc?rev=1098258&view=rev Log: Add svn keywords. Modified: maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm (props changed) maven/shared/trunk/maven-shared-resources/src/site/apt/usage.apt.vm (props changed) maven/shared/trunk/maven-shared-resources/src/site/site.xml (props changed) Propchange: maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id Propchange: maven/shared/trunk/maven-shared-resources/src/site/apt/usage.apt.vm ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id Propchange: maven/shared/trunk/maven-shared-resources/src/site/site.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id From commitsmarcuslynn@example.org Sun May 1 11:21:25 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id 552DA284D for <marcuslynn@example.org>; Sun, 1 May 2011 11:21:25 +0000 (UTC) Received: (qmail 45192 invoked by uid 500); 1 May 2011 11:21:25 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 45133 invoked by uid 500); 1 May 2011 11:21:25 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 45126 invoked by uid 99); 1 May 2011 11:21:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 11:21:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 11:21:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BEE4E23889F7; Sun, 1 May 2011 11:21:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098260 - /maven/plugins/trunk/maven-gpg-plugin/pom.xml Date: Sun, 01 May 2011 11:21:01 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dennisl Date: Sun May 1 11:21:01 2011 New Revision: 1098260 URL: http://svn.apache.org/viewvc?rev=1098260&view=rev Log: Document the Changes Plugin configuration. Modified: maven/plugins/trunk/maven-gpg-plugin/pom.xml Modified: maven/plugins/trunk/maven-gpg-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/pom.xml?rev=1098260&r1=1098259&r2=1098260&view=diff ============================================================================== --- maven/plugins/trunk/maven-gpg-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-gpg-plugin/pom.xml Sun May 1 11:21:01 2011 @@ -99,8 +99,10 @@ under the License. <generateJiraAnnouncement>true</generateJiraAnnouncement> <maxEntries>1000</maxEntries> <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - <subject>[ANN] ${project.name} ${project.version} Released</subject> + <!-- Used by announcement-generate goal --> <templateDirectory>org/apache/maven/plugins</templateDirectory> + <!-- Used by announcement-mail goal --> + <subject>[ANN] ${project.name} ${project.version} Released</subject> <toAddresses> <toAddress implementation="java.lang.String">marcuslynn@example.org</toAddress> <toAddress implementation="java.lang.String">marcuslynn@example.org</toAddress> @@ -111,6 +113,7 @@ under the License. <smtpHost>${smtp.host}</smtpHost> </configuration> <dependencies> + <!-- Used by announcement-generate goal --> <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-resources</artifactId> From commitsmarcuslynn@example.org Sun May 1 12:07:50 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id 78FDE2A08 for <marcuslynn@example.org>; Sun, 1 May 2011 12:07:50 +0000 (UTC) Received: (qmail 64518 invoked by uid 500); 1 May 2011 12:07:50 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 64456 invoked by uid 500); 1 May 2011 12:07:50 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 64449 invoked by uid 99); 1 May 2011 12:07:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 12:07:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 12:07:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C8CB42388901; Sun, 1 May 2011 12:07:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098279 - in /maven/shared/trunk/maven-shared-resources/src: main/resources/org/apache/maven/shared/ main/resources/org/apache/maven/shared/announcement.vm site/apt/index.apt.vm Date: Sun, 01 May 2011 12:07:26 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dennisl Date: Sun May 1 12:07:26 2011 New Revision: 1098279 URL: http://svn.apache.org/viewvc?rev=1098279&view=rev Log: Add an announcement template for shared components to be used by Maven Changes Plugin. Added: maven/shared/trunk/maven-shared-resources/src/main/resources/org/apache/maven/shared/ maven/shared/trunk/maven-shared-resources/src/main/resources/org/apache/maven/shared/announcement.vm - copied, changed from r1098256, maven/shared/trunk/maven-shared-resources/src/main/resources/org/apache/maven/plugins/announcement.vm Modified: maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm Copied: maven/shared/trunk/maven-shared-resources/src/main/resources/org/apache/maven/shared/announcement.vm (from r1098256, maven/shared/trunk/maven-shared-resources/src/main/resources/org/apache/maven/plugins/announcement.vm) URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-resources/src/main/resources/org/apache/maven/shared/announcement.vm?p2=maven/shared/trunk/maven-shared-resources/src/main/resources/org/apache/maven/shared/announcement.vm&p1=maven/shared/trunk/maven-shared-resources/src/main/resources/org/apache/maven/plugins/announcement.vm&r1=1098256&r2=1098279&rev=1098279&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-resources/src/main/resources/org/apache/maven/plugins/announcement.vm (original) +++ maven/shared/trunk/maven-shared-resources/src/main/resources/org/apache/maven/shared/announcement.vm Sun May 1 12:07:26 2011 @@ -20,13 +20,13 @@ ${introduction} ${url} -You should specify the version in your project's plugin configuration: +You should specify the version in your project's dependency configuration: -<plugin> - <groupId>org.apache.maven.plugins</groupId> +<dependency> + <groupId>org.apache.maven.shared</groupId> <artifactId>${artifactId}</artifactId> <version>${version}</version> -</plugin> +</dependency> Release Notes - ${project.name} - Version ${version} Modified: maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm?rev=1098279&r1=1098278&r2=1098279&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm (original) +++ maven/shared/trunk/maven-shared-resources/src/site/apt/index.apt.vm Sun May 1 12:07:26 2011 @@ -42,6 +42,13 @@ Maven Shared Resources e-mail that conforms to the "Promote the release" section of our {{{http://maven.apache.org/developers/release/maven-project-release-procedure.html#Promote_the_release}release procedure}}. +** org/apache/maven/shared/announcement.vm + + This is a template that can be used by Maven Changes Plugin to create and send + an announcement e-mail for one of our shared components. It will create an + announcement e-mail that conforms to the "Promote the release" section of our + {{{http://maven.apache.org/developers/release/maven-project-release-procedure.html#Promote_the_release}release procedure}}. + * Usage From commitsmarcuslynn@example.org Sun May 1 12:40:45 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id C5E2B26EA for <marcuslynn@example.org>; Sun, 1 May 2011 12:40:45 +0000 (UTC) Received: (qmail 90299 invoked by uid 500); 1 May 2011 12:40:45 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 90252 invoked by uid 500); 1 May 2011 12:40:45 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 90245 invoked by uid 99); 1 May 2011 12:40:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 12:40:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 12:40:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E52A42388901; Sun, 1 May 2011 12:40:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098295 - in /maven/plugins/trunk/maven-changes-plugin: ./ src/main/java/org/apache/maven/plugin/issues/ src/main/java/org/apache/maven/plugin/jira/ src/test/java/org/apache/maven/plugin/issues/ Date: Sun, 01 May 2011 12:40:23 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> Author: dennisl Date: Sun May 1 12:40:23 2011 New Revision: 1098295 URL: http://svn.apache.org/viewvc?rev=1098295&view=rev Log: [MCHANGES-210] Update to Java 5 - Start using generics in IssueUtils Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=1098295&r1=1098294&r2=1098295&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changes-plugin/pom.xml Sun May 1 12:40:23 2011 @@ -317,6 +317,15 @@ under the License. <build> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + <compilerArgument>-Xlint:all</compilerArgument> + </configuration> + </plugin> + + <plugin> <groupId>org.codehaus.modello</groupId> <artifactId>modello-maven-plugin</artifactId> <version>1.0.1</version> Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java?rev=1098295&r1=1098294&r2=1098295&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java Sun May 1 12:40:23 2011 @@ -44,10 +44,10 @@ public class IssueUtils * @throws org.apache.maven.plugin.MojoExecutionException * If no issues could be found for the supplied prefix */ - public static List filterIssuesWithVersionPrefix( List issues, String prefix ) + public static List<Issue> filterIssuesWithVersionPrefix( List<Issue> issues, String prefix ) throws MojoExecutionException { - List filteredIssues = new ArrayList(); + List<Issue> filteredIssues = new ArrayList<Issue>(); boolean isFound = false; Issue issue = null; @@ -90,10 +90,10 @@ public class IssueUtils * @throws org.apache.maven.plugin.MojoExecutionException * If no issues could be found for the supplied version */ - public static List getIssuesForVersion( List issues, String version ) + public static List<Issue> getIssuesForVersion( List<Issue> issues, String version ) throws MojoExecutionException { - List issuesForVersion = new ArrayList(); + List<Issue> issuesForVersion = new ArrayList<Issue>(); boolean isFound = false; Issue issue = null; String releaseVersion = version; Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java?rev=1098295&r1=1098294&r2=1098295&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java Sun May 1 12:40:23 2011 @@ -31,6 +31,7 @@ import org.apache.commons.httpclient.Use import org.apache.commons.httpclient.params.HttpClientParams; import org.apache.commons.httpclient.auth.AuthScope; import org.apache.commons.httpclient.methods.GetMethod; +import org.apache.maven.plugin.issues.Issue; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Proxy; @@ -719,7 +720,7 @@ public abstract class AbstractJiraDownlo } } - public List getIssueList() + public List<Issue> getIssueList() { if ( output.isFile() ) { @@ -731,7 +732,7 @@ public abstract class AbstractJiraDownlo else { getLog().warn( "JIRA file " + output.getPath() + " doesn't exist." ); - return Collections.EMPTY_LIST; + return Collections.emptyList(); } } Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java?rev=1098295&r1=1098294&r2=1098295&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java Sun May 1 12:40:23 2011 @@ -29,6 +29,7 @@ import java.util.ResourceBundle; import org.apache.commons.lang.StringUtils; import org.apache.maven.plugin.changes.AbstractChangesReport; import org.apache.maven.plugin.changes.ProjectUtils; +import org.apache.maven.plugin.issues.Issue; import org.apache.maven.plugin.issues.IssueUtils; import org.apache.maven.plugin.issues.IssuesReportGenerator; import org.apache.maven.plugin.issues.IssuesReportHelper; @@ -316,7 +317,7 @@ public class JiraMojo configureIssueDownloader( issueDownloader ); issueDownloader.doExecute(); - List issueList = issueDownloader.getIssueList(); + List<Issue> issueList = issueDownloader.getIssueList(); if ( StringUtils.isNotEmpty( versionPrefix ) ) { Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java?rev=1098295&r1=1098294&r2=1098295&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java Sun May 1 12:40:23 2011 @@ -46,7 +46,7 @@ import org.xml.sax.helpers.DefaultHandle public class JiraXML extends DefaultHandler { - private final List issueList; + private final List<Issue> issueList; private final StringBuffer currentElement = new StringBuffer( 1024 ); @@ -83,7 +83,7 @@ public class JiraXML sdf = new SimpleDateFormat( datePattern, Locale.ENGLISH ); } - this.issueList = new ArrayList( 16 ); + this.issueList = new ArrayList<Issue>( 16 ); } /** @@ -237,7 +237,7 @@ public class JiraXML currentElement.append( buf, offset, len ); } - public List getIssueList() + public List<Issue> getIssueList() { return Collections.unmodifiableList( this.issueList ); } Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java?rev=1098295&r1=1098294&r2=1098295&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java Sun May 1 12:40:23 2011 @@ -47,7 +47,7 @@ public class IssueUtilsTestCase issue_2.setId( "2" ); issue_2.addFixVersion( "1.0" ); - List issueList = new ArrayList(); + List<Issue> issueList = new ArrayList<Issue>(); issueList.add( issue_1 ); issueList.add( issue_2 ); From commitsmarcuslynn@example.org Sun May 1 13:50:29 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id 2A11423B2 for <marcuslynn@example.org>; Sun, 1 May 2011 13:50:29 +0000 (UTC) Received: (qmail 15693 invoked by uid 500); 1 May 2011 13:50:27 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 15641 invoked by uid 500); 1 May 2011 13:50:27 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 15634 invoked by uid 99); 1 May 2011 13:50:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 13:50:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 13:50:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0CB7723889BB; Sun, 1 May 2011 13:50:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098302 - in /maven/plugins/trunk/maven-changes-plugin/src: main/java/org/apache/maven/plugin/jira/ test/java/org/apache/maven/plugin/jira/ Date: Sun, 01 May 2011 13:50:05 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> Author: dennisl Date: Sun May 1 13:50:05 2011 New Revision: 1098302 URL: http://svn.apache.org/viewvc?rev=1098302&view=rev Log: [MCHANGES-210] Update to Java 5 - Start using generics in AbstractJiraDownloader and JiraHelper Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java?rev=1098302&r1=1098301&r2=1098302&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java Sun May 1 13:50:05 2011 @@ -102,13 +102,13 @@ public abstract class AbstractJiraDownlo /** The maven settings. */ private Settings settings; /** Mapping containing all allowed JIRA status values. */ - protected final Map statusMap = new HashMap( 8 ); + protected final Map<String,String> statusMap = new HashMap<String,String>( 8 ); /** Mapping containing all allowed JIRA resolution values. */ - protected final Map resolutionMap = new HashMap( 8 ); + protected final Map<String,String> resolutionMap = new HashMap<String,String>( 8 ); /** Mapping containing all allowed JIRA priority values. */ - protected final Map priorityMap = new HashMap( 8 ); + protected final Map<String,String> priorityMap = new HashMap<String,String>( 8 ); /** Mapping containing all allowed JIRA type values. */ - protected final Map typeMap = new HashMap( 8 ); + protected final Map<String,String> typeMap = new HashMap<String,String>( 8 ); /** The pattern used to parse dates from the JIRA xml file. */ private String jiraDatePattern; @@ -148,7 +148,7 @@ public abstract class AbstractJiraDownlo for ( int i = 0; i < stats.length; i++ ) { - String statusParam = (String) statusMap.get( stats[i] ); + String statusParam = statusMap.get( stats[i] ); if ( statusParam != null ) { @@ -164,7 +164,7 @@ public abstract class AbstractJiraDownlo for ( int i = 0; i < prios.length; i++ ) { - String priorityParam = (String) priorityMap.get( prios[i] ); + String priorityParam = priorityMap.get( prios[i] ); if ( priorityParam != null ) { @@ -180,7 +180,7 @@ public abstract class AbstractJiraDownlo for ( int i = 0; i < resos.length; i++ ) { - String resoParam = (String) resolutionMap.get( resos[i] ); + String resoParam = resolutionMap.get( resos[i] ); if ( resoParam != null ) { @@ -210,7 +210,7 @@ public abstract class AbstractJiraDownlo for ( int i = 0; i < types.length; i++ ) { - String typeParam = (String) typeMap.get( types[i].trim() ); + String typeParam = typeMap.get( types[i].trim() ); if ( typeParam != null ) { @@ -345,12 +345,12 @@ public abstract class AbstractJiraDownlo client.setState( state ); - Map urlMap = JiraHelper.getJiraUrlAndProjectId( project.getIssueManagement().getUrl() ); + Map<String,String> urlMap = JiraHelper.getJiraUrlAndProjectId( project.getIssueManagement().getUrl() ); - String jiraUrl = (String) urlMap.get( "url" ); + String jiraUrl = urlMap.get( "url" ); getLog().debug( "JIRA lives at: " + jiraUrl ); - String jiraId = (String) urlMap.get( "id" ); + String jiraId = urlMap.get( "id" ); determineProxy( jiraUrl, client ); Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java?rev=1098302&r1=1098301&r2=1098302&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java Sun May 1 13:50:05 2011 @@ -47,7 +47,7 @@ public class JiraHelper * @param issueManagementUrl The URL to the issue management system * @return A <code>Map</code> containing the URL and project id */ - static Map getJiraUrlAndProjectId( String issueManagementUrl ) + static Map<String,String> getJiraUrlAndProjectId( String issueManagementUrl ) { String url = issueManagementUrl; @@ -87,7 +87,7 @@ public class JiraHelper } } - HashMap urlMap = new HashMap( 4 ); + HashMap<String,String> urlMap = new HashMap<String,String>( 4 ); urlMap.put( "url", jiraUrl ); Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java?rev=1098302&r1=1098301&r2=1098302&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java Sun May 1 13:50:05 2011 @@ -35,7 +35,7 @@ public class JiraHelperTestCase { public void testGetJiraUrlAndProjectId() { - Map map; + Map<String,String> map; map = JiraHelper.getJiraUrlAndProjectId( "http://jira.codehaus.org/browse/DOXIA" ); assertEquals( "http://jira.codehaus.org", map.get( "url" ) ); From commitsmarcuslynn@example.org Sun May 1 14:01:33 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id 192A92D3A for <marcuslynn@example.org>; Sun, 1 May 2011 14:01:33 +0000 (UTC) Received: (qmail 26020 invoked by uid 500); 1 May 2011 14:01:33 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 25974 invoked by uid 500); 1 May 2011 14:01:32 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 25967 invoked by uid 99); 1 May 2011 14:01:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 14:01:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 14:01:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7118A238897F; Sun, 1 May 2011 14:01:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098305 - in /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin: issues/IssuesReportHelper.java jira/JiraMojo.java trac/TracMojo.java Date: Sun, 01 May 2011 14:01:11 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> Author: dennisl Date: Sun May 1 14:01:11 2011 New Revision: 1098305 URL: http://svn.apache.org/viewvc?rev=1098305&view=rev Log: [MCHANGES-210] Update to Java 5 - Start using generics in JiraMojo, IssuseReportHelper and TracMojo Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java?rev=1098305&r1=1098304&r2=1098305&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java Sun May 1 14:01:11 2011 @@ -71,7 +71,7 @@ public class IssuesReportHelper * @param allColumns A mapping from column name to column id * @return A List of column id:s */ - public static List getColumnIds( String columnNames, Map allColumns ) + public static List<Integer> getColumnIds( String columnNames, Map<String,Integer> allColumns ) { return getColumnIds( columnNames, allColumns, null, null ); } @@ -88,10 +88,11 @@ public class IssuesReportHelper * @param log A log * @return A List of column id:s */ - public static List getColumnIds( String columnNames, Map allColumns, Map deprecatedColumns, Log log ) + public static List<Integer> getColumnIds( String columnNames, Map<String,Integer> allColumns, + Map<String,Integer> deprecatedColumns, Log log ) { DualHashBidiMap bidiColumns = null; - List columnIds = new ArrayList(); + List<Integer> columnIds = new ArrayList<Integer>(); String[] columnNamesArray = columnNames.split( "," ); if ( deprecatedColumns != null ) @@ -105,11 +106,11 @@ public class IssuesReportHelper String columnName = columnNamesArray[i].trim(); if ( allColumns.containsKey( columnName ) ) { - columnIds.add( (Integer) allColumns.get( columnName ) ); + columnIds.add( allColumns.get( columnName ) ); } else if ( deprecatedColumns != null && deprecatedColumns.containsKey( columnName ) ) { - Integer columnId = (Integer) deprecatedColumns.get( columnName ); + Integer columnId = deprecatedColumns.get( columnName ); columnIds.add( columnId ); if ( log != null ) { @@ -152,12 +153,12 @@ public class IssuesReportHelper * @param list The List to convert * @return An in array */ - public static int[] toIntArray( List list ) + public static int[] toIntArray( List<Integer> list ) { int[] intArray = new int[list.size()]; for ( int j = 0; j < intArray.length; j++ ) { - intArray[j] = ( (Integer) list.get( j ) ).intValue(); + intArray[j] = ( list.get( j ) ).intValue(); } return intArray; } Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java?rev=1098305&r1=1098304&r2=1098305&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java Sun May 1 14:01:11 2011 @@ -50,7 +50,7 @@ public class JiraMojo /** * Valid JIRA columns. */ - private static final Map JIRA_COLUMNS = new HashMap( 16 ); + private static final Map<String,Integer> JIRA_COLUMNS = new HashMap<String,Integer>( 16 ); static { @@ -302,7 +302,7 @@ public class JiraMojo throws MavenReportException { // Validate parameters - List columnIds = IssuesReportHelper.getColumnIds( columnNames, JIRA_COLUMNS ); + List<Integer> columnIds = IssuesReportHelper.getColumnIds( columnNames, JIRA_COLUMNS ); if ( columnIds.isEmpty() ) { // This can happen if the user has configured column names and they are all invalid Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java?rev=1098305&r1=1098304&r2=1098305&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java Sun May 1 14:01:11 2011 @@ -49,12 +49,12 @@ public class TracMojo /** * Deprecated Trac columns. */ - private static Map DEPRECATED_TRAC_COLUMNS = new HashMap(); + private static Map<String,Integer> DEPRECATED_TRAC_COLUMNS = new HashMap<String,Integer>(); /** * Valid Trac columns. */ - private static Map TRAC_COLUMNS = new HashMap(); + private static Map<String,Integer> TRAC_COLUMNS = new HashMap<String,Integer>(); static { @@ -141,8 +141,8 @@ public class TracMojo throws MavenReportException { // Validate parameters - List columnIds = IssuesReportHelper.getColumnIds( columnNames, TRAC_COLUMNS, DEPRECATED_TRAC_COLUMNS, - getLog() ); + List<Integer> columnIds = IssuesReportHelper.getColumnIds( columnNames, TRAC_COLUMNS, DEPRECATED_TRAC_COLUMNS, + getLog() ); if ( columnIds.size() == 0 ) { // This can happen if the user has configured column names and they are all invalid From commitsmarcuslynn@example.org Sun May 1 14:08:01 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id 2032FF3F for <marcuslynn@example.org>; Sun, 1 May 2011 14:08:01 +0000 (UTC) Received: (qmail 30871 invoked by uid 500); 1 May 2011 14:08:01 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 30795 invoked by uid 500); 1 May 2011 14:08:00 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 30788 invoked by uid 99); 1 May 2011 14:08:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 14:08:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 14:07:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BB2DA2388901; Sun, 1 May 2011 14:07:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098309 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Date: Sun, 01 May 2011 14:07:37 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hboutemy Date: Sun May 1 14:07:37 2011 New Revision: 1098309 URL: http://svn.apache.org/viewvc?rev=1098309&view=rev Log: next version will be 2.4 Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=1098309&r1=1098308&r2=1098309&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Sun May 1 14:07:37 2011 @@ -30,7 +30,7 @@ under the License. </parent> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> <packaging>maven-plugin</packaging> <name>Maven Project Info Reports Plugin</name> From commitsmarcuslynn@example.org Sun May 1 14:10:49 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id 1DB7AFCD for <marcuslynn@example.org>; Sun, 1 May 2011 14:10:49 +0000 (UTC) Received: (qmail 32791 invoked by uid 500); 1 May 2011 14:10:48 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 32745 invoked by uid 500); 1 May 2011 14:10:48 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 32738 invoked by uid 99); 1 May 2011 14:10:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 14:10:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 14:10:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B95572388A39; Sun, 1 May 2011 14:10:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098310 - in /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes: ChangesValidatorMojo.java schema/XmlValidationHandler.java Date: Sun, 01 May 2011 14:10:27 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> Author: dennisl Date: Sun May 1 14:10:27 2011 New Revision: 1098310 URL: http://svn.apache.org/viewvc?rev=1098310&view=rev Log: [MCHANGES-210] Update to Java 5 - Start using generics in ChangesValidatorMojo and XmlValidationHandler Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/XmlValidationHandler.java Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java?rev=1098310&r1=1098309&r2=1098310&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java Sun May 1 14:10:27 2011 @@ -20,7 +20,6 @@ package org.apache.maven.plugin.changes; */ import java.io.File; -import java.util.Iterator; import java.util.List; import org.apache.maven.plugin.AbstractMojo; @@ -29,7 +28,7 @@ import org.apache.maven.plugin.MojoFailu import org.apache.maven.plugin.changes.schema.ChangesSchemaValidator; import org.apache.maven.plugin.changes.schema.SchemaValidatorException; import org.apache.maven.plugin.changes.schema.XmlValidationHandler; -import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; /** * @@ -114,13 +113,12 @@ public class ChangesValidatorMojo } } - private void logSchemaValidation( List /*SAXException*/errors ) + private void logSchemaValidation( List<SAXParseException> errors ) { getLog().warn( "failed to validate changes.xml file " + xmlPath.getAbsolutePath() ); getLog().warn( "validation errors: " ); - for ( Iterator iterator = errors.iterator(); iterator.hasNext(); ) + for ( SAXParseException error : errors ) { - SAXException error = (SAXException) iterator.next(); getLog().warn( error.getMessage() ); } } Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/XmlValidationHandler.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/XmlValidationHandler.java?rev=1098310&r1=1098309&r2=1098310&view=diff ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/XmlValidationHandler.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/schema/XmlValidationHandler.java Sun May 1 14:10:27 2011 @@ -38,11 +38,11 @@ public class XmlValidationHandler private boolean parsingError = false; - private List /* SAXParseException */errors = new ArrayList(); + private List<SAXParseException> errors = new ArrayList<SAXParseException>(); - private List /* SAXParseException */fatalErrors = new ArrayList(); + private List<SAXParseException> fatalErrors = new ArrayList<SAXParseException>(); - private List /* SAXParseException */warnings = new ArrayList(); + private List<SAXParseException> warnings = new ArrayList<SAXParseException>(); private boolean failOnValidationError; @@ -115,32 +115,32 @@ public class XmlValidationHandler this.parsingError = error; } - public List /* SAXParseException */getErrors() + public List<SAXParseException> getErrors() { return errors; } - public void setErrors( List errors ) + public void setErrors( List<SAXParseException> errors ) { this.errors = errors; } - public List /* SAXParseException */getFatalErrors() + public List<SAXParseException> getFatalErrors() { return fatalErrors; } - public void setFatalErrors( List fatalErrors ) + public void setFatalErrors( List<SAXParseException> fatalErrors ) { this.fatalErrors = fatalErrors; } - public List /* SAXParseException */ getWarnings() + public List<SAXParseException> getWarnings() { return warnings; } - public void setWarnings( List warnings ) + public void setWarnings( List<SAXParseException> warnings ) { this.warnings = warnings; } From commitsmarcuslynn@example.org Sun May 1 14:19:36 2011 Return-Path: <commitsmarcuslynn@example.org> X-Original-To: marcuslynn@example.org Delivered-To: marcuslynn@example.org Received: from mail.apache.org (hermes.apache.org [83.161.120.155]) by minotaur.apache.org (Postfix) with SMTP id B6CFF21CA for <marcuslynn@example.org>; Sun, 1 May 2011 14:19:36 +0000 (UTC) Received: (qmail 38292 invoked by uid 500); 1 May 2011 14:19:36 -0000 Delivered-To: marcuslynn@example.org Received: (qmail 38240 invoked by uid 500); 1 May 2011 14:19:36 -0000 Mailing-List: contact marcuslynn@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:marcuslynn@example.org> List-Unsubscribe: <mailto:marcuslynn@example.org> List-Post: <mailto:marcuslynn@example.org> List-Id: <commits.maven.apache.org> Reply-To: marcuslynn@example.org Delivered-To: mailing list marcuslynn@example.org Received: (qmail 38231 invoked by uid 99); 1 May 2011 14:19:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 14:19:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 May 2011 14:19:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B55CF2388A39; Sun, 1 May 2011 14:19:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098314 [2/3] - in /maven/plugins/trunk: maven-ant-plugin/src/it/webapp-it/ maven-antrun-plugin/src/it/attach-artifact-test/ maven-antrun-plugin/src/it/filesets-test/ maven-antrun-plugin/src/it/multiple-phase-test/ maven-changes-plugin/src... Date: Sun, 01 May 2011 14:19:11 -0000 To: marcuslynn@example.org From: marcuslynn@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <marcuslynn@example.org> Modified: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-77/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-77/verify.bsh?rev=1098314&r1=1098313&r2=1098314&view=diff ============================================================================== --- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-77/verify.bsh (original) +++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-77/verify.bsh Sun May 1 14:19:08 2011 @@ -32,89 +32,88 @@ try System.err.println( "target file is missing or a directory." ); return false; } - + File someResource = new File( target, "/SomeResource.txt" ); if ( !someResource.exists() || someResource.isDirectory() ) { System.err.println( "SomeResource.txt is missing or not a file." ); return false; - } - - FileInputStream fis = new FileInputStream ( someResource ); - String paramContent = IOUtil.toString ( fis ); - + } + + String paramContent = FileUtils.fileRead( someResource ); + //test:direct resolution project.version=1.0-SNAPSHOT int indexOf = paramContent.indexOf( "test:direct resolution project.version=1.0-SNAPSHOT" ); - if ( indexOf < 0) + if ( indexOf < 0 ) { System.err.println( "SomeResource.txt not contains test:direct resolution project.version=1.0-SNAPSHOT" ); return false; - } - + } + //test:filter resolution project.version=1.0-SNAPSHOT indexOf = paramContent.indexOf( "test:filter resolution project.version=1.0-SNAPSHOT" ); - if ( indexOf < 0) + if ( indexOf < 0 ) { System.err.println( "SomeResource.txt not contains test:filter resolution project.version=1.0-SNAPSHOT" ); return false; - } - + } + //test:filter direct projectProperty=foo-projectProperty-bar indexOf = paramContent.indexOf( "test:filter direct projectProperty=foo-projectProperty-bar" ); - if ( indexOf < 0) + if ( indexOf < 0 ) { System.err.println( "SomeResource.txt not contains test:filter direct projectProperty=foo-projectProperty-bar" ); return false; - } - + } + //test:filter resolution projectProperty=foo-projectProperty-bar indexOf = paramContent.indexOf( "test:filter resolution projectProperty=foo-projectProperty-bar" ); - if ( indexOf < 0) + if ( indexOf < 0 ) { System.err.println( "SomeResource.txt not contains test:filter resolution projectProperty=foo-projectProperty-bar" ); return false; - } - - //test:filter direct profileProperty=foo-profileProperty-bar + } + + //test:filter direct profileProperty=foo-profileProperty-bar indexOf = paramContent.indexOf( "test:filter direct profileProperty=foo-profileProperty-bar" ); - if ( indexOf < 0) + if ( indexOf < 0 ) { System.err.println( "SomeResource.txt not contains test:filter direct profileProperty=foo-profileProperty-bar" ); return false; - } - - //test:filter resolution profileProperty=foo-profileProperty-bar + } + + //test:filter resolution profileProperty=foo-profileProperty-bar indexOf = paramContent.indexOf( "test:filter resolution profileProperty=foo-profileProperty-bar" ); - if ( indexOf < 0) + if ( indexOf < 0 ) { System.err.println( "SomeResource.txt not contains test:filter resolution profileProperty=foo-profileProperty-bar" ); return false; } - + //test:filter syspropsExecutionPropsWins=fromExecProps indexOf = paramContent.indexOf( "test:filter syspropsExecutionPropsWins=fromExecProps" ); - if ( indexOf < 0) + if ( indexOf < 0 ) { System.err.println( "SomeResource.txt not contains test:filter syspropsExecutionPropsWins=fromExecProps" ); return false; - } - - //newToken=foo + } + + //newToken=foo indexOf = paramContent.indexOf( "newToken=foo" ); - if ( indexOf < 0) + if ( indexOf < 0 ) { System.err.println( "SomeResource.txt not contains newToken=foo" ); return false; } - - //var3=Bar-Bar/Stuff + + //var3=Bar-Bar/Stuff indexOf = paramContent.indexOf( "var3=Foo-Bar/Stuff" ); - if ( indexOf < 0) + if ( indexOf < 0 ) { System.err.println( "SomeResource.txt not contains var3=Foo-Bar/Stuff" ); return false; - } + } //custom=my-custom-filter-value indexOf = paramContent.indexOf( "custom=my-custom-filter-value" ); Modified: maven/plugins/trunk/maven-resources-plugin/src/it/binaries-filtering/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/binaries-filtering/verify.bsh?rev=1098314&r1=1098313&r2=1098314&view=diff ============================================================================== --- maven/plugins/trunk/maven-resources-plugin/src/it/binaries-filtering/verify.bsh (original) +++ maven/plugins/trunk/maven-resources-plugin/src/it/binaries-filtering/verify.bsh Sun May 1 14:19:08 2011 @@ -35,7 +35,7 @@ filesAreIdentical( File expected, File c try { byte[] expectedBuffer = IOUtil.toByteArray( expectedIn ); - + byte[] currentBuffer = IOUtil.toByteArray( currentIn ); if (expectedBuffer.length != currentBuffer.length) { @@ -71,19 +71,19 @@ try System.err.println( "filtered images happy_duke.gif are not identical." ); return false; } - + originalImg = new File( basedir, "src/main/resources/duke-beerjpg.img" ); - + targetImg = new File( basedir, "target/classes/duke-beerjpg.img" ); - + identical = filesAreIdentical( originalImg, targetImg ); if (!identical) { System.err.println( "filtered .img duke-beer.jpg.img are not identical." ); return false; - } - + } + } catch( Throwable e ) { Modified: maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/verify.bsh URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/verify.bsh?rev=1098314&r1=1098313&r2=1098314&view=diff ============================================================================== --- maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/verify.bsh (original) +++ maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/verify.bsh Sun May 1 14:19:08 2011 @@ -32,32 +32,29 @@ try System.err.println( "target file is missing or a directory." ); return false; } - + File resource = new File( target, "/extra-resources/configuration.properties" ); if ( !resource.exists() || resource.isDirectory() ) { System.err.println( "configuration.properties is
{'source': 'Apache Software Foundation Public Mail Archives'}