[aries] branch trunk updated: Allow for BREE JavaSE > 9 (e.g. 'JavaSE-9')

[sbratton]

This is an automated email from the ASF dual-hosted git repository.

sbratton pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 54a5691c5 Allow for BREE JavaSE > 9 (e.g. 'JavaSE-9')
     new 9f88cf73f Merge pull request #234 from sebratton/bree-java-9
54a5691c5 is described below

commit 54a5691c52acfd66c7865a8d6936c8dad98c1548
Author: Samuel E Bratton <sebrat...@users.noreply.github.com>
AuthorDate: Tue Jul 11 15:38:57 2023 -0500

    Allow for BREE JavaSE > 9 (e.g. 'JavaSE-9')
---
 .../apache/aries/subsystem/core/archive/Grammar.java  |  2 +-
 .../BundleRequiredExecutionEnvironmentHeaderTest.java | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git 
a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/Grammar.java
 
b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/Grammar.java
index 09c15507c..746ad53e5 100644
--- 
a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/Grammar.java
+++ 
b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/Grammar.java
@@ -76,7 +76,7 @@ public interface Grammar {
        public static final String DIGIT = "[0-9]";
        public static final String ALPHA = "[A-Za-z]";
        public static final String ALPHANUM = DIGIT + '|' + ALPHA;
-       public static final String TOKEN = "(?:" + ALPHANUM + "|_|-)+";
+       public static final String TOKEN = "(?:" + ALPHANUM + "|_|-)+?";
        public static final String EXTENDED = "(?:" + ALPHANUM + "|_|-|\\.)+";
        public static final String QUOTED_STRING = 
"\"(?:[^\\\\\"\r\n\u0000]|\\\\\"|\\\\\\\\)*\"";
        public static final String ARGUMENT = EXTENDED + '|' + QUOTED_STRING;
diff --git 
a/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/BundleRequiredExecutionEnvironmentHeaderTest.java
 
b/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/BundleRequiredExecutionEnvironmentHeaderTest.java
index bf7ff4669..63df07de0 100644
--- 
a/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/BundleRequiredExecutionEnvironmentHeaderTest.java
+++ 
b/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/BundleRequiredExecutionEnvironmentHeaderTest.java
@@ -114,7 +114,8 @@ public class BundleRequiredExecutionEnvironmentHeaderTest {
        public void testParser4() {
                doTestParser("JavaSE-1.6", "JavaSE", "1.6");
        }
-       
+
+
        @Test
        public void testParser5() {
                doTestParser("AA/BB-1.7", "AA/BB", "1.7");
@@ -129,6 +130,22 @@ public class BundleRequiredExecutionEnvironmentHeaderTest {
        public void testParser7() {
                doTestParser("MyEE-badVersion", "MyEE-badVersion", 
(Version)null);
        }
+
+       @Test
+       public void testParser8() {
+               doTestParser("JavaSE-9", "JavaSE", "9");
+       }
+
+       @Test
+       public void testParser9() {
+               doTestParser("JavaSE-10", "JavaSE", "10");
+       }
+
+       @Test
+       public void testParser10() {
+               doTestParser("JavaSE-17", "JavaSE", "17");
+       }
+       
        
        private void 
assertClause(BundleRequiredExecutionEnvironmentHeader.Clause clause, String 
clauseStr, String name, String version, String filter) {
                assertClause(clause, clauseStr, name, 
Version.parseVersion(version), filter);