diff --git a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle index 2b6057bf..d61871f8 100644 --- a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle +++ b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle @@ -10,6 +10,8 @@ dependencies { implementation project(":spring-geode") + implementation "jakarta.annotation:jakarta.annotation-api" + compileOnly "com.google.code.findbugs:jsr305:$findbugsVersion" optional project(':apache-geode-extensions') diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java index 0b6c08df..d8e0f53d 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java @@ -20,7 +20,7 @@ import static org.springframework.data.gemfire.util.CollectionUtils.asSet; import java.util.Optional; import java.util.Set; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.apache.geode.cache.GemFireCache; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java index 343363bd..39d3134f 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.geode.boot.autoconfigure.caching; import static org.assertj.core.api.Assertions.assertThat; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.FixMethodOrder; import org.junit.Test; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingUnitTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingUnitTests.java index d504a6b4..86e7b90b 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingUnitTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.geode.boot.autoconfigure.caching; import static org.assertj.core.api.Assertions.assertThat; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Before; import org.junit.Test; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java index 6d69d103..bf4e9461 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Before; import org.junit.BeforeClass; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java index d952b61d..1e573485 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.geode.boot.autoconfigure.repository; import static org.assertj.core.api.Assertions.assertThat; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.FixMethodOrder; import org.junit.Test; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionLocalCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionLocalCachingIntegrationTests.java index 28d78637..4146ba13 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionLocalCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionLocalCachingIntegrationTests.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.assertThat; import java.net.URI; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; -import javax.servlet.http.HttpSession; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpSession; import org.junit.AfterClass; import org.junit.Before; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionRemoteCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionRemoteCachingIntegrationTests.java index 77ba69b0..ab254707 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionRemoteCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionRemoteCachingIntegrationTests.java @@ -21,8 +21,8 @@ import java.io.IOException; import java.net.URI; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; -import javax.servlet.http.HttpSession; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpSession; import org.junit.Before; import org.junit.BeforeClass; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java index d18bec20..c537e754 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/SessionExpirationIntegrationTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Before; import org.junit.Test; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java index b1902894..b1f0d1d0 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Before; import org.junit.Test; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java index 66fe4b76..4666e634 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.geode.boot.autoconfigure.template; import static org.assertj.core.api.Assertions.assertThat; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java index a000683e..3db280f8 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.stream.Collectors; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Before; import org.junit.Test; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java index f1258b21..be85c703 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.geode.boot.autoconfigure.template; import static org.assertj.core.api.Assertions.assertThat; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java index c71cbb55..41bc7ceb 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.geode.boot.autoconfigure.template; import static org.assertj.core.api.Assertions.assertThat; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/topology/clientserver/SpringBootApacheGeodeClientServerIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/topology/clientserver/SpringBootApacheGeodeClientServerIntegrationTests.java index ccb0d003..c1743f34 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/topology/clientserver/SpringBootApacheGeodeClientServerIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/topology/clientserver/SpringBootApacheGeodeClientServerIntegrationTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.AfterClass; import org.junit.Before; diff --git a/spring-geode-docs/src/test/java/example/test/integration/SpringBootApacheGeodeIntegrationTest.java b/spring-geode-docs/src/test/java/example/test/integration/SpringBootApacheGeodeIntegrationTest.java index 71888d45..a2d7071a 100644 --- a/spring-geode-docs/src/test/java/example/test/integration/SpringBootApacheGeodeIntegrationTest.java +++ b/spring-geode-docs/src/test/java/example/test/integration/SpringBootApacheGeodeIntegrationTest.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.AfterClass; import org.junit.Before; diff --git a/spring-geode-samples/boot/configuration/src/test/java/example/app/crm/CustomerServiceApplicationIntegrationTests.java b/spring-geode-samples/boot/configuration/src/test/java/example/app/crm/CustomerServiceApplicationIntegrationTests.java index e6763391..b4322526 100644 --- a/spring-geode-samples/boot/configuration/src/test/java/example/app/crm/CustomerServiceApplicationIntegrationTests.java +++ b/spring-geode-samples/boot/configuration/src/test/java/example/app/crm/CustomerServiceApplicationIntegrationTests.java @@ -17,7 +17,7 @@ package example.app.crm; import static org.assertj.core.api.Assertions.assertThat; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Before; import org.junit.Test; diff --git a/spring-geode-samples/caching/http-session/src/main/java/example/app/caching/session/http/controller/CounterController.java b/spring-geode-samples/caching/http-session/src/main/java/example/app/caching/session/http/controller/CounterController.java index 2873c5ba..a9091c22 100644 --- a/spring-geode-samples/caching/http-session/src/main/java/example/app/caching/session/http/controller/CounterController.java +++ b/spring-geode-samples/caching/http-session/src/main/java/example/app/caching/session/http/controller/CounterController.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/spring-geode-samples/caching/http-session/src/test/java/example/app/caching/session/http/BootGeodeHttpSessionCachingApplicationIntegrationTests.java b/spring-geode-samples/caching/http-session/src/test/java/example/app/caching/session/http/BootGeodeHttpSessionCachingApplicationIntegrationTests.java index 449204fe..1085563d 100644 --- a/spring-geode-samples/caching/http-session/src/test/java/example/app/caching/session/http/BootGeodeHttpSessionCachingApplicationIntegrationTests.java +++ b/spring-geode-samples/caching/http-session/src/test/java/example/app/caching/session/http/BootGeodeHttpSessionCachingApplicationIntegrationTests.java @@ -19,8 +19,8 @@ import static org.assertj.core.api.Assertions.assertThat; import java.time.Instant; -import javax.annotation.Resource; -import javax.servlet.http.HttpSession; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpSession; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java index 7af7aa02..03465d09 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java @@ -15,8 +15,8 @@ */ package example.app.caching.inline.async.client.model; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.springframework.data.annotation.Id; import org.springframework.util.Assert; diff --git a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/PgaTourService.java b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/PgaTourService.java index 8afe4a6d..c1b2d854 100644 --- a/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/PgaTourService.java +++ b/spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/PgaTourService.java @@ -22,7 +22,7 @@ import java.util.Random; import java.util.Set; import java.util.function.Function; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; diff --git a/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_size/AsyncInlineCachingUsingQueueBatchSizeIntegrationTests.java b/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_size/AsyncInlineCachingUsingQueueBatchSizeIntegrationTests.java index b0280f77..3c2fbe36 100644 --- a/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_size/AsyncInlineCachingUsingQueueBatchSizeIntegrationTests.java +++ b/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_size/AsyncInlineCachingUsingQueueBatchSizeIntegrationTests.java @@ -21,7 +21,7 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newI import java.time.Duration; import java.util.Optional; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Before; import org.junit.Test; diff --git a/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_time_interval/AsyncInlineCachingUsingQueueBatchTimeIntervalIntegrationTests.java b/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_time_interval/AsyncInlineCachingUsingQueueBatchTimeIntervalIntegrationTests.java index cb8ae2d9..5fc6aa6d 100644 --- a/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_time_interval/AsyncInlineCachingUsingQueueBatchTimeIntervalIntegrationTests.java +++ b/spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_time_interval/AsyncInlineCachingUsingQueueBatchTimeIntervalIntegrationTests.java @@ -21,7 +21,7 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newI import java.time.Duration; import java.util.Optional; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Before; import org.junit.Test; diff --git a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/model/ResultHolder.java b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/model/ResultHolder.java index adef2913..7a57f4c9 100644 --- a/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/model/ResultHolder.java +++ b/spring-geode-samples/caching/inline/src/main/java/example/app/caching/inline/model/ResultHolder.java @@ -17,12 +17,12 @@ package example.app.caching.inline.model; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/spring-geode-samples/caching/inline/src/test/java/example/app/caching/inline/CalculatorApplicationIntegrationTests.java b/spring-geode-samples/caching/inline/src/test/java/example/app/caching/inline/CalculatorApplicationIntegrationTests.java index b22c21f8..b8890856 100644 --- a/spring-geode-samples/caching/inline/src/test/java/example/app/caching/inline/CalculatorApplicationIntegrationTests.java +++ b/spring-geode-samples/caching/inline/src/test/java/example/app/caching/inline/CalculatorApplicationIntegrationTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Before; import org.junit.Test; diff --git a/spring-geode-samples/caching/look-aside/src/test/java/example/app/caching/lookaside/BootGeodeLookAsideCachingApplicationIntegrationTests.java b/spring-geode-samples/caching/look-aside/src/test/java/example/app/caching/lookaside/BootGeodeLookAsideCachingApplicationIntegrationTests.java index 22dd683a..ed078ef6 100644 --- a/spring-geode-samples/caching/look-aside/src/test/java/example/app/caching/lookaside/BootGeodeLookAsideCachingApplicationIntegrationTests.java +++ b/spring-geode-samples/caching/look-aside/src/test/java/example/app/caching/lookaside/BootGeodeLookAsideCachingApplicationIntegrationTests.java @@ -17,7 +17,7 @@ package example.app.caching.lookaside; import static org.assertj.core.api.Assertions.assertThat; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.apache.geode.cache.Region; diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/HttpSessionAdapter.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/HttpSessionAdapter.java index 3cd16475..b473b0c2 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/HttpSessionAdapter.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/HttpSessionAdapter.java @@ -19,9 +19,9 @@ import java.time.Duration; import java.util.Collections; import java.util.Enumeration; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionContext; import org.springframework.lang.NonNull; import org.springframework.session.Session; diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SessionUtils.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SessionUtils.java index b9e42fc4..25f51fd6 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SessionUtils.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SessionUtils.java @@ -15,8 +15,8 @@ */ package org.springframework.session.web.servlet.http; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.springframework.geode.core.util.ObjectUtils; import org.springframework.lang.Nullable; diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SpringSessionSubstitutingSpyRequestPostProcessor.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SpringSessionSubstitutingSpyRequestPostProcessor.java index 7a2cd69f..a4fa14ea 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SpringSessionSubstitutingSpyRequestPostProcessor.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/session/web/servlet/http/SpringSessionSubstitutingSpyRequestPostProcessor.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.spy; import java.util.concurrent.atomic.AtomicReference; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpSession; diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/AbstractHttpSession.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/AbstractHttpSession.java index 974c5c3d..76d2fcf6 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/AbstractHttpSession.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/AbstractHttpSession.java @@ -20,8 +20,8 @@ import java.util.Enumeration; import java.util.List; import java.util.Objects; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionContext; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/HttpSessionProxy.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/HttpSessionProxy.java index e75c9ffa..94a5234a 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/HttpSessionProxy.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/main/java/org/springframework/web/servlet/http/HttpSessionProxy.java @@ -17,9 +17,9 @@ package org.springframework.web.servlet.http; import java.util.Enumeration; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionContext; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; diff --git a/spring-geode-tests/smoke-tests/mock-session-caching/src/test/java/example/app/geode/caching/session/MockPersistentSessionAccessSmokeTests.java b/spring-geode-tests/smoke-tests/mock-session-caching/src/test/java/example/app/geode/caching/session/MockPersistentSessionAccessSmokeTests.java index 8b2d8cc2..d2db4055 100644 --- a/spring-geode-tests/smoke-tests/mock-session-caching/src/test/java/example/app/geode/caching/session/MockPersistentSessionAccessSmokeTests.java +++ b/spring-geode-tests/smoke-tests/mock-session-caching/src/test/java/example/app/geode/caching/session/MockPersistentSessionAccessSmokeTests.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Optional; import java.util.UUID; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/model/Contact.java b/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/model/Contact.java index e713774f..82ebef6a 100644 --- a/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/model/Contact.java +++ b/spring-geode-tests/smoke-tests/multi-store/src/main/java/example/app/model/Contact.java @@ -15,9 +15,9 @@ */ package example.app.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.springframework.data.annotation.Id; import org.springframework.lang.NonNull; diff --git a/spring-geode/src/test/java/example/app/crm/model/Customer.java b/spring-geode/src/test/java/example/app/crm/model/Customer.java index 7190b09c..0cc92961 100644 --- a/spring-geode/src/test/java/example/app/crm/model/Customer.java +++ b/spring-geode/src/test/java/example/app/crm/model/Customer.java @@ -15,8 +15,8 @@ */ package example.app.crm.model; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.springframework.data.annotation.Id; import org.springframework.data.cassandra.core.mapping.Indexed; diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerIntegrationTests.java index d1f9319a..d7becec8 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerIntegrationTests.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Before; import org.junit.Test; diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerWithUserDefinedAsyncEventOperationRepositoryFunctionAndCustomAsyncEventErrorHandlerIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerWithUserDefinedAsyncEventOperationRepositoryFunctionAndCustomAsyncEventErrorHandlerIntegrationTests.java index af739589..0faa38f4 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerWithUserDefinedAsyncEventOperationRepositoryFunctionAndCustomAsyncEventErrorHandlerIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerWithUserDefinedAsyncEventOperationRepositoryFunctionAndCustomAsyncEventErrorHandlerIntegrationTests.java @@ -31,7 +31,7 @@ import java.util.Collections; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Before; import org.junit.Test; diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/CloudFoundryClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/CloudFoundryClusterNotAvailableConfigurationIntegrationTests.java index 3fc785f4..25befe0e 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/CloudFoundryClusterNotAvailableConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/CloudFoundryClusterNotAvailableConfigurationIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.geode.config.annotation; import static org.assertj.core.api.Assertions.assertThat; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.AfterClass; import org.junit.Before; diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java index 1958912d..bf18a5d6 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.AfterClass; import org.junit.Before; diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java index 4f565bbb..26c6e4ed 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.geode.config.annotation; import static org.assertj.core.api.Assertions.assertThat; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.AfterClass; import org.junit.Before; diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/KubernetesClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/KubernetesClusterNotAvailableConfigurationIntegrationTests.java index 1468b32f..859b0992 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/KubernetesClusterNotAvailableConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/KubernetesClusterNotAvailableConfigurationIntegrationTests.java @@ -17,7 +17,7 @@ package org.springframework.geode.config.annotation; import static org.assertj.core.api.Assertions.assertThat; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.AfterClass; import org.junit.Before;