HHH-14902 - JpaCompliantLifecycleStrategy$BeanImpl#initialize causes a deployment failure due to CDI Bean Manager not being available

hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java

@@ -1364,7 +1364,6 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil
 	// Phase 2 concerns ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 	private Object validatorFactory;
-	private Object cdiBeanManager;
 	private DataSource dataSource;
 	private MetadataImplementor metadata;
 
@@ -1516,9 +1515,6 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil
 		if ( this.validatorFactory != null ) {
 			sfBuilder.applyValidatorFactory( validatorFactory );
 		}
-		if ( this.cdiBeanManager != null ) {
-			sfBuilder.applyBeanManager( cdiBeanManager );
-		}
 	}
 
 

hibernate-core/src/main/java/org/hibernate/resource/beans/container/internal/CdiBeanContainerExtendedAccessImpl.java

@@ -8,6 +8,7 @@ package org.hibernate.resource.beans.container.internal;
 
 import jakarta.enterprise.inject.spi.BeanManager;
 
+import org.hibernate.Internal;
 import org.hibernate.resource.beans.container.spi.AbstractCdiBeanContainer;
 import org.hibernate.resource.beans.container.spi.BeanLifecycleStrategy;
 import org.hibernate.resource.beans.container.spi.ContainedBean;
@@ -88,6 +89,11 @@ public class CdiBeanContainerExtendedAccessImpl
 		return usableBeanManager;
 	}
 
+	@Internal
+	public BeanManager getBeanManager() {
+		return usableBeanManager;
+	}
+
 	private class BeanImpl<B> implements ContainedBeanImplementor<B> {
 		private final Class<B> beanType;
 		private final BeanLifecycleStrategy lifecycleStrategy;

hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerSmokeTests.java

@@ -0,0 +1,92 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ */
+package org.hibernate.orm.test.cdi.lifecycle;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;
+import org.hibernate.resource.beans.container.internal.CdiBeanContainerExtendedAccessImpl;
+import org.hibernate.resource.beans.container.spi.ExtendedBeanManager;
+import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
+
+import org.hibernate.testing.orm.jpa.PersistenceUnitInfoAdapter;
+import org.junit.jupiter.api.Test;
+
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.persistence.EntityManagerFactory;
+
+import static java.util.Collections.singletonMap;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hibernate.cfg.AvailableSettings.CDI_BEAN_MANAGER;
+import static org.hibernate.cfg.AvailableSettings.JAKARTA_CDI_BEAN_MANAGER;
+import static org.hibernate.jpa.boot.spi.Bootstrap.getEntityManagerFactoryBuilder;
+
+/**
+ * @author Steve Ebersole
+ */
+public class ExtendedBeanManagerSmokeTests {
+
+	@Test
+	public void testIntegrationSetting() {
+		verifyIntegrationSetting( JAKARTA_CDI_BEAN_MANAGER );
+		verifyIntegrationSetting( CDI_BEAN_MANAGER );
+	}
+
+	private static void verifyIntegrationSetting(String settingName) {
+		final ExtendedBeanManagerImpl ref = new ExtendedBeanManagerImpl();
+		assertThat( ref.lifecycleListener ).isNull();
+
+		final EntityManagerFactoryBuilder emfb = getEntityManagerFactoryBuilder(
+				new PersistenceUnitInfoAdapter(),
+				singletonMap( settingName, ref )
+		);
+
+		assertApplied( ref, emfb.build() );
+	}
+
+	@Test
+	public void testUserSetting() {
+		verifyUserSettingWorks( JAKARTA_CDI_BEAN_MANAGER );
+		verifyUserSettingWorks( CDI_BEAN_MANAGER );
+	}
+
+	private static void verifyUserSettingWorks(String settingName) {
+		final ExtendedBeanManagerImpl ref = new ExtendedBeanManagerImpl();
+		assertThat( ref.lifecycleListener ).isNull();
+
+		final EntityManagerFactoryBuilder emfb = getEntityManagerFactoryBuilder(
+				new PersistenceUnitInfoAdapter(),
+				singletonMap( settingName, ref )
+		);
+
+		assertApplied( ref, emfb.build() );
+	}
+
+	private static void assertApplied(ExtendedBeanManagerImpl ref, EntityManagerFactory emf) {
+		final SessionFactoryImplementor sfi = emf.unwrap( SessionFactoryImplementor.class );
+		final ManagedBeanRegistry beanRegistry = sfi.getServiceRegistry().getService( ManagedBeanRegistry.class );
+		assertThat( beanRegistry.getBeanContainer() ).isInstanceOf( CdiBeanContainerExtendedAccessImpl.class );
+
+		final CdiBeanContainerExtendedAccessImpl extensionWrapper = (CdiBeanContainerExtendedAccessImpl) beanRegistry.getBeanContainer();
+		assertThat( extensionWrapper.getBeanManager() ).isNull();
+
+		ref.notify( null );
+	}
+
+	public static class ExtendedBeanManagerImpl implements ExtendedBeanManager {
+		private LifecycleListener lifecycleListener;
+
+		@Override
+		public void registerLifecycleListener(LifecycleListener lifecycleListener) {
+			assert this.lifecycleListener == null;
+			this.lifecycleListener = lifecycleListener;
+		}
+
+		public void notify(BeanManager ready) {
+			lifecycleListener.beanManagerInitialized( ready );
+		}
+	}
+}