Return-Path: 
 <jspwiki-commits-return-2545-apmail-incubator-jspwiki-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-jspwiki-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-jspwiki-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0B75E1073E
	for <apmail-incubator-jspwiki-commits-archive@minotaur.apache.org>;
 Wed, 26 Jun 2013 18:02:17 +0000 (UTC)
Received: (qmail 31421 invoked by uid 500); 26 Jun 2013 18:02:17 -0000
Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org
Received: (qmail 31403 invoked by uid 500); 26 Jun 2013 18:02:16 -0000
Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jspwiki-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:jspwiki-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:jspwiki-commits@incubator.apache.org>
List-Id: <jspwiki-commits.incubator.apache.org>
Reply-To: jspwiki-dev@incubator.apache.org
Delivered-To: mailing list jspwiki-commits@incubator.apache.org
Received: (qmail 31396 invoked by uid 99); 26 Jun 2013 18:02:16 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jun 2013 18:02:16 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jun 2013 18:02:15 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 1D5AA23888E3;
	Wed, 26 Jun 2013 18:01:56 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1497028 - in /incubator/jspwiki/trunk: ChangeLog
 jspwiki-war/src/main/java/org/apache/wiki/Release.java pom.xml
Date: Wed, 26 Jun 2013 18:01:55 -0000
To: jspwiki-commits@incubator.apache.org
From: gmazza@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130626180156.1D5AA23888E3@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gmazza
Date: Wed Jun 26 18:01:55 2013
New Revision: 1497028

URL: http://svn.apache.org/r1497028
Log:
Updated Jaxen to latest release 1.1.4

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/pom.xml

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1497028&r1=1497027&r2=1497028&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Jun 26 18:01:55 2013
@@ -1,5 +1,13 @@
 2013-06-11  Glen Mazza (gmazza AT apache DOT org)
 
+       * 2.10.0-svn-12
+
+       * Switched to Jaxen 1.1.4 and removed nonstandard *-exclusion to get rid
+         of "jaxen:jaxen:jar with value '*' does not match a valid id pattern"
+         warning messages in the build.
+
+2013-06-23  Glen Mazza (gmazza AT apache DOT org)
+
        * 2.10.0-svn-11
 
        * Switched jslint checking from yuicompressor-maven-plugin to jslint-maven-plugin 

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1497028&r1=1497027&r2=1497028&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Wed Jun 26 18:01:55 2013
@@ -75,7 +75,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "11";
+    public static final String     BUILD         = "12";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1497028&r1=1497027&r2=1497028&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Wed Jun 26 18:01:55 2013
@@ -108,13 +108,7 @@
       <dependency>
         <groupId>jaxen</groupId>
         <artifactId>jaxen</artifactId>
-        <version>1.1-beta-6</version>
-        <exclusions>
-          <exclusion>
-            <groupId>*</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-        </exclusions>
+        <version>1.1.4</version>
       </dependency>
 
       <dependency>