Merge pull request #7147 from breakponchito/FISH-10295-fix-tck-issue-…

…to-deploy-artifacts FISH-10295: adding cdi-tck fixes
payara · Jan 9, 2025 · 1626b8e · 1626b8e
2 parents 4321897 + 4e70050
commit 1626b8e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.../dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceHandler.java b/.../dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceHandler.java
@@ -245,7 +245,7 @@ protected HandlerProcessingResult processResource(AnnotationInfo ainfo,
             }
 
             //if value is empty we need to verify any other available descriptor that use same field with not empty value
-            if (!ok(desc.getValue())) {
+            if (target.getFieldName() != null && !ok(desc.getValue())) {
                 String valueFound = searchValueIfAvailable(target.getFieldName(), descriptors);
                 if (!valueFound.isEmpty()) {
                     desc.setValue(valueFound);

diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2016-2022] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2016-2025] [Payara Foundation and/or its affiliates]
 
 package org.glassfish.weld;
 
@@ -999,7 +999,7 @@ private Metadata<Extension> createProbeExtension() {
 
         return new MetadataImpl<Extension>(probeExtension, "N/A");
     }
-
+    
     private void addWeldListenerToAllWars(DeploymentContext context) {
         // if there's at least 1 ejb jar then add the listener to all wars
         ApplicationHolder applicationHolder = context.getModuleMetaData(ApplicationHolder.class);

diff --git a/core/pom.xml b/core/pom.xml
@@ -3,7 +3,7 @@
   ~
   ~  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
   ~
-  ~  Copyright (c) 2011-2024 Payara Foundation and/or its affiliates. All rights reserved.
+  ~  Copyright (c) 2011-2025 Payara Foundation and/or its affiliates. All rights reserved.
   ~
   ~  The contents of this file are subject to the terms of either the GNU
   ~  General Public License Version 2 only ("GPL") or the Common Development
@@ -108,7 +108,7 @@
         <hazelcast.version>5.3.6</hazelcast.version>
         <jakartaee.api.version>10.0.0</jakartaee.api.version>
         <weld-api.version>5.0.SP3</weld-api.version>
-        <weld.version>5.0.1.Final</weld.version>
+        <weld.version>5.0.1.payara-p1</weld.version>
         <tyrus.version>2.1.3.payara-p1</tyrus.version>
         <jsp-impl.version>3.2.2</jsp-impl.version>
         <asm.version>9.7.1</asm.version>