This is an automated email from the ASF dual-hosted git repository. quantranhong1999 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 8a569ec01800fb434e747a242cce811fcdcc5395 Author: Quan Tran <[email protected]> AuthorDate: Fri Jul 3 18:31:46 2026 +0700 JAMES-4195 Better relocate OIDC Guice cache modules Move OIDC cache Guice bindings out of protocol-specific Guice modules. Redis OIDC cache wiring now lives under `guice/data-redis`. The Caffeine OIDC cache binding now lives under `guice/memory`. --- pom.xml | 8 ++++---- server/apps/distributed-app/pom.xml | 8 ++++---- .../james/CassandraRabbitMQJamesConfiguration.java | 2 +- .../james/CassandraRabbitMQJamesServerMain.java | 2 +- .../org/apache/james/MemoryJamesServerMain.java | 2 +- server/apps/postgres-app/pom.xml | 8 ++++---- .../apache/james/PostgresJamesConfiguration.java | 2 +- .../org/apache/james/PostgresJamesServerMain.java | 2 +- .../{protocols/jmap-redis => data-redis}/pom.xml | 24 ++++++++++++++-------- .../oidc/redis/OidcTokenCacheModuleChooser.java | 4 ++-- .../redis/RedisOidcTokenCacheKeyPrefixModule.java | 4 +--- .../oidc/redis/RedisOidcTokenCacheModule.java | 6 +----- .../oidc/memory}/CaffeineOidcTokenCacheModule.java | 3 +-- server/container/guice/pom.xml | 10 ++++----- .../pom.xml | 6 +++--- .../DistributedOidcAuthenticationTest.java | 2 +- .../memory-jmap-rfc-8621-integration-tests/pom.xml | 6 ++++++ .../pom.xml | 6 +++--- .../postgres/PostgresOidcAuthenticationTest.java | 2 +- 19 files changed, 57 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index fd8c390a37..8c58c28cfd 100644 --- a/pom.xml +++ b/pom.xml @@ -1563,24 +1563,24 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-imap</artifactId> + <artifactId>james-server-guice-data-redis</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap</artifactId> + <artifactId>james-server-guice-imap</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-jmap</artifactId> <version>${project.version}</version> - <type>test-jar</type> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-redis</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <version>${project.version}</version> + <type>test-jar</type> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/apps/distributed-app/pom.xml b/server/apps/distributed-app/pom.xml index 24c8e343c8..75c08436cd 100644 --- a/server/apps/distributed-app/pom.xml +++ b/server/apps/distributed-app/pom.xml @@ -180,6 +180,10 @@ <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-data-redis</artifactId> + </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-distributed</artifactId> @@ -198,10 +202,6 @@ <type>test-jar</type> <scope>test</scope> </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-redis</artifactId> - </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-jmx</artifactId> diff --git a/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java b/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java index 000bce61eb..934010258a 100644 --- a/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java +++ b/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java @@ -28,9 +28,9 @@ import org.apache.james.data.UsersRepositoryModuleChooser; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.filesystem.api.JamesDirectoriesProvider; import org.apache.james.jmap.JMAPModule; -import org.apache.james.jmap.oidc.redis.OidcTokenCacheModuleChooser; import org.apache.james.modules.blobstore.BlobStoreConfiguration; import org.apache.james.modules.queue.rabbitmq.MailQueueViewChoice; +import org.apache.james.oidc.redis.OidcTokenCacheModuleChooser; import org.apache.james.server.core.JamesServerResourceLoader; import org.apache.james.server.core.MissingArgumentException; import org.apache.james.server.core.configuration.Configuration; diff --git a/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java b/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java index 5ae708f834..bf1e57c255 100644 --- a/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java +++ b/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java @@ -27,7 +27,6 @@ import org.apache.james.eventsourcing.eventstore.EventNestedTypes; import org.apache.james.jmap.JMAPListenerModule; import org.apache.james.jmap.JMAPModule; import org.apache.james.jmap.oidc.JMAPOidcModule; -import org.apache.james.jmap.oidc.redis.OidcTokenCacheModuleChooser; import org.apache.james.json.DTO; import org.apache.james.json.DTOModule; import org.apache.james.modules.BlobExportMechanismModule; @@ -101,6 +100,7 @@ import org.apache.james.modules.vault.DeletedMessageVaultRoutesModule; import org.apache.james.modules.webadmin.CassandraRoutesModule; import org.apache.james.modules.webadmin.InconsistencySolvingRoutesModule; import org.apache.james.modules.webadmin.TasksCleanupRoutesModule; +import org.apache.james.oidc.redis.OidcTokenCacheModuleChooser; import org.apache.james.queue.pulsar.module.PulsarQueueModule; import org.apache.james.vault.VaultConfiguration; diff --git a/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesServerMain.java b/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesServerMain.java index f80c9c3a41..5c65ec5dc5 100644 --- a/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesServerMain.java +++ b/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesServerMain.java @@ -24,7 +24,6 @@ import org.apache.james.data.UsersRepositoryModuleChooser; import org.apache.james.jmap.JMAPListenerModule; import org.apache.james.jmap.JMAPModule; import org.apache.james.jmap.memory.pushsubscription.MemoryPushSubscriptionModule; -import org.apache.james.jmap.oidc.CaffeineOidcTokenCacheModule; import org.apache.james.jmap.oidc.JMAPOidcModule; import org.apache.james.jwt.JwtConfiguration; import org.apache.james.modules.BlobExportMechanismModule; @@ -71,6 +70,7 @@ import org.apache.james.modules.server.WebAdminMailOverWebModule; import org.apache.james.modules.server.WebAdminServerModule; import org.apache.james.modules.vault.DeletedMessageVaultModule; import org.apache.james.modules.vault.DeletedMessageVaultRoutesModule; +import org.apache.james.oidc.memory.CaffeineOidcTokenCacheModule; import org.apache.james.webadmin.WebAdminConfiguration; import org.apache.james.webadmin.authentication.AuthenticationFilter; import org.apache.james.webadmin.authentication.NoAuthenticationFilter; diff --git a/server/apps/postgres-app/pom.xml b/server/apps/postgres-app/pom.xml index efe731000e..dd25d10269 100644 --- a/server/apps/postgres-app/pom.xml +++ b/server/apps/postgres-app/pom.xml @@ -141,6 +141,10 @@ <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-data-redis</artifactId> + </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-distributed</artifactId> @@ -155,10 +159,6 @@ <type>test-jar</type> <scope>test</scope> </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-redis</artifactId> - </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-jmx</artifactId> diff --git a/server/apps/postgres-app/src/main/java/org/apache/james/PostgresJamesConfiguration.java b/server/apps/postgres-app/src/main/java/org/apache/james/PostgresJamesConfiguration.java index 0071b37259..4ab009894a 100644 --- a/server/apps/postgres-app/src/main/java/org/apache/james/PostgresJamesConfiguration.java +++ b/server/apps/postgres-app/src/main/java/org/apache/james/PostgresJamesConfiguration.java @@ -29,8 +29,8 @@ import org.apache.james.data.UsersRepositoryModuleChooser; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.filesystem.api.JamesDirectoriesProvider; import org.apache.james.jmap.JMAPModule; -import org.apache.james.jmap.oidc.redis.OidcTokenCacheModuleChooser; import org.apache.james.modules.blobstore.BlobStoreConfiguration; +import org.apache.james.oidc.redis.OidcTokenCacheModuleChooser; import org.apache.james.server.core.JamesServerResourceLoader; import org.apache.james.server.core.MissingArgumentException; import org.apache.james.server.core.configuration.Configuration; diff --git a/server/apps/postgres-app/src/main/java/org/apache/james/PostgresJamesServerMain.java b/server/apps/postgres-app/src/main/java/org/apache/james/PostgresJamesServerMain.java index 0c4abb3655..25493babf4 100644 --- a/server/apps/postgres-app/src/main/java/org/apache/james/PostgresJamesServerMain.java +++ b/server/apps/postgres-app/src/main/java/org/apache/james/PostgresJamesServerMain.java @@ -30,7 +30,6 @@ import org.apache.james.eventsourcing.eventstore.EventNestedTypes; import org.apache.james.jmap.JMAPListenerModule; import org.apache.james.jmap.JMAPModule; import org.apache.james.jmap.oidc.JMAPOidcModule; -import org.apache.james.jmap.oidc.redis.OidcTokenCacheModuleChooser; import org.apache.james.json.DTO; import org.apache.james.json.DTOModule; import org.apache.james.modules.BlobExportMechanismModule; @@ -97,6 +96,7 @@ import org.apache.james.modules.task.DistributedTaskManagerModule; import org.apache.james.modules.task.PostgresTaskExecutionDetailsProjectionGuiceModule; import org.apache.james.modules.vault.DeletedMessageVaultRoutesModule; import org.apache.james.modules.webadmin.TasksCleanupRoutesModule; +import org.apache.james.oidc.redis.OidcTokenCacheModuleChooser; import org.apache.james.vault.VaultConfiguration; import com.google.common.collect.ImmutableList; diff --git a/server/container/guice/protocols/jmap-redis/pom.xml b/server/container/guice/data-redis/pom.xml similarity index 75% rename from server/container/guice/protocols/jmap-redis/pom.xml rename to server/container/guice/data-redis/pom.xml index 98eba576fe..44ea2503bf 100644 --- a/server/container/guice/protocols/jmap-redis/pom.xml +++ b/server/container/guice/data-redis/pom.xml @@ -23,13 +23,13 @@ <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> <version>3.10.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> - <artifactId>james-server-guice-jmap-redis</artifactId> + <artifactId>james-server-guice-data-redis</artifactId> - <name>Apache James :: Server :: Guice :: JMAP Redis</name> - <description>Redis related Guice bindings for JMAP RFC8621</description> + <name>Apache James :: Server :: Guice :: Data :: Redis</name> + <description>Redis data modules for Guice implementation of James server</description> <dependencies> <dependency> @@ -38,23 +38,31 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-redis</artifactId> + <artifactId>james-server-data-api</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-configuration</artifactId> + <artifactId>james-server-data-redis</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap</artifactId> + <artifactId>james-server-guice-configuration</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-jmap</artifactId> + <artifactId>james-server-guice-memory</artifactId> </dependency> <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> </dependencies> </project> diff --git a/server/container/guice/protocols/jmap-redis/src/main/java/org/apache/james/jmap/oidc/redis/OidcTokenCacheModuleChooser.java b/server/container/guice/data-redis/src/main/java/org/apache/james/oidc/redis/OidcTokenCacheModuleChooser.java similarity index 96% rename from server/container/guice/protocols/jmap-redis/src/main/java/org/apache/james/jmap/oidc/redis/OidcTokenCacheModuleChooser.java rename to server/container/guice/data-redis/src/main/java/org/apache/james/oidc/redis/OidcTokenCacheModuleChooser.java index 828ee21bac..4cb1f3b793 100644 --- a/server/container/guice/protocols/jmap-redis/src/main/java/org/apache/james/jmap/oidc/redis/OidcTokenCacheModuleChooser.java +++ b/server/container/guice/data-redis/src/main/java/org/apache/james/oidc/redis/OidcTokenCacheModuleChooser.java @@ -17,12 +17,12 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.oidc.redis; +package org.apache.james.oidc.redis; import java.io.FileNotFoundException; import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.james.jmap.oidc.CaffeineOidcTokenCacheModule; +import org.apache.james.oidc.memory.CaffeineOidcTokenCacheModule; import org.apache.james.utils.PropertiesProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/container/guice/protocols/jmap-redis/src/main/java/org/apache/james/jmap/oidc/redis/RedisOidcTokenCacheKeyPrefixModule.java b/server/container/guice/data-redis/src/main/java/org/apache/james/oidc/redis/RedisOidcTokenCacheKeyPrefixModule.java similarity index 93% rename from server/container/guice/protocols/jmap-redis/src/main/java/org/apache/james/jmap/oidc/redis/RedisOidcTokenCacheKeyPrefixModule.java rename to server/container/guice/data-redis/src/main/java/org/apache/james/oidc/redis/RedisOidcTokenCacheKeyPrefixModule.java index b020ff146e..7c2e7a3051 100644 --- a/server/container/guice/protocols/jmap-redis/src/main/java/org/apache/james/jmap/oidc/redis/RedisOidcTokenCacheKeyPrefixModule.java +++ b/server/container/guice/data-redis/src/main/java/org/apache/james/oidc/redis/RedisOidcTokenCacheKeyPrefixModule.java @@ -17,9 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.oidc.redis; - -import org.apache.james.oidc.redis.RedisOidcTokenCacheKeyPrefix; +package org.apache.james.oidc.redis; import com.google.inject.AbstractModule; diff --git a/server/container/guice/protocols/jmap-redis/src/main/java/org/apache/james/jmap/oidc/redis/RedisOidcTokenCacheModule.java b/server/container/guice/data-redis/src/main/java/org/apache/james/oidc/redis/RedisOidcTokenCacheModule.java similarity index 93% rename from server/container/guice/protocols/jmap-redis/src/main/java/org/apache/james/jmap/oidc/redis/RedisOidcTokenCacheModule.java rename to server/container/guice/data-redis/src/main/java/org/apache/james/oidc/redis/RedisOidcTokenCacheModule.java index 1c5ebaa8af..e591d1523e 100644 --- a/server/container/guice/protocols/jmap-redis/src/main/java/org/apache/james/jmap/oidc/redis/RedisOidcTokenCacheModule.java +++ b/server/container/guice/data-redis/src/main/java/org/apache/james/oidc/redis/RedisOidcTokenCacheModule.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.oidc.redis; +package org.apache.james.oidc.redis; import java.io.FileNotFoundException; import java.time.Duration; @@ -28,10 +28,6 @@ import org.apache.james.backends.redis.RedisReactiveCommandsFactory; import org.apache.james.oidc.OidcTokenCache; import org.apache.james.oidc.OidcTokenCacheConfiguration; import org.apache.james.oidc.TokenInfoResolver; -import org.apache.james.oidc.redis.RedisOidcTokenCache; -import org.apache.james.oidc.redis.RedisOidcTokenCacheConfiguration; -import org.apache.james.oidc.redis.RedisOidcTokenCacheKeyPrefix; -import org.apache.james.oidc.redis.RedisTokenCacheCommands; import org.apache.james.utils.PropertiesProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/oidc/CaffeineOidcTokenCacheModule.java b/server/container/guice/memory/src/main/java/org/apache/james/oidc/memory/CaffeineOidcTokenCacheModule.java similarity index 94% rename from server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/oidc/CaffeineOidcTokenCacheModule.java rename to server/container/guice/memory/src/main/java/org/apache/james/oidc/memory/CaffeineOidcTokenCacheModule.java index 6c9006a95c..348b97d8a6 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/oidc/CaffeineOidcTokenCacheModule.java +++ b/server/container/guice/memory/src/main/java/org/apache/james/oidc/memory/CaffeineOidcTokenCacheModule.java @@ -17,10 +17,9 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.oidc; +package org.apache.james.oidc.memory; import org.apache.james.oidc.OidcTokenCache; -import org.apache.james.oidc.memory.CaffeineOidcTokenCache; import com.google.inject.AbstractModule; import com.google.inject.Scopes; diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index ca176f2a53..52fbfc273d 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -44,6 +44,7 @@ <module>configuration</module> <module>data-cassandra</module> <module>data-ldap</module> + <module>data-redis</module> <module>distributed</module> <module>jmx</module> <module>jpa-common</module> @@ -62,7 +63,6 @@ <module>postgres-common</module> <module>protocols/imap</module> <module>protocols/jmap</module> - <module>protocols/jmap-redis</module> <module>protocols/lmtp</module> <module>protocols/managedsieve</module> <module>protocols/netty</module> @@ -127,24 +127,24 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-distributed</artifactId> + <artifactId>james-server-guice-data-redis</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap</artifactId> + <artifactId>james-server-guice-distributed</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-jmap</artifactId> <version>${project.version}</version> - <type>test-jar</type> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-redis</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <version>${project.version}</version> + <type>test-jar</type> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml index b3599e1bd7..dcf33aa14b 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml +++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml @@ -124,13 +124,13 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap</artifactId> - <type>test-jar</type> + <artifactId>james-server-guice-data-redis</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-redis</artifactId> + <artifactId>james-server-guice-jmap</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedOidcAuthenticationTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedOidcAuthenticationTest.java index 342fe33646..fd69080fde 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedOidcAuthenticationTest.java +++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/DistributedOidcAuthenticationTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.rfc8621.distributed; -import static org.apache.james.jmap.oidc.redis.OidcTokenCacheModuleChooser.Implementation.REDIS; +import static org.apache.james.oidc.redis.OidcTokenCacheModuleChooser.Implementation.REDIS; import org.apache.james.CassandraExtension; import org.apache.james.CassandraRabbitMQJamesConfiguration; diff --git a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml index 060a944195..7034d10484 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml +++ b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml @@ -42,6 +42,12 @@ <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-memory</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-memory-app</artifactId> diff --git a/server/protocols/jmap-rfc-8621-integration-tests/postgres-jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/postgres-jmap-rfc-8621-integration-tests/pom.xml index 321aaa8661..b433daf768 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/postgres-jmap-rfc-8621-integration-tests/pom.xml +++ b/server/protocols/jmap-rfc-8621-integration-tests/postgres-jmap-rfc-8621-integration-tests/pom.xml @@ -62,13 +62,13 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap</artifactId> - <type>test-jar</type> + <artifactId>james-server-guice-data-redis</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-redis</artifactId> + <artifactId>james-server-guice-jmap</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> diff --git a/server/protocols/jmap-rfc-8621-integration-tests/postgres-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/postgres/PostgresOidcAuthenticationTest.java b/server/protocols/jmap-rfc-8621-integration-tests/postgres-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/postgres/PostgresOidcAuthenticationTest.java index e10b617dc9..57b52c106d 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/postgres-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/postgres/PostgresOidcAuthenticationTest.java +++ b/server/protocols/jmap-rfc-8621-integration-tests/postgres-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/postgres/PostgresOidcAuthenticationTest.java @@ -20,7 +20,7 @@ package org.apache.james.jmap.rfc8621.postgres; import static org.apache.james.data.UsersRepositoryModuleChooser.Implementation.DEFAULT; -import static org.apache.james.jmap.oidc.redis.OidcTokenCacheModuleChooser.Implementation.REDIS; +import static org.apache.james.oidc.redis.OidcTokenCacheModuleChooser.Implementation.REDIS; import java.util.Optional; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
