[tomee] branch master updated: Better alignement between Geronimo Impl and APIs still using latest possible TCK to see what's the gap

[jlmonteiro]

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

jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new 706867b  Better alignement between Geronimo Impl and APIs still using 
latest possible TCK to see what's the gap
706867b is described below

commit 706867be3f39561fa66bfa506e6abcf94f742c6f
Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
AuthorDate: Thu Mar 31 10:53:44 2022 +0200

    Better alignement between Geronimo Impl and APIs still using latest 
possible TCK to see what's the gap
---
 pom.xml                                              | 20 ++++++++++++++------
 .../microprofile/TomEEMicroProfileListener.java      |  2 +-
 .../tomee/microprofile/config/TomEEConfigSource.java | 12 ++++++++++++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3d986c7..4cb76e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,29 +224,37 @@
 
     <!-- Micro Profile -->
     <microprofile.version>2.0</microprofile.version>
-    <microprofile.config.version>1.3</microprofile.config.version>
+
+    <microprofile.config.version>1.4</microprofile.config.version>
     <microprofile.config.tck.version>3.0.1</microprofile.config.tck.version>
     <microprofile.config.impl.version>1.2.3</microprofile.config.impl.version>
-    <microprofile.jwt.version>2.0</microprofile.jwt.version>
+
+    <microprofile.jwt.version>1.2.2</microprofile.jwt.version>
     <microprofile.jwt.tck.version>2.0</microprofile.jwt.tck.version>
     
<microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
+
     <!-- 1.1 Implementation not started yet -->
     
<microprofile.fault-tolerance.version>1.1.4</microprofile.fault-tolerance.version>
     
<microprofile.fault-tolerance.tck.version>4.0</microprofile.fault-tolerance.tck.version>
     
<microprofile.fault-tolerance.impl.version>1.2.1</microprofile.fault-tolerance.impl.version>
-    <microprofile.health.version>3.0-RC3</microprofile.health.version>
+
+    <microprofile.health.version>3.1</microprofile.health.version>
     <microprofile.health.tck.version>4.0</microprofile.health.tck.version>
     <microprofile.health.impl.version>2.0.1</microprofile.health.impl.version>
-    <microprofile.metrics.version>1.1.1</microprofile.metrics.version>
+
+    <microprofile.metrics.version>3.0.1</microprofile.metrics.version>
     <microprofile.metrics.tck.version>4.0.1</microprofile.metrics.tck.version>
     
<microprofile.metrics.impl.version>1.0.6</microprofile.metrics.impl.version>
-    <microprofile.rest-client.version>1.3.3</microprofile.rest-client.version>
+
+    <microprofile.rest-client.version>2.0</microprofile.rest-client.version>
     
<microprofile.rest-client.tck.version>3.0</microprofile.rest-client.tck.version>
     
<microprofile.rest-client.impl.version>${cxf.version}</microprofile.rest-client.impl.version>
+
     <microprofile.openapi.version>1.1.2</microprofile.openapi.version>
     <microprofile.openapi.tck.version>3.0</microprofile.openapi.tck.version>
     
<microprofile.openapi.impl.version>1.0.15</microprofile.openapi.impl.version>
-    <microprofile.opentracing.version>1.1.2</microprofile.opentracing.version>
+
+    <microprofile.opentracing.version>1.3</microprofile.opentracing.version>
     
<microprofile.opentracing.tck.version>3.0</microprofile.opentracing.tck.version>
     
<microprofile.opentracing.impl.version>1.0.3</microprofile.opentracing.impl.version>
     <opentracing.api>0.31.0</opentracing.api>
diff --git 
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileListener.java
 
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileListener.java
index cc36e57..e20dcac 100644
--- 
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileListener.java
+++ 
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileListener.java
@@ -76,7 +76,7 @@ public class TomEEMicroProfileListener {
                 if (src != null) {
                     containerUrls.add(src.getLocation());
                 }
-            } catch(final ClassNotFoundException | NoClassDefFoundError e) {
+            } catch(final ClassNotFoundException | NoClassDefFoundError | 
IncompatibleClassChangeError e) {
                 Logger.getInstance(LogCategory.OPENEJB.createChild("tomcat"), 
TomEEMicroProfileListener.class)
                       .error("Can't load MicroProfile extension " + extension, 
e);
                 // ignored
diff --git 
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
 
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
index 6085de4..8b2bb09 100644
--- 
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
+++ 
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
@@ -22,8 +22,10 @@ import org.apache.openejb.util.AppFinder;
 import org.eclipse.microprofile.config.spi.ConfigSource;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import static java.util.Arrays.asList;
 
@@ -60,6 +62,16 @@ public class TomEEConfigSource implements ConfigSource {
     }
 
     @Override
+    public Set<String> getPropertyNames() {
+        return new HashSet<>(getProperties().keySet());
+    }
+
+    @Override
+    public int getOrdinal() {
+        return 150;
+    }
+
+    @Override
     public String getValue(final String propertyName) {
         return configuration.get(propertyName);
     }