Google Git Google Git
Sign in
gerrit/plugins/oauth/refs/heads/master^!/.
commit
e3555596568496855f0c0c055a54e127854706b3
[log]
author
David Ostrovsky <david@ostrovsky.org>
Sun Oct 11 09:40:44 2026 +0200
committer
David Ostrovsky <david@ostrovsky.org>
Sun Oct 11 09:54:42 2026 +0200
tree
67c6f2a0313be503822d92aa98d73265db2e223f
parent
75d4e1639e6a096f51ad733ea4e927cbf0367843 [diff] 
Bazel: Remove Maven-era directory structure

Migrate source and resource trees from the legacy Maven layout
(src/main/java, src/main/resources) to standard Bazel top-level
directories (java, resources).

Update BUILD.bazel targets, package label dependencies, resource
globs, and sub-package BUILD.bazel files across provider modules
to reflect the new paths.

Change-Id: I4d6881a6ab867cc8252ab75e29e49ec37df396b2

diff --git a/BUILD.bazel b/BUILD.bazel
index 257f3fc..c2a8ef0 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel

@@ -3,12 +3,12 @@
 
 filegroup(
     name = "oauth_resources",
-    srcs = glob(["src/main/resources/**/*"]),
+    srcs = glob(["resources/**/*"]),
     visibility = ["//plugins/oauth:__subpackages__"],
 )
 
 gerrit_plugin(
-    srcs = glob(["src/main/java/**/*.java"]),
+    srcs = glob(["java/**/*.java"]),
     ext_deps = ["com.nimbusds:nimbus-jose-jwt"],
     manifest_entries = [
         "Gerrit-PluginName: gerrit-oauth-provider",
@@ -20,7 +20,7 @@
     plugin = "oauth",
     resources = [":oauth_resources"],
     deps = [
-        "//plugins/oauth/src/main/java/com/googlesource/gerrit/plugins/oauth/" + provider
+        "//plugins/oauth/java/com/googlesource/gerrit/plugins/oauth/" + provider
         for provider in [
             "airvantage",
             "azure",

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/InitOAuth.java b/java/com/googlesource/gerrit/plugins/oauth/InitOAuth.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/InitOAuth.java
rename to java/com/googlesource/gerrit/plugins/oauth/InitOAuth.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/Module.java b/java/com/googlesource/gerrit/plugins/oauth/Module.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/Module.java
rename to java/com/googlesource/gerrit/plugins/oauth/Module.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantageInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantageInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantageInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantageInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantageOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantageOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantageOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantageOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantagePluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantagePluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantagePluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantagePluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/airvantage/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/airvantage/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/airvantage/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/airvantage/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzureActiveDirectoryService.java b/java/com/googlesource/gerrit/plugins/oauth/azure/AzureActiveDirectoryService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzureActiveDirectoryService.java
rename to java/com/googlesource/gerrit/plugins/oauth/azure/AzureActiveDirectoryService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzureInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/azure/AzureInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzureInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/azure/AzureInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzureModule.java b/java/com/googlesource/gerrit/plugins/oauth/azure/AzureModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzureModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/azure/AzureModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzureOAuthLoginProvider.java b/java/com/googlesource/gerrit/plugins/oauth/azure/AzureOAuthLoginProvider.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzureOAuthLoginProvider.java
rename to java/com/googlesource/gerrit/plugins/oauth/azure/AzureOAuthLoginProvider.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzurePluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/azure/AzurePluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzurePluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/azure/AzurePluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzureTokenValidator.java b/java/com/googlesource/gerrit/plugins/oauth/azure/AzureTokenValidator.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzureTokenValidator.java
rename to java/com/googlesource/gerrit/plugins/oauth/azure/AzureTokenValidator.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzureUserInfoMapper.java b/java/com/googlesource/gerrit/plugins/oauth/azure/AzureUserInfoMapper.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/azure/AzureUserInfoMapper.java
rename to java/com/googlesource/gerrit/plugins/oauth/azure/AzureUserInfoMapper.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/azure/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/azure/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/azure/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/azure/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/AbstractOAuthInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/base/AbstractOAuthInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/AbstractOAuthInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/AbstractOAuthInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/AbstractOAuthModule.java b/java/com/googlesource/gerrit/plugins/oauth/base/AbstractOAuthModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/AbstractOAuthModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/AbstractOAuthModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/AbstractOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/base/AbstractOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/AbstractOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/AbstractOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/AbstractTokenValidatorLoginProvider.java b/java/com/googlesource/gerrit/plugins/oauth/base/AbstractTokenValidatorLoginProvider.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/AbstractTokenValidatorLoginProvider.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/AbstractTokenValidatorLoginProvider.java

diff --git a/java/com/googlesource/gerrit/plugins/oauth/base/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/base/BUILD.bazel
new file mode 100644
index 0000000..628469f
--- /dev/null
+++ b/java/com/googlesource/gerrit/plugins/oauth/base/BUILD.bazel

@@ -0,0 +1,11 @@
+load("@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl", "gerrit_plugin_library")
+
+gerrit_plugin_library(
+    name = "base",
+    srcs = glob(["*.java"]),
+    visibility = ["//plugins/oauth:__subpackages__"],
+    deps = [
+        "//plugins/oauth/java/com/googlesource/gerrit/plugins/oauth/client",
+        "//plugins/oauth/java/com/googlesource/gerrit/plugins/oauth/utils",
+    ],
+)

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/DisabledOAuthLoginProvider.java b/java/com/googlesource/gerrit/plugins/oauth/base/DisabledOAuthLoginProvider.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/DisabledOAuthLoginProvider.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/DisabledOAuthLoginProvider.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/GitOverHttpModule.java b/java/com/googlesource/gerrit/plugins/oauth/base/GitOverHttpModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/GitOverHttpModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/GitOverHttpModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/HttpOAuthClientFactory.java b/java/com/googlesource/gerrit/plugins/oauth/base/HttpOAuthClientFactory.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/HttpOAuthClientFactory.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/HttpOAuthClientFactory.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthConfigKeys.java b/java/com/googlesource/gerrit/plugins/oauth/base/OAuthConfigKeys.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthConfigKeys.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/OAuthConfigKeys.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthExternalIdCreator.java b/java/com/googlesource/gerrit/plugins/oauth/base/OAuthExternalIdCreator.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthExternalIdCreator.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/OAuthExternalIdCreator.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthPluginConfigFactory.java b/java/com/googlesource/gerrit/plugins/oauth/base/OAuthPluginConfigFactory.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthPluginConfigFactory.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/OAuthPluginConfigFactory.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthServiceProviderConfig.java b/java/com/googlesource/gerrit/plugins/oauth/base/OAuthServiceProviderConfig.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthServiceProviderConfig.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/OAuthServiceProviderConfig.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthServiceProviderExternalIdScheme.java b/java/com/googlesource/gerrit/plugins/oauth/base/OAuthServiceProviderExternalIdScheme.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthServiceProviderExternalIdScheme.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/OAuthServiceProviderExternalIdScheme.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCache.java b/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCache.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCache.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCache.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCacheCleaner.java b/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCacheCleaner.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCacheCleaner.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCacheCleaner.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidator.java b/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidator.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidator.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidator.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/StandardIdTokenOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/base/StandardIdTokenOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/StandardIdTokenOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/StandardIdTokenOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/StandardResourceOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/base/StandardResourceOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/StandardResourceOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/StandardResourceOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/SupportedLoginProvider.java b/java/com/googlesource/gerrit/plugins/oauth/base/SupportedLoginProvider.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/base/SupportedLoginProvider.java
rename to java/com/googlesource/gerrit/plugins/oauth/base/SupportedLoginProvider.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/bitbucket/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketPluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketPluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketPluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketPluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/cas/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/cas/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/cas/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/cas/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/cas/CasInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/cas/CasInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/cas/CasInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/cas/CasInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/cas/CasOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/cas/CasOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/cas/CasOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/cas/CasOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/cas/CasPluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/cas/CasPluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/cas/CasPluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/cas/CasPluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/client/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/client/BUILD.bazel
similarity index 70%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/client/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/client/BUILD.bazel
index ab1151f..797cabb 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/oauth/client/BUILD.bazel
+++ b/java/com/googlesource/gerrit/plugins/oauth/client/BUILD.bazel

@@ -4,5 +4,5 @@
     name = "client",
     srcs = glob(["*.java"]),
     visibility = ["//plugins/oauth:__subpackages__"],
-    deps = ["//plugins/oauth/src/main/java/com/googlesource/gerrit/plugins/oauth/utils"],
+    deps = ["//plugins/oauth/java/com/googlesource/gerrit/plugins/oauth/utils"],
 )

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/client/BearerPlacement.java b/java/com/googlesource/gerrit/plugins/oauth/client/BearerPlacement.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/client/BearerPlacement.java
rename to java/com/googlesource/gerrit/plugins/oauth/client/BearerPlacement.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/client/ClientAuthStyle.java b/java/com/googlesource/gerrit/plugins/oauth/client/ClientAuthStyle.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/client/ClientAuthStyle.java
rename to java/com/googlesource/gerrit/plugins/oauth/client/ClientAuthStyle.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/client/HttpOAuthClient.java b/java/com/googlesource/gerrit/plugins/oauth/client/HttpOAuthClient.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/client/HttpOAuthClient.java
rename to java/com/googlesource/gerrit/plugins/oauth/client/HttpOAuthClient.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/client/OAuthClient.java b/java/com/googlesource/gerrit/plugins/oauth/client/OAuthClient.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/client/OAuthClient.java
rename to java/com/googlesource/gerrit/plugins/oauth/client/OAuthClient.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/client/OAuthHttpTransport.java b/java/com/googlesource/gerrit/plugins/oauth/client/OAuthHttpTransport.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/client/OAuthHttpTransport.java
rename to java/com/googlesource/gerrit/plugins/oauth/client/OAuthHttpTransport.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/client/OAuthProviderEndpoints.java b/java/com/googlesource/gerrit/plugins/oauth/client/OAuthProviderEndpoints.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/client/OAuthProviderEndpoints.java
rename to java/com/googlesource/gerrit/plugins/oauth/client/OAuthProviderEndpoints.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/client/TokenResponseFormat.java b/java/com/googlesource/gerrit/plugins/oauth/client/TokenResponseFormat.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/client/TokenResponseFormat.java
rename to java/com/googlesource/gerrit/plugins/oauth/client/TokenResponseFormat.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/dex/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/dex/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/dex/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/dex/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/dex/DexApi.java b/java/com/googlesource/gerrit/plugins/oauth/dex/DexApi.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/dex/DexApi.java
rename to java/com/googlesource/gerrit/plugins/oauth/dex/DexApi.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/dex/DexInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/dex/DexInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/dex/DexInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/dex/DexInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/dex/DexOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/dex/DexOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/dex/DexOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/dex/DexOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/dex/DexPluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/dex/DexPluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/dex/DexPluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/dex/DexPluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/discovery/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/discovery/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryModule.java b/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthLoginProvider.java b/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthLoginProvider.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthLoginProvider.java
rename to java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthLoginProvider.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOpenIdConnect.java b/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOpenIdConnect.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOpenIdConnect.java
rename to java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOpenIdConnect.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryPluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryPluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryPluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryPluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryTokenValidator.java b/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryTokenValidator.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryTokenValidator.java
rename to java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryTokenValidator.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryUserInfoMapper.java b/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryUserInfoMapper.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryUserInfoMapper.java
rename to java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryUserInfoMapper.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/facebook/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/facebook/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/facebook/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/facebook/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookPluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookPluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookPluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookPluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/github/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/github/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/github/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/github/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHub2Api.java b/java/com/googlesource/gerrit/plugins/oauth/github/GitHub2Api.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHub2Api.java
rename to java/com/googlesource/gerrit/plugins/oauth/github/GitHub2Api.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenClient.java b/java/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenClient.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenClient.java
rename to java/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenClient.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenValidator.java b/java/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenValidator.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenValidator.java
rename to java/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenValidator.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/github/GitHubInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/github/GitHubInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubModule.java b/java/com/googlesource/gerrit/plugins/oauth/github/GitHubModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/github/GitHubModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthLoginProvider.java b/java/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthLoginProvider.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthLoginProvider.java
rename to java/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthLoginProvider.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubPluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/github/GitHubPluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubPluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/github/GitHubPluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubUserInfoMapper.java b/java/com/googlesource/gerrit/plugins/oauth/github/GitHubUserInfoMapper.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/github/GitHubUserInfoMapper.java
rename to java/com/googlesource/gerrit/plugins/oauth/github/GitHubUserInfoMapper.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/gitlab/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/gitlab/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabApi.java b/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabApi.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabApi.java
rename to java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabApi.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabModule.java b/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabOAuthLoginProvider.java b/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabOAuthLoginProvider.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabOAuthLoginProvider.java
rename to java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabOAuthLoginProvider.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabPluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabPluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabPluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabPluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabTokenInfoValidator.java b/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabTokenInfoValidator.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabTokenInfoValidator.java
rename to java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabTokenInfoValidator.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabUserInfoMapper.java b/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabUserInfoMapper.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabUserInfoMapper.java
rename to java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabUserInfoMapper.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/google/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/google/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/google/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/google/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/google/Google2Api.java b/java/com/googlesource/gerrit/plugins/oauth/google/Google2Api.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/google/Google2Api.java
rename to java/com/googlesource/gerrit/plugins/oauth/google/Google2Api.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/google/GoogleClientId.java b/java/com/googlesource/gerrit/plugins/oauth/google/GoogleClientId.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/google/GoogleClientId.java
rename to java/com/googlesource/gerrit/plugins/oauth/google/GoogleClientId.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/google/GoogleInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/google/GoogleInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/google/GoogleInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/google/GoogleInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/google/GoogleModule.java b/java/com/googlesource/gerrit/plugins/oauth/google/GoogleModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/google/GoogleModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/google/GoogleModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthLoginProvider.java b/java/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthLoginProvider.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthLoginProvider.java
rename to java/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthLoginProvider.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/google/GooglePluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/google/GooglePluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/google/GooglePluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/google/GooglePluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/google/GoogleTokenInfoValidator.java b/java/com/googlesource/gerrit/plugins/oauth/google/GoogleTokenInfoValidator.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/google/GoogleTokenInfoValidator.java
rename to java/com/googlesource/gerrit/plugins/oauth/google/GoogleTokenInfoValidator.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/jwt/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/jwt/BUILD.bazel
similarity index 75%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/jwt/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/jwt/BUILD.bazel
index cd6e7f6..44902d9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/oauth/jwt/BUILD.bazel
+++ b/java/com/googlesource/gerrit/plugins/oauth/jwt/BUILD.bazel

@@ -6,5 +6,5 @@
     ext_deps = ["com.nimbusds:nimbus-jose-jwt"],
     plugin = "oauth",
     visibility = ["//plugins/oauth:__subpackages__"],
-    deps = ["//plugins/oauth/src/main/java/com/googlesource/gerrit/plugins/oauth/utils"],
+    deps = ["//plugins/oauth/java/com/googlesource/gerrit/plugins/oauth/utils"],
 )

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/jwt/JwksCache.java b/java/com/googlesource/gerrit/plugins/oauth/jwt/JwksCache.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/jwt/JwksCache.java
rename to java/com/googlesource/gerrit/plugins/oauth/jwt/JwksCache.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/jwt/OidcJwtValidator.java b/java/com/googlesource/gerrit/plugins/oauth/jwt/OidcJwtValidator.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/jwt/OidcJwtValidator.java
rename to java/com/googlesource/gerrit/plugins/oauth/jwt/OidcJwtValidator.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/jwt/ValidatedClaims.java b/java/com/googlesource/gerrit/plugins/oauth/jwt/ValidatedClaims.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/jwt/ValidatedClaims.java
rename to java/com/googlesource/gerrit/plugins/oauth/jwt/ValidatedClaims.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/keycloak/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/keycloak/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakApi.java b/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakApi.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakApi.java
rename to java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakApi.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakModule.java b/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthLoginProvider.java b/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthLoginProvider.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthLoginProvider.java
rename to java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthLoginProvider.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakPluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakPluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakPluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakPluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakTokenValidator.java b/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakTokenValidator.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakTokenValidator.java
rename to java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakTokenValidator.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakUserInfoMapper.java b/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakUserInfoMapper.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakUserInfoMapper.java
rename to java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakUserInfoMapper.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/phabricator/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/phabricator/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/phabricator/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/phabricator/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorPluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorPluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorPluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorPluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/sapias/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/sapias/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasInitStep.java b/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasInitStep.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasInitStep.java
rename to java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasInitStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasModule.java b/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasOAuthLoginProvider.java b/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasOAuthLoginProvider.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasOAuthLoginProvider.java
rename to java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasOAuthLoginProvider.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasOAuthService.java b/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasOAuthService.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasOAuthService.java
rename to java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasPluginModule.java b/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasPluginModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasPluginModule.java
rename to java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasPluginModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasTokenValidatorProvider.java b/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasTokenValidatorProvider.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasTokenValidatorProvider.java
rename to java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasTokenValidatorProvider.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/utils/BUILD.bazel b/java/com/googlesource/gerrit/plugins/oauth/utils/BUILD.bazel
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/utils/BUILD.bazel
rename to java/com/googlesource/gerrit/plugins/oauth/utils/BUILD.bazel

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/utils/JsonUtil.java b/java/com/googlesource/gerrit/plugins/oauth/utils/JsonUtil.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/utils/JsonUtil.java
rename to java/com/googlesource/gerrit/plugins/oauth/utils/JsonUtil.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/utils/OAuthUrls.java b/java/com/googlesource/gerrit/plugins/oauth/utils/OAuthUrls.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/oauth/utils/OAuthUrls.java
rename to java/com/googlesource/gerrit/plugins/oauth/utils/OAuthUrls.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/ModuleTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/ModuleTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/ModuleTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/ModuleTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/StandardIdTokenOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/StandardIdTokenOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/StandardIdTokenOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/StandardIdTokenOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantageOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantageOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantageOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/airvantage/AirVantageOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/airvantage/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/airvantage/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/airvantage/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/airvantage/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/azure/AzureActiveDirectoryServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/azure/AzureActiveDirectoryServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/azure/AzureActiveDirectoryServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/azure/AzureActiveDirectoryServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/azure/AzureTokenValidatorTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/azure/AzureTokenValidatorTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/azure/AzureTokenValidatorTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/azure/AzureTokenValidatorTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/azure/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/azure/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/azure/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/azure/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/base/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/base/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/base/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/base/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCacheCleanerTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCacheCleanerTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCacheCleanerTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCacheCleanerTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCacheTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCacheTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCacheTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/base/OAuthTokenValidationCacheTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/bitbucket/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/bitbucket/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/bitbucket/BitbucketOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/cas/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/cas/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/cas/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/cas/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/cas/CasOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/cas/CasOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/cas/CasOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/cas/CasOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/client/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/client/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/client/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/client/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/client/HttpOAuthClientTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/client/HttpOAuthClientTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/client/HttpOAuthClientTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/client/HttpOAuthClientTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/client/OAuthHttpTransportTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/client/OAuthHttpTransportTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/client/OAuthHttpTransportTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/client/OAuthHttpTransportTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/dex/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/dex/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/dex/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/dex/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/dex/DexApiTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/dex/DexApiTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/dex/DexApiTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/dex/DexApiTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/dex/DexOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/dex/DexOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/dex/DexOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/dex/DexOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/discovery/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/discovery/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/discovery/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/discovery/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthLoginProviderTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthLoginProviderTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthLoginProviderTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthLoginProviderTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryTokenValidatorTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryTokenValidatorTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryTokenValidatorTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/discovery/DiscoveryTokenValidatorTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/facebook/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/facebook/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/facebook/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/facebook/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/facebook/FacebookOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/facebook/FacebookOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/facebook/FacebookOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/github/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/github/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/github/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/github/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/github/GitHub2ApiTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/github/GitHub2ApiTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/github/GitHub2ApiTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/github/GitHub2ApiTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenClientTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenClientTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenClientTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenClientTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenValidatorTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenValidatorTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenValidatorTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/github/GitHubCheckTokenValidatorTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthLoginProviderTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthLoginProviderTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthLoginProviderTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthLoginProviderTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/github/GitHubOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/github/GitHubUserInfoMapperTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/github/GitHubUserInfoMapperTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/github/GitHubUserInfoMapperTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/github/GitHubUserInfoMapperTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/github/GithubApiUrlTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/github/GithubApiUrlTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/github/GithubApiUrlTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/github/GithubApiUrlTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/gitlab/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/gitlab/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/gitlab/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/gitlab/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabTokenInfoValidatorTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabTokenInfoValidatorTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabTokenInfoValidatorTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabTokenInfoValidatorTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabUserInfoMapperTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabUserInfoMapperTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabUserInfoMapperTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/gitlab/GitLabUserInfoMapperTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/google/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/google/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/google/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/google/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/google/Google2ApiTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/google/Google2ApiTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/google/Google2ApiTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/google/Google2ApiTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthLoginProviderTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthLoginProviderTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthLoginProviderTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthLoginProviderTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/google/GoogleOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/google/GoogleTokenInfoValidatorTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/google/GoogleTokenInfoValidatorTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/google/GoogleTokenInfoValidatorTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/google/GoogleTokenInfoValidatorTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/jwt/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/jwt/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/jwt/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/jwt/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/jwt/JwksCacheTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/jwt/JwksCacheTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/jwt/JwksCacheTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/jwt/JwksCacheTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/jwt/OidcJwtValidatorTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/jwt/OidcJwtValidatorTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/jwt/OidcJwtValidatorTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/jwt/OidcJwtValidatorTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/keycloak/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/keycloak/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/keycloak/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/keycloak/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakApiTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakApiTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakApiTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakApiTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthLoginProviderTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthLoginProviderTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthLoginProviderTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthLoginProviderTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakTokenValidatorTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakTokenValidatorTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakTokenValidatorTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakTokenValidatorTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakUserInfoMapperTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakUserInfoMapperTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakUserInfoMapperTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/keycloak/KeycloakUserInfoMapperTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/phabricator/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/phabricator/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/phabricator/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/phabricator/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/phabricator/PhabricatorOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/sapias/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/sapias/BUILD.bazel
similarity index 87%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/sapias/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/sapias/BUILD.bazel
index 15a2e1d..7438feb 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/oauth/sapias/BUILD.bazel
+++ b/javatests/com/googlesource/gerrit/plugins/oauth/sapias/BUILD.bazel

@@ -21,6 +21,6 @@
     srcs = glob(["*.java"]),
     deps = CORE + [
         ":sapias_test_deps",
-        "//plugins/oauth/src/main/java/com/googlesource/gerrit/plugins/oauth/sapias",
+        "//plugins/oauth/java/com/googlesource/gerrit/plugins/oauth/sapias",
     ],
 )

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasOAuthServiceTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasOAuthServiceTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasOAuthServiceTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/sapias/SAPIasOAuthServiceTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/utils/BUILD.bazel b/javatests/com/googlesource/gerrit/plugins/oauth/utils/BUILD.bazel
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/utils/BUILD.bazel
rename to javatests/com/googlesource/gerrit/plugins/oauth/utils/BUILD.bazel

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/utils/JsonUtilTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/utils/JsonUtilTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/utils/JsonUtilTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/utils/JsonUtilTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/oauth/utils/OAuthUrlsTest.java b/javatests/com/googlesource/gerrit/plugins/oauth/utils/OAuthUrlsTest.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/oauth/utils/OAuthUrlsTest.java
rename to javatests/com/googlesource/gerrit/plugins/oauth/utils/OAuthUrlsTest.java

diff --git a/provider.bzl b/provider.bzl
index 7536b80..6400854 100644
--- a/provider.bzl
+++ b/provider.bzl

@@ -8,8 +8,8 @@
 )
 
 _PKG = "com.googlesource.gerrit.plugins.oauth."
-_MAIN = "//plugins/oauth/src/main/java/com/googlesource/gerrit/plugins/oauth/"
-_NIMBUS = "//plugins/oauth/src/test/java/com/googlesource/gerrit/plugins/oauth:providers_test_deps"
+_MAIN = "//plugins/oauth/java/com/googlesource/gerrit/plugins/oauth/"
+_NIMBUS = "//plugins/oauth/javatests/com/googlesource/gerrit/plugins/oauth:providers_test_deps"
 
 # The shared-core libraries every OAuth artifact compiles against and bundles.
 CORE = [_MAIN + pkg for pkg in [

diff --git a/src/main/resources/Documentation/build.md b/resources/Documentation/build.md
similarity index 100%
rename from src/main/resources/Documentation/build.md
rename to resources/Documentation/build.md

diff --git a/src/main/resources/Documentation/config-discovery.md b/resources/Documentation/config-discovery.md
similarity index 100%
rename from src/main/resources/Documentation/config-discovery.md
rename to resources/Documentation/config-discovery.md

diff --git a/src/main/resources/Documentation/config-github.md b/resources/Documentation/config-github.md
similarity index 100%
rename from src/main/resources/Documentation/config-github.md
rename to resources/Documentation/config-github.md

diff --git a/src/main/resources/Documentation/config-gitlab.md b/resources/Documentation/config-gitlab.md
similarity index 100%
rename from src/main/resources/Documentation/config-gitlab.md
rename to resources/Documentation/config-gitlab.md

diff --git a/src/main/resources/Documentation/config-google.md b/resources/Documentation/config-google.md
similarity index 100%
rename from src/main/resources/Documentation/config-google.md
rename to resources/Documentation/config-google.md

diff --git a/src/main/resources/Documentation/config-keycloak.md b/resources/Documentation/config-keycloak.md
similarity index 100%
rename from src/main/resources/Documentation/config-keycloak.md
rename to resources/Documentation/config-keycloak.md

diff --git a/src/main/resources/Documentation/config.md b/resources/Documentation/config.md
similarity index 100%
rename from src/main/resources/Documentation/config.md
rename to resources/Documentation/config.md

diff --git a/src/main/resources/Documentation/images/github-1.png b/resources/Documentation/images/github-1.png
similarity index 100%
rename from src/main/resources/Documentation/images/github-1.png
rename to resources/Documentation/images/github-1.png
Binary files differ

diff --git a/src/main/resources/Documentation/images/github-2.png b/resources/Documentation/images/github-2.png
similarity index 100%
rename from src/main/resources/Documentation/images/github-2.png
rename to resources/Documentation/images/github-2.png
Binary files differ

diff --git a/src/main/resources/Documentation/images/gitlab-1.png b/resources/Documentation/images/gitlab-1.png
similarity index 100%
rename from src/main/resources/Documentation/images/gitlab-1.png
rename to resources/Documentation/images/gitlab-1.png
Binary files differ

diff --git a/src/main/resources/Documentation/images/gitlab-2.png b/resources/Documentation/images/gitlab-2.png
similarity index 100%
rename from src/main/resources/Documentation/images/gitlab-2.png
rename to resources/Documentation/images/gitlab-2.png
Binary files differ

diff --git a/src/main/resources/Documentation/images/google-1.png b/resources/Documentation/images/google-1.png
similarity index 100%
rename from src/main/resources/Documentation/images/google-1.png
rename to resources/Documentation/images/google-1.png
Binary files differ

diff --git a/src/main/resources/Documentation/images/google-2.png b/resources/Documentation/images/google-2.png
similarity index 100%
rename from src/main/resources/Documentation/images/google-2.png
rename to resources/Documentation/images/google-2.png
Binary files differ

diff --git a/src/main/resources/Documentation/images/google-3.png b/resources/Documentation/images/google-3.png
similarity index 100%
rename from src/main/resources/Documentation/images/google-3.png
rename to resources/Documentation/images/google-3.png
Binary files differ

diff --git a/src/main/resources/Documentation/images/google-4.png b/resources/Documentation/images/google-4.png
similarity index 100%
rename from src/main/resources/Documentation/images/google-4.png
rename to resources/Documentation/images/google-4.png
Binary files differ

diff --git a/src/main/resources/Documentation/images/google-5.png b/resources/Documentation/images/google-5.png
similarity index 100%
rename from src/main/resources/Documentation/images/google-5.png
rename to resources/Documentation/images/google-5.png
Binary files differ

diff --git a/src/main/resources/Documentation/providers.md b/resources/Documentation/providers.md
similarity index 100%
rename from src/main/resources/Documentation/providers.md
rename to resources/Documentation/providers.md

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/BUILD.bazel b/src/main/java/com/googlesource/gerrit/plugins/oauth/base/BUILD.bazel
deleted file mode 100644
index 779d3de..0000000
--- a/src/main/java/com/googlesource/gerrit/plugins/oauth/base/BUILD.bazel
+++ /dev/null

@@ -1,11 +0,0 @@
-load("@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl", "gerrit_plugin_library")
-
-gerrit_plugin_library(
-    name = "base",
-    srcs = glob(["*.java"]),
-    visibility = ["//plugins/oauth:__subpackages__"],
-    deps = [
-        "//plugins/oauth/src/main/java/com/googlesource/gerrit/plugins/oauth/client",
-        "//plugins/oauth/src/main/java/com/googlesource/gerrit/plugins/oauth/utils",
-    ],
-)