diff --git a/appserver/microprofile/config/src/main/java/io/helidon/microprofile/config/ConfigCdiExtension.java b/appserver/microprofile/config/src/main/java/io/helidon/microprofile/config/ConfigCdiExtension.java index 6b09b440913..1ba5050db2d 100644 --- a/appserver/microprofile/config/src/main/java/io/helidon/microprofile/config/ConfigCdiExtension.java +++ b/appserver/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 beanInjectionPoints = bean.getInjectionPoints(); if (beanInjectionPoints != null) { @@ -126,7 +126,7 @@ 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) { @@ -134,13 +134,13 @@ private void processAnnotatedType(@Observes @WithAnnotations(ConfigProperties.cl 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 void harvestConfigPropertyInjectionPointsFromEnabledObserverMethod(@Observes ProcessObserverMethod event, + public void harvestConfigPropertyInjectionPointsFromEnabledObserverMethod(@Observes ProcessObserverMethod 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 index 069c989a391..0573b6f7f61 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -158,7 +158,7 @@ 3.1 - 4.0.6 + 3.2.7 2.1 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 index e5692e72a82..7e48412dcc6 100644 --- 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 \"\".", e.getMessage()); + assertThrows(GFLauncherException.class, launcher::launch); } /** diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index caa3e330ff0..155a62d50eb 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -773,8 +773,8 @@ maven-compiler-plugin 3.13.0 - 21 - 21 + 17 + 17 **/.ade_path/**