Return-Path: 
 <commits-return-16722-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-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 82E647491
	for <apmail-activemq-commits-archive@www.apache.org>;
 Mon,  1 Aug 2011 09:54:24 +0000 (UTC)
Received: (qmail 74357 invoked by uid 500); 1 Aug 2011 09:54:23 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 74265 invoked by uid 500); 1 Aug 2011 09:54:13 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 74253 invoked by uid 99); 1 Aug 2011 09:54:10 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Aug 2011 09:54:10 +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; Mon, 01 Aug 2011 09:54:08 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 6C98E238890D
	for <commits@activemq.apache.org>; Mon,  1 Aug 2011 09:53:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1152720 - in /activemq/trunk:
 activemq-web-console/pom.xml
 pom.xml
Date: Mon, 01 Aug 2011 09:53:48 -0000
To: commits@activemq.apache.org
From: dejanb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110801095348.6C98E238890D@eris.apache.org>

Author: dejanb
Date: Mon Aug  1 09:53:47 2011
New Revision: 1152720

URL: http://svn.apache.org/viewvc?rev=1152720&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3427 - compile with jdk7

Modified:
    activemq/trunk/activemq-web-console/pom.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=1152720&r1=1152719&r2=1152720&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Mon Aug  1 09:53:47 2011
@@ -35,7 +35,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.1-beta-1</version>
+        <version>2.1.1</version>
         <configuration>
           <packagingExcludes>
             WEB-INF/lib/jetty*.jar,

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1152720&r1=1152719&r2=1152720&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Mon Aug  1 09:53:47 2011
@@ -1035,6 +1035,11 @@
             <downloadJavadocs>false</downloadJavadocs>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>2.1.1</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>