SONAR-21114 Remove the version tag from api/v2

diff --git a/server/sonar-web/src/main/js/apps/web-api-v2/__tests__/WebApiApp-it.tsx b/server/sonar-web/src/main/js/apps/web-api-v2/__tests__/WebApiApp-it.tsx
index f0ff88411960e73978d0977b83b345105fbe7088..62126f3b35a08d58f6c2d701e56a43ae2c51f560 100644 (file)
--- a/server/sonar-web/src/main/js/apps/web-api-v2/__tests__/WebApiApp-it.tsx
+++ b/server/sonar-web/src/main/js/apps/web-api-v2/__tests__/WebApiApp-it.tsx
@@ -29,7 +29,7 @@ const handler = new WebApiServiceMock();
 
 const ui = {
   search: byRole('searchbox'),
-  title: byRole('link', { name: 'Swagger Petstore - OpenAPI 3.0 1.0.17' }),
+  title: byRole('link', { name: 'Swagger Petstore - OpenAPI 3.0' }),
   searchClear: byRole('button', { name: 'clear' }),
   showInternal: byRole('checkbox', { name: 'api_documentation.show_internal_v2' }),
   apiScopePet: byRole('button', { name: 'pet' }),

diff --git a/server/sonar-web/src/main/js/apps/web-api-v2/components/ApiSidebar.tsx b/server/sonar-web/src/main/js/apps/web-api-v2/components/ApiSidebar.tsx
index e8ef17258c182448b141db73474b8e0cca999aad..e867ad8db0787068854f1640b4dbcfd6f4d1fb27 100644 (file)
--- a/server/sonar-web/src/main/js/apps/web-api-v2/components/ApiSidebar.tsx
+++ b/server/sonar-web/src/main/js/apps/web-api-v2/components/ApiSidebar.tsx
@@ -95,7 +95,6 @@ export default function ApiSidebar({ apisList, docInfo }: Readonly<Props>) {
       <h1 className="sw-mb-2">
         <Link to="." className="sw-text-[unset] sw-border-none">
           {docInfo.title}
-          <Badge className="sw-align-middle sw-ml-2">{docInfo.version}</Badge>
         </Link>
       </h1>
 

diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserUpdater.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserUpdater.java
index a2faa63fd9f81bd7883db78b95a9cc8decc019f4..206e58fd5a48d1bbab93112b21fb3f58cc53e22c 100644 (file)
--- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserUpdater.java
+++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/user/UserUpdater.java
@@ -373,8 +373,7 @@ public class UserUpdater {
     return true;
   }
 
-  private boolean validateScmAccounts(DbSession dbSession, List<String> scmAccounts, @Nullable String login, @Nullable String email,
-    @Nullable UserDto existingUser,
+  private boolean validateScmAccounts(DbSession dbSession, List<String> scmAccounts, @Nullable String login, @Nullable String email, @Nullable UserDto existingUser,
     List<String> messages) {
     boolean isValid = true;
     for (String scmAccount : scmAccounts) {
@@ -391,8 +390,7 @@ public class UserUpdater {
           matchingUsersWithoutExistingUser.add(getNameOrLogin(matchingUser) + " (" + matchingUser.getLogin() + ")");
         }
         if (!matchingUsersWithoutExistingUser.isEmpty()) {
-          messages.add(format("The scm account '%s' is already used by user(s) : '%s'", scmAccount,
-            Joiner.on(", ").join(matchingUsersWithoutExistingUser)));
+          messages.add(format("The scm account '%s' is already used by user(s) : '%s'", scmAccount, Joiner.on(", ").join(matchingUsersWithoutExistingUser)));
           isValid = false;
         }
       }

diff --git a/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/config/CommonWebConfig.java b/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/config/CommonWebConfig.java
index 4e3ee214822ff1bd0a149ae4f8527e473ef3f12b..72204a5d3aaafb8c6cd7d6a62539231a7732aaca 100644 (file)
--- a/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/config/CommonWebConfig.java
+++ b/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/config/CommonWebConfig.java
@@ -63,7 +63,6 @@ public class CommonWebConfig implements WebMvcConfigurer {
     return new OpenAPI()
       .info(new Info()
           .title("SonarQube Web API v2")
-          .version("1.0.0 alpha")
           .description("""
             The SonarQube API v2 is a REST API which enables you to interact with SonarQube programmatically. Endpoint listed here should work as expected.
             However, you should not consider the API stable for now as it is still under development. New releases of SonarQube can bring changes to existing endpoint definitions.