diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java
index 91eb74d9..b43da674 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java
@@ -23,9 +23,9 @@ import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 
-import jakarta.enterprise.context.spi.CreationalContext;
-import jakarta.enterprise.inject.spi.Bean;
-import jakarta.enterprise.inject.spi.BeanManager;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
 
 import org.apache.geode.cache.Region;
 
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java
index c89bf681..a8fb82a0 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java
@@ -24,11 +24,11 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import jakarta.enterprise.event.Observes;
-import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
-import jakarta.enterprise.inject.spi.Bean;
-import jakarta.enterprise.inject.spi.BeanManager;
-import jakarta.enterprise.inject.spi.ProcessBean;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.ProcessBean;
 
 import org.apache.geode.cache.Region;
 
@@ -65,8 +65,8 @@ public class GemfireRepositoryExtension extends CdiRepositoryExtensionSupport {
 	 *
 	 * @param <X> class type of the bean instance.
 	 * @param processBean annotated type as defined by CDI.
-	 * @see jakarta.enterprise.inject.spi.ProcessBean
-	 * @see jakarta.enterprise.event.Observes
+	 * @see javax.enterprise.inject.spi.ProcessBean
+	 * @see javax.enterprise.event.Observes
 	 */
 	@SuppressWarnings("unchecked")
 	<X> void processBean(@Observes ProcessBean<X> processBean) {
@@ -105,9 +105,9 @@ public class GemfireRepositoryExtension extends CdiRepositoryExtensionSupport {
 	 * Repository beans are associated to the appropriate GemfireMappingContexts based on their qualifiers.
 	 *
 	 * @param beanManager the BeanManager instance.
-	 * @see jakarta.enterprise.inject.spi.AfterBeanDiscovery
-	 * @see jakarta.enterprise.inject.spi.BeanManager
-	 * @see jakarta.enterprise.event.Observes
+	 * @see javax.enterprise.inject.spi.AfterBeanDiscovery
+	 * @see javax.enterprise.inject.spi.BeanManager
+	 * @see javax.enterprise.event.Observes
 	 */
 	void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager) {
 
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTests.java
index 140d0027..56ca7b44 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTests.java
@@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Map;
 
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java
index ff97a482..c9aeae6e 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java
@@ -28,7 +28,7 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -249,7 +249,7 @@ public abstract class AbstractGeodeSecurityIntegrationTests extends ForkingClien
 
 		CacheLoader<String, String> echoCacheLoader() {
 
-			return new CacheLoader<>() {
+			return new CacheLoader<String, String>() {
 
 				@Override
 				public String load(LoaderHelper<String, String> helper) throws CacheLoaderException {
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java
index 6ca79fbb..841bf396 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfigurationIntegrationTests.java
@@ -119,7 +119,7 @@ public class AutoConfiguredAuthenticationConfigurationIntegrationTests
 
 		private CacheLoader<Object, Object> newEchoCacheLoader() {
 
-			return new CacheLoader<>() {
+			return new CacheLoader<Object, Object>() {
 
 				@Override
 				public Object load(LoaderHelper<Object, Object> loaderHelper) throws CacheLoaderException {
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsForMockCollocatedPartitionRegionsIntegrationsTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsForMockCollocatedPartitionRegionsIntegrationsTests.java
index fd95bdb0..b787ef82 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsForMockCollocatedPartitionRegionsIntegrationsTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsForMockCollocatedPartitionRegionsIntegrationsTests.java
@@ -18,7 +18,7 @@ package org.springframework.data.gemfire.config.annotation;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsForRealCollocatedPartitionRegionsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsForRealCollocatedPartitionRegionsIntegrationTests.java
index 6ab5bd45..b73ac5c2 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsForRealCollocatedPartitionRegionsIntegrationTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EntityDefinedRegionsForRealCollocatedPartitionRegionsIntegrationTests.java
@@ -17,7 +17,7 @@ package org.springframework.data.gemfire.config.annotation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java
index ecd4d328..91aae8fe 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java
@@ -18,8 +18,8 @@ package org.springframework.data.gemfire.repository.cdi;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import jakarta.enterprise.inject.se.SeContainer;
-import jakarta.enterprise.inject.se.SeContainerInitializer;
+import javax.enterprise.inject.se.SeContainer;
+import javax.enterprise.inject.se.SeContainerInitializer;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -47,10 +47,10 @@ public class CdiExtensionIntegrationTest {
 	@BeforeClass
 	public static void setUp() {
 
-		container = SeContainerInitializer.newInstance() //
-				.disableDiscovery() //
-				.addPackages(RepositoryClient.class) //
-				.initialize();
+		container = SeContainerInitializer.newInstance()
+			.disableDiscovery()
+			.addPackages(RepositoryClient.class)
+			.initialize();
 	}
 
 	@AfterClass
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java
index e9387fc3..9b3267bb 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java
@@ -16,8 +16,8 @@
  */
 package org.springframework.data.gemfire.repository.cdi;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
 
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheFactory;
@@ -30,12 +30,12 @@ import org.springframework.data.gemfire.repository.sample.Person;
 import org.springframework.util.Assert;
 
 /**
- * The {@link GemfireCacheRegionProducer} class is an application scoped CDI context bean that is responsible
- * for creating the {@link GemFireCache} {@literal People} {@link Region} used to store {@link Person} instances.
+ * The {@link GemfireCacheRegionProducer} class is an application scoped CDI context bean that is responsible for
+ * creating the {@link GemFireCache} {@literal People} {@link Region} used to store {@link Person} instances.
  *
  * @author John Blum
- * @see jakarta.enterprise.context.ApplicationScoped
- * @see jakarta.enterprise.inject.Produces
+ * @see javax.enterprise.context.ApplicationScoped
+ * @see javax.enterprise.inject.Produces
  * @see org.apache.geode.cache.Cache
  * @see org.apache.geode.cache.CacheFactory
  * @see org.apache.geode.cache.GemFireCache
@@ -62,9 +62,8 @@ public class GemfireCacheRegionProducer {
 
 		Region<Long, Person> peopleRegion = peopleRegionFactory.create("People");
 
-		Assert.notNull(peopleRegion);
+		Assert.notNull(peopleRegion, "People Region was null");
 
 		return peopleRegion;
 	}
-
 }
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java
index c111ad71..bd8368fe 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java
@@ -34,9 +34,9 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import jakarta.enterprise.context.spi.CreationalContext;
-import jakarta.enterprise.inject.spi.Bean;
-import jakarta.enterprise.inject.spi.BeanManager;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -278,7 +278,7 @@ public class GemfireRepositoryBeanTest {
 		final AtomicBoolean repositoryProxyPostProcessed = new AtomicBoolean(false);
 
 		GemfireRepositoryBean<PersonRepository> repositoryBean =
-			new GemfireRepositoryBean<>(this.mockBeanManager, PersonRepository.class,
+			new GemfireRepositoryBean(this.mockBeanManager, PersonRepository.class,
 				Collections.emptySet(), newCustomRepositoryImplementationDetector(), null,
 					CollectionUtils.asSet(mockRegionBean))
 		{
@@ -339,6 +339,7 @@ public class GemfireRepositoryBeanTest {
 		}
 	}
 
+	@SuppressWarnings("all")
 	static class Person {}
 
 	interface PersonRepository extends GemfireRepository<Person, Long> { }
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java
index 4f22ace9..a273f443 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java
@@ -31,11 +31,11 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
-import jakarta.enterprise.inject.spi.Bean;
-import jakarta.enterprise.inject.spi.BeanManager;
-import jakarta.enterprise.inject.spi.ProcessBean;
-import jakarta.inject.Qualifier;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.ProcessBean;
+import javax.inject.Qualifier;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -50,8 +50,8 @@ import org.springframework.data.gemfire.repository.GemfireRepository;
  * Integration Tests for the {@link GemfireRepositoryExtension} class and functionality in a Java EE CDI context.
  *
  * @author John Blum
- * @see jakarta.enterprise.inject.spi.Bean
- * @see jakarta.enterprise.inject.spi.BeanManager
+ * @see javax.enterprise.inject.spi.Bean
+ * @see javax.enterprise.inject.spi.BeanManager
  * @see org.junit.Test
  * @see org.mockito.Mockito
  * @see org.apache.geode.cache.Region
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/RepositoryClient.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/RepositoryClient.java
index c67a2ae8..2880c54d 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/RepositoryClient.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/RepositoryClient.java
@@ -18,7 +18,7 @@ package org.springframework.data.gemfire.repository.cdi;
 
 import java.util.concurrent.atomic.AtomicLong;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.data.gemfire.repository.sample.Person;
 import org.springframework.util.Assert;
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
  * {@link RepositoryClient} is a user/consumer of the {@link SamplePersonRepository} bean in a CDI context.
  *
  * @author John Blum
- * @see jakarta.inject.Inject
+ * @see javax.inject.Inject
  * @see org.springframework.data.gemfire.repository.cdi.SamplePersonRepository
  * @since 1.8.0
  */
@@ -36,6 +36,7 @@ public class RepositoryClient {
 	private static final AtomicLong ID_SEQUENCE = new AtomicLong(0L);
 
 	@Inject
+	@SuppressWarnings("all")
 	private SamplePersonRepository personRepository;
 
 	protected SamplePersonRepository getPersonRepository() {