362405 Adding patch to support bigger version numbers

2 files changed, 9 insertions, 4 deletions

diff --git a/org.eclipse.virgo.bundlor.maven/src/main/java/org/eclipse/virgo/bundlor/maven/plugin/internal/MavenVersionNumberConverter.java b/org.eclipse.virgo.bundlor.maven/src/main/java/org/eclipse/virgo/bundlor/maven/plugin/internal/MavenVersionNumberConverter.java
index 61af00b..2452738 100644
--- a/org.eclipse.virgo.bundlor.maven/src/main/java/org/eclipse/virgo/bundlor/maven/plugin/internal/MavenVersionNumberConverter.java
+++ b/org.eclipse.virgo.bundlor.maven/src/main/java/org/eclipse/virgo/bundlor/maven/plugin/internal/MavenVersionNumberConverter.java
@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
 
 public final class MavenVersionNumberConverter {
 
-    private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d)(\\.\\d)?(\\.\\d)?([\\.-]{1}.*)?");
+    private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)(\\.\\d+)?(\\.\\d+)?([\\.-]{1}.*)?");
 
     public String convertToOsgi(String mavenVersionNumber) {
         VersionBuilder versionBuilder = new VersionBuilder();
diff --git a/org.eclipse.virgo.bundlor.maven/src/test/java/org/eclipse/virgo/bundlor/maven/plugin/internal/MavenVersionNumberConverterTests.java b/org.eclipse.virgo.bundlor.maven/src/test/java/org/eclipse/virgo/bundlor/maven/plugin/internal/MavenVersionNumberConverterTests.java
index 1baadd5..be86598 100644
--- a/org.eclipse.virgo.bundlor.maven/src/test/java/org/eclipse/virgo/bundlor/maven/plugin/internal/MavenVersionNumberConverterTests.java
+++ b/org.eclipse.virgo.bundlor.maven/src/test/java/org/eclipse/virgo/bundlor/maven/plugin/internal/MavenVersionNumberConverterTests.java
@@ -25,13 +25,18 @@ public class MavenVersionNumberConverterTests {
     }
 
     @Test
-    public void minor() {
-        assertEquals("1.0.0.SNAPSHOT", converter.convertToOsgi("1.0-SNAPSHOT"));
+    public void major10() {
+        assertEquals("10.0.0.SNAPSHOT", converter.convertToOsgi("10-SNAPSHOT"));
+    }
+    
+    @Test
+    public void minor10() {
+        assertEquals("1.10.0.SNAPSHOT", converter.convertToOsgi("1.10-SNAPSHOT"));
     }
 
     @Test
     public void micro() {
-        assertEquals("1.0.0.SNAPSHOT", converter.convertToOsgi("1.0.0-SNAPSHOT"));
+        assertEquals("1.0.10.SNAPSHOT", converter.convertToOsgi("1.0.10-SNAPSHOT"));
     }
 
     @Test