3.x

Committed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com> Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com> Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com> Pushed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com> Committed-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
2026-03-06 12:20:56 +01:00 · 2023-11-29 18:14:03 +01:00
parent d760f46d9d
commit cf4d9cf20f
1217 changed files with 7258 additions and 5987 deletions
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/Encoding.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/Encoding.java
@@ -24,13 +24,17 @@

 package sonia.scm.api.v2.resources;

-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;

-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

@Documented
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/EncodingValidator.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/EncodingValidator.java
@@ -25,9 +25,9 @@
 package sonia.scm.api.v2.resources;

 import com.google.common.base.Strings;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;

-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
 import java.nio.charset.Charset;
 import java.nio.charset.UnsupportedCharsetException;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigLinks.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigLinks.java
@@ -26,11 +26,10 @@ package sonia.scm.api.v2.resources;

 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.util.Providers;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 import sonia.scm.repository.Repository;

-import javax.inject.Inject;
-import javax.inject.Provider;
-
 public class HgConfigLinks {

  private final Provider<ScmPathInfoStore> pathInfoStore;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigResource.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigResource.java
@@ -32,6 +32,15 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 import sonia.scm.config.ConfigurationPermissions;
 import sonia.scm.repository.HgGlobalConfig;
 import sonia.scm.repository.HgRepositoryHandler;
@@ -39,16 +48,6 @@ import sonia.scm.repository.HgVerifier;
 import sonia.scm.web.HgVndMediaType;
 import sonia.scm.web.VndMediaType;

-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.validation.Valid;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
-
 import static sonia.scm.ScmConstraintViolationException.Builder.doThrow;

 /**
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgGlobalConfigAutoConfigurationResource.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgGlobalConfigAutoConfigurationResource.java
@@ -31,17 +31,16 @@ import io.swagger.v3.oas.annotations.media.ExampleObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
 import sonia.scm.config.ConfigurationPermissions;
 import sonia.scm.repository.HgGlobalConfig;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.web.HgVndMediaType;
 import sonia.scm.web.VndMediaType;

-import javax.ws.rs.Consumes;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-
 import static sonia.scm.api.v2.resources.HgConfigResource.HG_CONFIG_PATH_V2;

@Path(HG_CONFIG_PATH_V2 + "/auto-configuration")
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgGlobalConfigInIndexResource.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgGlobalConfigInIndexResource.java
@@ -26,15 +26,14 @@ package sonia.scm.api.v2.resources;

 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 import sonia.scm.config.ConfigurationPermissions;
 import sonia.scm.plugin.Extension;
 import sonia.scm.repository.HgGlobalConfig;
 import sonia.scm.web.JsonEnricherBase;
 import sonia.scm.web.JsonEnricherContext;

-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import static java.util.Collections.singletonMap;
 import static sonia.scm.web.VndMediaType.INDEX;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgGlobalConfigToHgGlobalConfigDtoMapper.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgGlobalConfigToHgGlobalConfigDtoMapper.java
@@ -26,6 +26,7 @@ package sonia.scm.api.v2.resources;

 import com.google.common.annotations.VisibleForTesting;
 import de.otto.edison.hal.Links;
+import jakarta.inject.Inject;
 import org.mapstruct.AfterMapping;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
@@ -33,8 +34,6 @@ import sonia.scm.config.ConfigurationPermissions;
 import sonia.scm.repository.HgGlobalConfig;
 import sonia.scm.repository.RepositoryManager;

-import javax.inject.Inject;
-
 import static de.otto.edison.hal.Link.link;
 import static de.otto.edison.hal.Links.linkingTo;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgRepositoryConfigEnricher.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgRepositoryConfigEnricher.java
@@ -24,12 +24,11 @@

 package sonia.scm.api.v2.resources;

+import jakarta.inject.Inject;
 import sonia.scm.plugin.Extension;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.Repository;

-import javax.inject.Inject;
-
@Extension
@Enrich(Repository.class)
 public class HgRepositoryConfigEnricher implements HalEnricher {
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgRepositoryConfigMapper.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgRepositoryConfigMapper.java
@@ -26,6 +26,7 @@ package sonia.scm.api.v2.resources;

 import com.google.common.annotations.VisibleForTesting;
 import de.otto.edison.hal.Links;
+import jakarta.inject.Inject;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -34,8 +35,6 @@ import sonia.scm.repository.HgRepositoryConfig;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryPermissions;

-import javax.inject.Inject;
-
 import static de.otto.edison.hal.Link.link;
 import static de.otto.edison.hal.Links.linkingTo;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgRepositoryConfigResource.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgRepositoryConfigResource.java
@@ -30,6 +30,15 @@ import io.swagger.v3.oas.annotations.media.ExampleObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.inject.Inject;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 import sonia.scm.repository.HgRepositoryConfigStore;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
@@ -37,16 +46,6 @@ import sonia.scm.repository.RepositoryManager;
 import sonia.scm.web.HgVndMediaType;
 import sonia.scm.web.VndMediaType;

-import javax.inject.Inject;
-import javax.validation.Valid;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
-
 import static sonia.scm.ContextEntry.ContextBuilder.entity;
 import static sonia.scm.NotFoundException.notFound;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/autoconfig/AutoConfiguratorProvider.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/autoconfig/AutoConfiguratorProvider.java
@@ -25,13 +25,12 @@
 package sonia.scm.autoconfig;

 import com.google.common.annotations.VisibleForTesting;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 import sonia.scm.Platform;
 import sonia.scm.repository.HgVerifier;
 import sonia.scm.util.SystemUtil;

-import javax.inject.Inject;
-import javax.inject.Provider;
-
 public class AutoConfiguratorProvider implements Provider<AutoConfigurator> {

  private final HgVerifier verifier;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/log/HgLoggerFactoryBinder.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/log/HgLoggerFactoryBinder.java
@@ -24,12 +24,11 @@

 package sonia.scm.log;

+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 import org.javahg.log.LoggerFactory;
 import sonia.scm.plugin.Extension;

-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
@Extension
 public class HgLoggerFactoryBinder implements ServletContextListener {
  @Override
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/DefaultHgEnvironmentBuilder.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/DefaultHgEnvironmentBuilder.java
@@ -27,6 +27,8 @@ package sonia.scm.repository;

 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import sonia.scm.TransactionId;
 import sonia.scm.repository.hooks.HookEnvironment;
 import sonia.scm.repository.hooks.HookServer;
@@ -35,8 +37,6 @@ import sonia.scm.security.AccessTokenBuilderFactory;
 import sonia.scm.security.CipherUtil;
 import sonia.scm.security.Xsrf;

-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgConfigResolver.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgConfigResolver.java
@@ -26,8 +26,8 @@ package sonia.scm.repository;

 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
+import jakarta.inject.Inject;

-import javax.inject.Inject;
 import java.io.File;
 import java.util.function.Function;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgGlobalConfig.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgGlobalConfig.java
@@ -25,12 +25,11 @@
 package sonia.scm.repository;


+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
 import sonia.scm.auditlog.AuditEntry;
 import sonia.scm.util.Util;

-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-

 /**
 *
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryConfig.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryConfig.java
@@ -24,11 +24,10 @@

 package sonia.scm.repository;

+import jakarta.xml.bind.annotation.XmlRootElement;
 import lombok.Data;
 import sonia.scm.auditlog.AuditEntry;

-import javax.xml.bind.annotation.XmlRootElement;
-
@Data
@XmlRootElement
@AuditEntry(labels = {"hg", "config"})
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryConfigStore.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryConfigStore.java
@@ -24,11 +24,10 @@

 package sonia.scm.repository;

+import jakarta.inject.Inject;
 import sonia.scm.store.ConfigurationStore;
 import sonia.scm.store.ConfigurationStoreFactory;

-import javax.inject.Inject;
-
 public class HgRepositoryConfigStore {

  private static final String STORE_NAME = "hgConfig";
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryFactory.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryFactory.java
@@ -24,6 +24,8 @@

 package sonia.scm.repository;

+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import org.javahg.RepositoryConfiguration;
 import org.javahg.ext.purge.PurgeExtension;
 import org.slf4j.Logger;
@@ -31,8 +33,6 @@ import org.slf4j.LoggerFactory;
 import sonia.scm.repository.hooks.HookEnvironment;
 import sonia.scm.repository.spi.javahg.HgFileviewExtension;

-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.io.File;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgVerifier.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgVerifier.java
@@ -29,9 +29,6 @@ import org.slf4j.LoggerFactory;
 import sonia.scm.io.SimpleCommand;
 import sonia.scm.io.SimpleCommandResult;

-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/hooks/DefaultHookHandler.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/hooks/DefaultHookHandler.java
@@ -25,6 +25,8 @@
 package sonia.scm.repository.hooks;

 import com.google.inject.assistedinject.Assisted;
+import jakarta.annotation.Nonnull;
+import jakarta.inject.Inject;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.shiro.SecurityUtils;
@@ -42,8 +44,6 @@ import sonia.scm.repository.spi.HookEventFacade;
 import sonia.scm.security.BearerToken;
 import sonia.scm.security.CipherUtil;

-import javax.annotation.Nonnull;
-import javax.inject.Inject;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/hooks/HookContextProviderFactory.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/hooks/HookContextProviderFactory.java
@@ -24,6 +24,7 @@

 package sonia.scm.repository.hooks;

+import jakarta.inject.Inject;
 import sonia.scm.NotFoundException;
 import sonia.scm.repository.HgConfigResolver;
 import sonia.scm.repository.HgRepositoryFactory;
@@ -31,8 +32,6 @@ import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryManager;
 import sonia.scm.repository.spi.HgHookContextProvider;

-import javax.inject.Inject;
-
 public class HookContextProviderFactory {

  private final RepositoryManager repositoryManager;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/hooks/HookEnvironment.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/hooks/HookEnvironment.java
@@ -24,7 +24,8 @@

 package sonia.scm.repository.hooks;

-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
+
 import java.util.UUID;

@Singleton
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/hooks/HookServer.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/hooks/HookServer.java
@@ -26,6 +26,9 @@ package sonia.scm.repository.hooks;

 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.micrometer.core.instrument.MeterRegistry;
+import jakarta.annotation.Nonnull;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.util.ThreadContext;
@@ -33,9 +36,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.metrics.Metrics;

-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBlameCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBlameCommand.java
@@ -27,6 +27,7 @@ package sonia.scm.repository.spi;
 //~--- non-JDK imports --------------------------------------------------------

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import org.javahg.Changeset;
 import org.javahg.commands.AnnotateCommand;
 import org.javahg.AnnotateLine;
@@ -39,7 +40,6 @@ import sonia.scm.repository.BlameResult;
 import sonia.scm.repository.Person;
 import sonia.scm.web.HgUtil;

-import javax.inject.Inject;
 import java.io.IOException;
 import java.util.List;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchCommand.java
@@ -25,10 +25,11 @@
 package sonia.scm.repository.spi;

 import com.google.inject.assistedinject.Assisted;
+import com.google.common.annotations.VisibleForTesting;
+import jakarta.inject.Inject;
+import org.apache.shiro.SecurityUtils;
 import org.javahg.Changeset;
 import org.javahg.commands.CommitCommand;
-import com.google.common.annotations.VisibleForTesting;
-import org.apache.shiro.SecurityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.ContextEntry;
@@ -39,8 +40,6 @@ import sonia.scm.repository.api.BranchRequest;
 import sonia.scm.repository.work.WorkingCopy;
 import sonia.scm.user.User;

-import javax.inject.Inject;
-
 /**
 * Mercurial implementation of the {@link BranchCommand}.
 * Note that this creates an empty commit to "persist" the new branch.
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchDetailsCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchDetailsCommand.java
@@ -25,6 +25,7 @@
 package sonia.scm.repository.spi;

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import org.javahg.Changeset;
 import org.javahg.commands.ExecutionException;
 import org.javahg.commands.LogCommand;
@@ -32,7 +33,6 @@ import sonia.scm.repository.Branch;
 import sonia.scm.repository.BranchDetails;
 import sonia.scm.repository.api.BranchDetailsCommandResult;

-import javax.inject.Inject;
 import java.util.List;

 import static org.javahg.commands.flags.LogCommandFlags.on;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchesCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchesCommand.java
@@ -27,12 +27,12 @@ package sonia.scm.repository.spi;
 //~--- non-JDK imports --------------------------------------------------------

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import org.javahg.Changeset;
 import com.google.common.collect.Lists;
 import sonia.scm.repository.Branch;
 import sonia.scm.repository.Person;

-import javax.inject.Inject;
 import java.util.List;

 //~--- JDK imports ------------------------------------------------------------
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBrowseCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBrowseCommand.java
@@ -27,6 +27,7 @@ package sonia.scm.repository.spi;
 //~--- non-JDK imports --------------------------------------------------------

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import org.javahg.Changeset;
 import org.javahg.commands.LogCommand;
 import com.google.common.base.MoreObjects;
@@ -35,7 +36,6 @@ import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.FileObject;
 import sonia.scm.repository.spi.javahg.HgFileviewCommand;

-import javax.inject.Inject;
 import java.io.IOException;

 import static sonia.scm.ContextEntry.ContextBuilder.entity;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBundleCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBundleCommand.java
@@ -25,11 +25,11 @@
 package sonia.scm.repository.spi;

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import sonia.scm.ContextEntry;
 import sonia.scm.repository.api.BundleResponse;
 import sonia.scm.repository.api.ExportFailedException;

-import javax.inject.Inject;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgCatCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgCatCommand.java
@@ -25,6 +25,7 @@
 package sonia.scm.repository.spi;

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import org.javahg.commands.ExecutionException;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Closeables;
@@ -34,7 +35,6 @@ import sonia.scm.ContextEntry;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.web.HgUtil;

-import javax.inject.Inject;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgChangesetsCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgChangesetsCommand.java
@@ -25,10 +25,10 @@
 package sonia.scm.repository.spi;

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.spi.javahg.HgLogChangesetCommand;

-import javax.inject.Inject;
 import java.util.Optional;

 import static sonia.scm.repository.spi.javahg.HgLogChangesetCommand.on;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgCommandContextFactory.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgCommandContextFactory.java
@@ -24,12 +24,11 @@

 package sonia.scm.repository.spi;

+import jakarta.inject.Inject;
 import sonia.scm.repository.HgConfigResolver;
 import sonia.scm.repository.HgRepositoryFactory;
 import sonia.scm.repository.Repository;

-import javax.inject.Inject;
-
 public class HgCommandContextFactory {

  private final HgConfigResolver configResolver;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgDiffCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgDiffCommand.java
@@ -25,16 +25,16 @@
 package sonia.scm.repository.spi;

 import com.google.inject.assistedinject.Assisted;
-import org.javahg.Repository;
 import com.google.common.base.Strings;
 import com.google.common.io.ByteStreams;
+import jakarta.annotation.Nonnull;
+import jakarta.inject.Inject;
+import org.javahg.Repository;
 import sonia.scm.repository.api.DiffCommandBuilder;
 import sonia.scm.repository.api.DiffFormat;
 import sonia.scm.repository.spi.javahg.HgDiffInternalCommand;
 import sonia.scm.web.HgUtil;

-import javax.annotation.Nonnull;
-import javax.inject.Inject;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgFullHealthCheckCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgFullHealthCheckCommand.java
@@ -25,13 +25,13 @@
 package sonia.scm.repository.spi;

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import org.javahg.commands.ExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.repository.HealthCheckFailure;
 import sonia.scm.repository.HealthCheckResult;

-import javax.inject.Inject;
 import java.io.IOException;

 public class HgFullHealthCheckCommand extends AbstractCommand implements FullHealthCheckCommand {
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java
@@ -27,6 +27,7 @@ package sonia.scm.repository.spi;
 //~--- non-JDK imports --------------------------------------------------------

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import org.javahg.commands.ExecutionException;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
@@ -34,7 +35,6 @@ import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.spi.javahg.HgIncomingChangesetCommand;

-import javax.inject.Inject;
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLazyChangesetResolver.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLazyChangesetResolver.java
@@ -25,13 +25,13 @@
 package sonia.scm.repository.spi;

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import org.javahg.commands.LogCommand;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.HgRepositoryFactory;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.Repository;

-import javax.inject.Inject;
 import java.util.Iterator;
 import java.util.concurrent.Callable;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
@@ -27,11 +27,11 @@ package sonia.scm.repository.spi;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.spi.javahg.HgLogChangesetCommand;

-import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModificationsCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModificationsCommand.java
@@ -25,12 +25,12 @@
 package sonia.scm.repository.spi;

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import sonia.scm.repository.Modification;
 import sonia.scm.repository.Modifications;
 import sonia.scm.repository.spi.javahg.HgLogChangesetCommand;
 import sonia.scm.repository.spi.javahg.StateCommand;

-import javax.inject.Inject;
 import java.io.IOException;
 import java.util.Collection;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModifyCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModifyCommand.java
@@ -25,6 +25,8 @@
 package sonia.scm.repository.spi;

 import com.google.inject.assistedinject.Assisted;
+import com.google.common.annotations.VisibleForTesting;
+import jakarta.inject.Inject;
 import org.javahg.Changeset;
 import org.javahg.Repository;
 import org.javahg.commands.AddCommand;
@@ -32,7 +34,6 @@ import org.javahg.commands.CommitCommand;
 import org.javahg.commands.ExecutionException;
 import org.javahg.commands.RemoveCommand;
 import org.javahg.commands.StatusCommand;
-import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.ContextEntry;
@@ -41,7 +42,6 @@ import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.work.WorkingCopy;

-import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java
@@ -27,6 +27,7 @@ package sonia.scm.repository.spi;
 //~--- non-JDK imports --------------------------------------------------------

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import org.javahg.commands.ExecutionException;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
@@ -34,7 +35,6 @@ import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.spi.javahg.HgOutgoingChangesetCommand;

-import javax.inject.Inject;
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPullCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPullCommand.java
@@ -24,10 +24,11 @@

 package sonia.scm.repository.spi;

+import com.google.common.base.Strings;
 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import org.javahg.Changeset;
 import org.javahg.commands.ExecutionException;
-import com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.event.ScmEventBus;
@@ -35,7 +36,6 @@ import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.api.ImportFailedException;
 import sonia.scm.repository.api.PullResponse;

-import javax.inject.Inject;
 import java.io.IOException;
 import java.util.List;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPushCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPushCommand.java
@@ -28,6 +28,7 @@ package sonia.scm.repository.spi;

 import com.google.common.base.Strings;
 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import org.javahg.Changeset;
 import org.javahg.commands.ExecutionException;
 import org.slf4j.Logger;
@@ -36,7 +37,6 @@ import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.api.PushFailedException;
 import sonia.scm.repository.api.PushResponse;

-import javax.inject.Inject;
 import java.io.IOException;
 import java.util.List;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryHookEventFactory.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryHookEventFactory.java
@@ -25,12 +25,12 @@
 package sonia.scm.repository.spi;

 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import sonia.scm.repository.RepositoryHookEvent;
 import sonia.scm.repository.Tag;
 import sonia.scm.repository.api.HookContext;
 import sonia.scm.repository.api.HookContextFactory;

-import javax.inject.Inject;
 import java.util.List;

 import static sonia.scm.repository.RepositoryHookType.POST_RECEIVE;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgTagCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgTagCommand.java
@@ -25,10 +25,11 @@
 package sonia.scm.repository.spi;

 import com.google.inject.assistedinject.Assisted;
-import org.javahg.Repository;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
+import jakarta.inject.Inject;
 import org.apache.shiro.SecurityUtils;
+import org.javahg.Repository;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.Tag;
 import sonia.scm.repository.api.TagCreateRequest;
@@ -36,8 +37,6 @@ import sonia.scm.repository.api.TagDeleteRequest;
 import sonia.scm.repository.work.WorkingCopy;
 import sonia.scm.user.User;

-import javax.inject.Inject;
-
 import static sonia.scm.repository.spi.UserFormatter.getUserStringFor;

 public class HgTagCommand extends AbstractWorkingCopyCommand implements TagCommand {
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgTagsCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgTagsCommand.java
@@ -30,10 +30,10 @@ import com.google.common.base.Function;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import sonia.scm.repository.Tag;
 import sonia.scm.util.Util;

-import javax.inject.Inject;
 import java.util.List;

 /**
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgUnbundleCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgUnbundleCommand.java
@@ -26,12 +26,12 @@ package sonia.scm.repository.spi;

 import com.google.common.io.ByteSource;
 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.repository.RepositoryHookEvent;
 import sonia.scm.repository.api.UnbundleResponse;

-import javax.inject.Inject;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/SimpleHgWorkingCopyFactory.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/SimpleHgWorkingCopyFactory.java
@@ -24,6 +24,8 @@

 package sonia.scm.repository.spi;

+import io.micrometer.core.instrument.MeterRegistry;
+import jakarta.inject.Inject;
 import org.javahg.BaseRepository;
 import org.javahg.Repository;
 import org.javahg.commands.CloneCommand;
@@ -33,14 +35,12 @@ import org.javahg.commands.StatusCommand;
 import org.javahg.commands.UpdateCommand;
 import org.javahg.commands.flags.CloneCommandFlags;
 import org.javahg.ext.purge.PurgeCommand;
-import io.micrometer.core.instrument.MeterRegistry;
 import sonia.scm.repository.HgExtensions;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.work.SimpleWorkingCopyFactory;
 import sonia.scm.repository.work.WorkingCopyPool;
 import sonia.scm.util.IOUtil;

-import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/TemporaryConfigFactory.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/TemporaryConfigFactory.java
@@ -26,6 +26,7 @@ package sonia.scm.repository.spi;

 import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
+import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.io.INIConfiguration;
@@ -36,7 +37,6 @@ import sonia.scm.net.GlobalProxyConfiguration;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.util.Util;

-import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIExceptionHandler.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIExceptionHandler.java
@@ -28,27 +28,21 @@ package sonia.scm.web;

 import com.google.common.base.Charsets;
 import com.google.common.base.Strings;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sonia.scm.i18n.Bundle;
 import sonia.scm.util.IOUtil;
 import sonia.scm.util.Util;
 import sonia.scm.web.cgi.CGIExceptionHandler;
 import sonia.scm.web.cgi.CGIStatusCodeHandler;

-//~--- JDK imports ------------------------------------------------------------
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-
 import java.util.Locale;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
 *
 * @author Sebastian Sdorra
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
@@ -27,6 +27,11 @@ package sonia.scm.web;
 import com.google.common.base.Stopwatch;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import jakarta.annotation.Nonnull;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.SCMContext;
@@ -43,11 +48,6 @@ import sonia.scm.web.cgi.CGIExecutor;
 import sonia.scm.web.cgi.CGIExecutorFactory;
 import sonia.scm.web.cgi.EnvList;

-import javax.annotation.Nonnull;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServletProvider.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServletProvider.java
@@ -25,12 +25,11 @@
 package sonia.scm.web;

 import com.google.inject.Inject;
+import jakarta.inject.Provider;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.spi.ScmProviderHttpServlet;
 import sonia.scm.repository.spi.ScmProviderHttpServletProvider;

-import javax.inject.Provider;
-
 public class HgCGIServletProvider extends ScmProviderHttpServletProvider {

  @Inject
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgPermissionFilter.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgPermissionFilter.java
@@ -25,15 +25,15 @@
 package sonia.scm.web;

 import com.google.common.annotations.VisibleForTesting;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.spi.ScmProviderHttpServlet;
 import sonia.scm.web.filter.PermissionFilter;

-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

 /**
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgPermissionFilterFactory.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgPermissionFilterFactory.java
@@ -24,13 +24,12 @@
    
 package sonia.scm.web;

+import jakarta.inject.Inject;
 import sonia.scm.plugin.Extension;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.spi.ScmProviderHttpServlet;
 import sonia.scm.repository.spi.ScmProviderHttpServletDecoratorFactory;

-import javax.inject.Inject;
-
@Extension
 public class HgPermissionFilterFactory implements ScmProviderHttpServletDecoratorFactory {

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgScmProtocolProviderWrapper.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgScmProtocolProviderWrapper.java
@@ -24,14 +24,13 @@

 package sonia.scm.web;

+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import sonia.scm.RootURL;
 import sonia.scm.plugin.Extension;
 import sonia.scm.repository.HgRepositoryHandler;
 import sonia.scm.repository.spi.InitializingHttpScmProtocolWrapper;

-import javax.inject.Inject;
-import javax.inject.Singleton;
-
@Singleton
@Extension
 public class HgScmProtocolProviderWrapper extends InitializingHttpScmProtocolWrapper {
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletInputStream.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletInputStream.java
@@ -25,9 +25,9 @@
 package sonia.scm.web;

 import com.google.common.base.Preconditions;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;

-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletRequest.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletRequest.java
@@ -24,8 +24,9 @@
    
 package sonia.scm.web;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+
 import java.io.IOException;

 /**
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/WireProtocol.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/WireProtocol.java
@@ -25,16 +25,15 @@
 package sonia.scm.web;

 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
+import jakarta.servlet.http.HttpServletRequest;
 import sonia.scm.util.HttpUtil;

-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;