sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r1723770 - in /sling/trunk/bundles/scripting/sightly: engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java testing-content/pom.xml testing/pom.xml
Date Fri, 08 Jan 2016 17:56:24 GMT
Author: radu
Date: Fri Jan  8 17:56:24 2016
New Revision: 1723770

URL: http://svn.apache.org/viewvc?rev=1723770&view=rev
Log:
SLING-5411 - Sightly formatting filter only replaces first 10 placeholders

* corrected format placeholder regex
(patch submitted by Vlad B─âilescu)

Modified:
    sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java
    sling/trunk/bundles/scripting/sightly/testing-content/pom.xml
    sling/trunk/bundles/scripting/sightly/testing/pom.xml

Modified: sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java?rev=1723770&r1=1723769&r2=1723770&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java
(original)
+++ sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java
Fri Jan  8 17:56:24 2016
@@ -48,7 +48,7 @@ public class FormatFilter extends Filter
     public static final String FORMAT_OPTION = "format";
     public static final String FORMAT_FUNCTION = "format";
 
-    private static final Pattern PLACEHOLDER_REGEX = Pattern.compile("\\{\\d}");
+    private static final Pattern PLACEHOLDER_REGEX = Pattern.compile("\\{\\d+}");
 
     @Override
     public Expression apply(Expression expression, ExpressionContext expressionContext) {

Modified: sling/trunk/bundles/scripting/sightly/testing-content/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/pom.xml?rev=1723770&r1=1723769&r2=1723770&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing-content/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/testing-content/pom.xml Fri Jan  8 17:56:24 2016
@@ -100,7 +100,7 @@
                                 <artifactItem>
                                     <groupId>io.sightly</groupId>
                                     <artifactId>io.sightly.tck</artifactId>
-                                    <version>1.2.0</version>
+                                    <version>1.2.1</version>
                                     <type>jar</type>
                                     <outputDirectory>${project.build.directory}/sightlytck/</outputDirectory>
                                     <includes>**/*.html,**/*.js,**/*.java</includes>

Modified: sling/trunk/bundles/scripting/sightly/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/pom.xml?rev=1723770&r1=1723769&r2=1723770&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/testing/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/testing/pom.xml Fri Jan  8 17:56:24 2016
@@ -203,7 +203,7 @@
         <dependency>
             <groupId>io.sightly</groupId>
             <artifactId>io.sightly.tck</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>



Mime
View raw message