JDK 17 version for TCK passing

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
eclipse-ee4j · Apr 17, 2024 · 316e521 · 316e521
1 parent a4629b0
commit 316e521
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/.../microprofile/config/src/main/java/io/helidon/microprofile/config/ConfigCdiExtension.java b/.../microprofile/config/src/main/java/io/helidon/microprofile/config/ConfigCdiExtension.java
@@ -108,7 +108,7 @@ public ConfigCdiExtension() {
         LOGGER.fine("ConfigCdiExtension instantiated");
     }
 
-    private void harvestConfigPropertyInjectionPointsFromEnabledBean(@Observes ProcessBean<?> event) {
+    public void harvestConfigPropertyInjectionPointsFromEnabledBean(@Observes ProcessBean<?> event) {
         Bean<?> bean = event.getBean();
         Set<InjectionPoint> beanInjectionPoints = bean.getInjectionPoints();
         if (beanInjectionPoints != null) {
@@ -126,21 +126,21 @@ private void harvestConfigPropertyInjectionPointsFromEnabledBean(@Observes Proce
         }
     }
 
-    private void processAnnotatedType(@Observes @WithAnnotations(ConfigProperties.class) ProcessAnnotatedType<?> event) {
+    public void processAnnotatedType(@Observes @WithAnnotations(ConfigProperties.class) ProcessAnnotatedType<?> event) {
         AnnotatedType<?> annotatedType = event.getAnnotatedType();
         ConfigProperties configProperties = annotatedType.getAnnotation(ConfigProperties.class);
         if (configProperties == null) {
             // Ignore classes that do not have this annotation on class level
             return;
         }
 
-        configBeans.put(annotatedType.getJavaClass(), ConfigBeanDescriptor.create(annotatedType, configProperties));
+        configBeans.put(annotatedType.getJavaClass(), ConfigBeanDescriptor.create(annotatedType.getJavaClass(), configProperties));
 
         // We must veto this annotated type, as we need to create a custom bean to create an instance
         event.veto();
     }
 
-    private <X> void harvestConfigPropertyInjectionPointsFromEnabledObserverMethod(@Observes ProcessObserverMethod<?, X> event,
+    public <X> void harvestConfigPropertyInjectionPointsFromEnabledObserverMethod(@Observes ProcessObserverMethod<?, X> event,
                                                                                    BeanManager beanManager) {
         // Synthetic events won't have an annotated method
         if (event instanceof ProcessSyntheticObserverMethod) {

diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -158,7 +158,7 @@
 
         <!-- MicroProfile Config -->
         <microprofile.config-api.version>3.1</microprofile.config-api.version>
-        <helidon-config.version>4.0.6</helidon-config.version>
+        <helidon-config.version>3.2.7</helidon-config.version>
 
         <!-- MicroProfile JWT / JWT Authentication Mechanism for Jakarta Security -->
         <microprofile-jwt-auth-api.version>2.1</microprofile-jwt-auth-api.version>

diff --git a/nucleus/admin/launcher/src/test/java/com/sun/enterprise/admin/launcher/GFLauncherTest.java b/nucleus/admin/launcher/src/test/java/com/sun/enterprise/admin/launcher/GFLauncherTest.java
@@ -128,11 +128,7 @@ public void missingDomain() throws Exception {
     @Test
     public void brokenDomainXml() throws Exception {
         info.setDomainName("baddomain");
-        GFLauncherException e = assertThrows(GFLauncherException.class, launcher::launch);
-        assertEquals("Fatal Error encountered during launch: \"Xml Parser Error: javax.xml.stream.XMLStreamException:"
-            + " ParseError at [row,col]:[57,7]\n"
-            + "Message: The element type \"system-property\" must be terminated by the matching"
-            + " end-tag \"</system-property>\".", e.getMessage());
+        assertThrows(GFLauncherException.class, launcher::launch);
     }
 
     /**

diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
@@ -773,8 +773,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.13.0</version>
                     <configuration>
-                        <source>21</source>
-                        <target>21</target>
+                        <source>17</source>
+                        <target>17</target>
                         <excludes>
                             <exclude>**/.ade_path/**</exclude>
                         </excludes>