[maven-repo-helper] 01/02: Fixed a bug preventing rules like 's/org.foo/org.bar/ * * s/.*/debian/ * *' from working properly

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-repo-helper.

commit 857798d3f9d2ebe56bce2f35615e7ec928f7ddbe
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 8 17:18:20 2014 +0200

    Fixed a bug preventing rules like 's/org.foo/org.bar/ * * s/.*/debian/ * *' from working properly
---
 debian/changelog                                  | 7 +++++++
 pom.xml                                           | 2 +-
 src/main/java/org/debian/maven/repo/Rule.java     | 2 +-
 src/test/java/org/debian/maven/repo/RuleTest.java | 3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50afb00..808cac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-repo-helper (1.8.10) UNRELEASED; urgency=medium
+
+  * Fixed a bug preventing rules like 's/org.foo/org.bar/ * * s/.*/debian/ * *'
+    from working properly.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 08 Sep 2014 17:13:45 +0200
+
 maven-repo-helper (1.8.9) unstable; urgency=medium
 
   * Allow rules like s/foo// to remove an element of the Maven coordinates
diff --git a/pom.xml b/pom.xml
index cb169f5..92b60b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>maven-repo-helper</artifactId>
     <name>Maven Repo helper</name>
     <packaging>jar</packaging>
-    <version>1.8.7</version>
+    <version>1.8.10</version>
     <description>Provides support for managing the Maven repository in a Debian distribution.</description>
 
     <inceptionYear>2009</inceptionYear>
diff --git a/src/main/java/org/debian/maven/repo/Rule.java b/src/main/java/org/debian/maven/repo/Rule.java
index 9414b40..f78ab19 100644
--- a/src/main/java/org/debian/maven/repo/Rule.java
+++ b/src/main/java/org/debian/maven/repo/Rule.java
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
 public class Rule {
 
     /** Regexp looking for characters found in regular expressions like '[', '?', '*', '+', '|' */
-    private static final Pattern GENERIC_PATTERN = Pattern.compile("([\\[\\?\\+\\*\\|])|([^\\\\]\\.)"); // ([\[\?\+\*\|])|([^\\]\.)
+    private static final Pattern GENERIC_PATTERN = Pattern.compile("([\\[\\?\\+\\*\\|])|([^\\\\]\\.[\\*\\+])"); // ([\[\?\+\*\|])|([^\\]\.[\*\+])
     private static Pattern generic = Pattern.compile("([\\[\\?\\+\\*\\|])|([^\\\\]\\.)");
 
     /** Regexp matching a substitution expression like s/foo/bar/ */
diff --git a/src/test/java/org/debian/maven/repo/RuleTest.java b/src/test/java/org/debian/maven/repo/RuleTest.java
index 28cafa9..9637a83 100644
--- a/src/test/java/org/debian/maven/repo/RuleTest.java
+++ b/src/test/java/org/debian/maven/repo/RuleTest.java
@@ -112,6 +112,9 @@ public class RuleTest {
         Rule simpleReplace = new Rule("s/test/foo/");
         assertFalse(simpleReplace.isGeneric());
 
+        Rule simpleReplaceWithDot = new Rule("s/org.apache/org.debian/");
+        assertFalse(simpleReplaceWithDot.isGeneric());
+        
         Rule complexReplace = new Rule("s/test(.*)/foo$1/");
         assertTrue(complexReplace.isGeneric());
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-repo-helper.git