This is an automated email from the ASF dual-hosted git repository. jialiang pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
commit f1dfbfc486756f684aa42aad770415d6b8877818 Author: tongxiaojun <[email protected]> AuthorDate: Fri Jan 17 10:43:06 2025 +0800 AMBARI-26288:Preliminary upgrade of Spring and Jetty dependencies (#3930) (cherry picked from commit 33e36f8f06fd4beb85d6dd72ecfaa84634f27497) --- ambari-project/pom.xml | 10 ++++---- ambari-server/pom.xml | 13 +++++++++- .../DisableBatchingRemoteEndpointFactory.java | 23 +++++++++-------- .../server/api/AmbariCsrfProtectionFilter.java | 10 ++++---- .../ambari/server/api/AmbariErrorHandler.java | 6 ++--- .../ambari/server/api/AmbariPersistFilter.java | 12 ++++----- .../server/api/AmbariViewErrorHandlerProxy.java | 6 ++--- .../server/api/ContentTypeOverrideFilter.java | 20 +++++++-------- .../ambari/server/api/MethodOverrideFilter.java | 18 ++++++------- .../ambari/server/api/UserNameOverrideFilter.java | 16 ++++++------ .../ambari/server/api/services/LocalUriInfo.java | 10 ++++---- .../ambari/server/api/services/LogoutService.java | 2 +- .../spring/AgentRegisteringQueueChecker.java | 9 ++++--- .../configuration/spring/AgentStompConfig.java | 21 ++++++++------- .../configuration/spring/ApiSecurityConfig.java | 14 +++++----- .../configuration/spring/ApiStompConfig.java | 4 +-- .../configuration/spring/RootStompConfig.java | 2 +- .../server/controller/AmbariHandlerList.java | 6 ++--- .../ambari/server/controller/AmbariServer.java | 7 ++--- .../server/controller/AmbariSessionManager.java | 4 +-- .../server/resources/api/rest/GetResource.java | 4 +-- .../server/scheduler/ExecutionScheduleManager.java | 16 ++++++------ .../security/AbstractSecurityHeaderFilter.java | 14 +++++----- .../ambari/server/security/AmbariEntryPoint.java | 6 ++--- .../security/AmbariServerSecurityHeaderFilter.java | 2 +- .../security/AmbariViewsSecurityHeaderFilter.java | 2 +- .../ambari/server/security/SecurityFilter.java | 14 +++++----- .../AmbariAuthenticationEventHandler.java | 8 +++--- .../AmbariAuthenticationEventHandlerImpl.java | 8 +++--- .../authentication/AmbariAuthenticationFilter.java | 10 ++++---- .../AmbariBasicAuthenticationFilter.java | 13 +++++----- .../AmbariDelegatingAuthenticationFilter.java | 14 +++++----- .../jwt/AmbariJwtAuthenticationFilter.java | 16 ++++++------ .../AmbariKerberosAuthenticationFilter.java | 12 ++++----- .../tproxy/TrustedProxyAuthenticationDetails.java | 2 +- .../TrustedProxyAuthenticationDetailsSource.java | 2 +- .../authorization/AmbariAuthorizationFilter.java | 16 ++++++------ .../AmbariUserAuthorizationFilter.java | 16 ++++++------ .../internal/InternalTokenClientFilter.java | 4 +-- .../security/unsecured/rest/CertificateSign.java | 2 +- .../apache/ambari/server/utils/RequestUtils.java | 2 +- .../server/view/AmbariViewsMDCLoggingFilter.java | 14 +++++----- .../apache/ambari/server/view/ViewClassLoader.java | 15 ++++++----- .../ambari/server/view/ViewThrottleFilter.java | 16 ++++++------ .../main/resources/Ambari-DDL-Postgres-CREATE.sql | 2 +- .../ambari/server/api/AmbariErrorHandlerIT.java | 8 +++--- .../ambari/server/api/AmbariErrorHandlerTest.java | 6 ++--- .../api/AmbariViewErrorHandlerProxyTest.java | 6 ++--- .../server/api/ContentTypeOverrideFilterTest.java | 12 ++++----- .../server/api/UserNameOverrideFilterTest.java | 8 +++--- .../audit/request/DefaultEventCreatorTest.java | 30 +++++++++++----------- .../server/controller/AmbariHandlerListTest.java | 4 +-- .../ambari/server/controller/AmbariServerTest.java | 4 +-- .../controller/AmbariSessionManagerTest.java | 4 +-- .../security/AbstractSecurityHeaderFilterTest.java | 8 +++--- .../server/security/AmbariEntryPointTest.java | 6 ++--- .../AmbariServerSecurityHeaderFilterTest.java | 2 +- .../AmbariViewsSecurityHeaderFilterTest.java | 2 +- .../AmbariBasicAuthenticationFilterTest.java | 10 ++++---- .../AmbariDelegatingAuthenticationFilterTest.java | 10 ++++---- .../jwt/AmbariJwtAuthenticationFilterTest.java | 8 +++--- .../AmbariKerberosAuthenticationFilterTest.java | 10 ++++---- .../AmbariAuthorizationFilterTest.java | 8 +++--- .../AmbariUserAuthenticationFilterTest.java | 8 +++--- .../ambari/server/utils/RequestUtilsTest.java | 2 +- .../ambari/server/view/ViewThrottleFilterTest.java | 6 ++--- .../server/view/configuration/ViewConfigTest.java | 2 +- .../ambari/view/cluster/ClusterConfigServlet.java | 12 ++++----- .../org/apache/ambari/view/hello/HelloServlet.java | 12 ++++----- .../apache/ambari/view/hello/HelloController.java | 2 +- .../ambari/view/phonelist/PhoneListServlet.java | 12 ++++----- .../ambari/view/phonelist/PhoneListServlet.java | 12 ++++----- 72 files changed, 339 insertions(+), 318 deletions(-) diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml index 7a3fd2aeda..907fe9d837 100644 --- a/ambari-project/pom.xml +++ b/ambari-project/pom.xml @@ -31,7 +31,7 @@ <solr.version>5.5.2</solr.version> <ambari.dir>${project.parent.basedir}</ambari.dir> <powermock.version>2.0.9</powermock.version> - <jetty.version>9.4.12.v20180830</jetty.version> + <jetty.version>11.0.15</jetty.version> <ldap-api.version>1.0.0</ldap-api.version> <checkstyle.version>8.9</checkstyle.version> <swagger.version>1.6.8</swagger.version> @@ -40,8 +40,8 @@ <reload4j.version>1.2.22</reload4j.version> <logback.version>1.5.16</logback.version> <guice.version>5.1.0</guice.version> - <spring.version>5.3.22</spring.version> - <spring.security.version>5.7.8</spring.security.version> + <spring.version>6.0.0</spring.version> + <spring.security.version>6.0.0</spring.security.version> <fasterxml.jackson.version>2.18.2</fasterxml.jackson.version> <fasterxml.jackson.databind.version>2.18.2</fasterxml.jackson.databind.version> <postgres.version>42.3.8</postgres.version> @@ -49,7 +49,7 @@ <forkCount>4</forkCount> <reuseForks>false</reuseForks> <surefire.argLine>-Xmx1024m -Xms512m</surefire.argLine> - <jersey.version>2.41</jersey.version> + <jersey.version>3.1.5</jersey.version> </properties> <profiles> <profile> @@ -407,7 +407,7 @@ </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-server</artifactId> + <artifactId>websocket-jetty-server</artifactId> <version>${jetty.version}</version> </dependency> <dependency> diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index b2c88b91a5..3fe3ca6518 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -1215,6 +1215,12 @@ </profile> </profiles> <dependencies> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>6.0.0</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>nl.jqno.equalsverifier</groupId> <artifactId>equalsverifier</artifactId> @@ -1438,9 +1444,14 @@ <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-servlet</artifactId> </dependency> +<!-- <dependency>--> +<!-- <groupId>org.eclipse.jetty.websocket</groupId>--> +<!-- <artifactId>websocket-server</artifactId>--> +<!-- </dependency>--> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-server</artifactId> + <artifactId>websocket-jetty-server</artifactId> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>commons-codec</groupId> diff --git a/ambari-server/src/main/java/org/apache/ambari/server/DisableBatchingRemoteEndpointFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/DisableBatchingRemoteEndpointFactory.java index 3045cd176a..306a1c8ea7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/DisableBatchingRemoteEndpointFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/DisableBatchingRemoteEndpointFactory.java @@ -19,15 +19,18 @@ package org.apache.ambari.server; import org.eclipse.jetty.websocket.api.BatchMode; import org.eclipse.jetty.websocket.api.RemoteEndpoint; -import org.eclipse.jetty.websocket.api.extensions.OutgoingFrames; -import org.eclipse.jetty.websocket.common.LogicalConnection; -import org.eclipse.jetty.websocket.common.RemoteEndpointFactory; -import org.eclipse.jetty.websocket.common.WebSocketRemoteEndpoint; +import org.eclipse.jetty.websocket.api.Session; - -public class DisableBatchingRemoteEndpointFactory implements RemoteEndpointFactory { - @Override - public RemoteEndpoint newRemoteEndpoint(LogicalConnection connection, OutgoingFrames outgoingFrames, BatchMode batchMode) { - return new WebSocketRemoteEndpoint(connection,outgoingFrames,BatchMode.OFF); +//public class DisableBatchingRemoteEndpointFactory implements RemoteEndpointFactory { +// @Override +// public RemoteEndpoint newRemoteEndpoint(LogicalConnection connection, OutgoingFrames outgoingFrames, BatchMode batchMode) { +// return new WebSocketRemoteEndpoint(connection,outgoingFrames,BatchMode.OFF); +// } +//} +public class DisableBatchingRemoteEndpointFactory { + public RemoteEndpoint newRemoteEndpoint(Session session) { + RemoteEndpoint remote = session.getRemote(); + remote.setBatchMode(BatchMode.OFF); + return remote; } -} +} \ No newline at end of file diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java index 2e79f42fea..056dc45c8d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java @@ -22,11 +22,11 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.ambari.server.api.services.ResultStatus; import org.apache.ambari.server.api.services.serializers.JsonSerializer; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java index b1bd658ea6..378785b91a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java @@ -25,9 +25,9 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.UUID; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.security.authentication.jwt.JwtAuthenticationProperties; import org.apache.ambari.server.security.authentication.jwt.JwtAuthenticationPropertiesProvider; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariPersistFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariPersistFilter.java index 5643f7b6a1..deecde53e0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariPersistFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariPersistFilter.java @@ -19,12 +19,12 @@ package org.apache.ambari.server.api; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariViewErrorHandlerProxy.java b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariViewErrorHandlerProxy.java index e4d95d9106..6f2e72c4b2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariViewErrorHandlerProxy.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariViewErrorHandlerProxy.java @@ -21,9 +21,9 @@ package org.apache.ambari.server.api; import java.io.IOException; import java.lang.reflect.Method; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; import org.eclipse.jetty.server.Request; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/ContentTypeOverrideFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/api/ContentTypeOverrideFilter.java index 0ea6069cf7..23482330a4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/ContentTypeOverrideFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/ContentTypeOverrideFilter.java @@ -25,16 +25,16 @@ import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import javax.ws.rs.Consumes; import javax.ws.rs.Path; import javax.ws.rs.core.HttpHeaders; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/MethodOverrideFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/api/MethodOverrideFilter.java index 2865bcd742..d07543f45a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/MethodOverrideFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/MethodOverrideFilter.java @@ -22,15 +22,15 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.http.HttpMethod; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/UserNameOverrideFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/api/UserNameOverrideFilter.java index 09ffc17668..99cae63db5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/UserNameOverrideFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/UserNameOverrideFilter.java @@ -22,14 +22,14 @@ import java.net.URLDecoder; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import org.apache.ambari.server.security.authorization.AuthorizationHelper; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LocalUriInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LocalUriInfo.java index 415570b319..52db2e85b6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LocalUriInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LocalUriInfo.java @@ -22,11 +22,11 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.List; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.PathSegment; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java index 97311e3886..661f52c494 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java @@ -17,7 +17,7 @@ */ package org.apache.ambari.server.api.services; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentRegisteringQueueChecker.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentRegisteringQueueChecker.java index 3f37353d33..cf12ee8a5c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentRegisteringQueueChecker.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentRegisteringQueueChecker.java @@ -26,10 +26,10 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.simp.SimpMessageType; import org.springframework.messaging.simp.stomp.StompCommand; import org.springframework.messaging.simp.stomp.StompHeaderAccessor; -import org.springframework.messaging.support.ChannelInterceptorAdapter; +import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.messaging.support.MessageBuilder; -public class AgentRegisteringQueueChecker extends ChannelInterceptorAdapter { +public class AgentRegisteringQueueChecker implements ChannelInterceptor { private static final Logger LOG = LoggerFactory.getLogger(AgentsRegistrationQueue.class); @Autowired @@ -38,8 +38,9 @@ public class AgentRegisteringQueueChecker extends ChannelInterceptorAdapter { @Override public Message<?> preSend(Message<?> message, MessageChannel channel) { StompHeaderAccessor headerAccessor= StompHeaderAccessor.wrap(message); - String sessionId = headerAccessor.getHeader("simpSessionId").toString(); - if (SimpMessageType.CONNECT_ACK.equals(headerAccessor.getMessageType()) + String sessionId = headerAccessor.getSessionId(); +// String sessionId = headerAccessor.getHeader("simpSessionId").toString(); + if (StompCommand.CONNECT.equals(headerAccessor.getCommand()) && !agentsRegistrationQueue.offer(sessionId)) { StompHeaderAccessor headerAccessorError = StompHeaderAccessor.create(StompCommand.ERROR); headerAccessorError.setHeader("simpSessionId", sessionId); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentStompConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentStompConfig.java index 0522d1f20c..3558d27244 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentStompConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentStompConfig.java @@ -17,7 +17,7 @@ */ package org.apache.ambari.server.configuration.spring; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.apache.ambari.server.agent.stomp.HeartbeatController; import org.apache.ambari.server.events.DefaultMessageEmitter; @@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.messaging.simp.config.ChannelRegistration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; -import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer; +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration; @@ -43,7 +43,7 @@ import com.google.inject.Injector; @EnableWebSocketMessageBroker @ComponentScan(basePackageClasses = {HeartbeatController.class}) @Import({RootStompConfig.class,GuiceBeansConfig.class}) -public class AgentStompConfig extends AbstractWebSocketMessageBrokerConfigurer { +public class AgentStompConfig implements WebSocketMessageBrokerConfigurer { private org.apache.ambari.server.configuration.Configuration configuration; private final ServletContext servletContext; @@ -62,11 +62,13 @@ public class AgentStompConfig extends AbstractWebSocketMessageBrokerConfigurer { } public DefaultHandshakeHandler getHandshakeHandler() { - WebSocketServerFactory webSocketServerFactory = new WebSocketServerFactory(servletContext); - webSocketServerFactory.getPolicy().setMaxTextMessageSize(configuration.getStompMaxIncomingMessageSize()); - - return new DefaultHandshakeHandler( - new JettyRequestUpgradeStrategy(webSocketServerFactory)); +// WebSocketServerFactory webSocketServerFactory = new WebSocketServerFactory(servletContext); +// webSocketServerFactory.getPolicy().setMaxTextMessageSize(configuration.getStompMaxIncomingMessageSize()); + JettyRequestUpgradeStrategy upgradeStrategy = new JettyRequestUpgradeStrategy(); + DefaultHandshakeHandler handshakeHandler = new DefaultHandshakeHandler(upgradeStrategy); + return handshakeHandler; +// return new DefaultHandshakeHandler( +// new JettyRequestUpgradeStrategy(webSocketServerFactory)); } @Override @@ -84,7 +86,8 @@ public class AgentStompConfig extends AbstractWebSocketMessageBrokerConfigurer { @Override public void configureClientOutboundChannel(ChannelRegistration registration) { registration.taskExecutor().corePoolSize(configuration.getSpringMessagingThreadPoolSize()); - registration.setInterceptors(agentRegisteringQueueChecker); +// registration.setInterceptors(agentRegisteringQueueChecker); + registration.interceptors(agentRegisteringQueueChecker); } @Override diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiSecurityConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiSecurityConfig.java index 06a0ee1bd5..c586eeb372 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiSecurityConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiSecurityConfig.java @@ -36,9 +36,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.web.access.intercept.FilterSecurityInterceptor; import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; @@ -46,7 +46,7 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationFi @EnableWebSecurity @Import(GuiceBeansConfig.class) @ComponentScan("org.apache.ambari.server.security") -public class ApiSecurityConfig extends WebSecurityConfigurerAdapter{ +public class ApiSecurityConfig { private final GuiceBeansConfig guiceBeansConfig; @@ -78,16 +78,16 @@ public class ApiSecurityConfig extends WebSecurityConfigurerAdapter{ .authenticationProvider(ambariKerberosAuthenticationProvider); } - @Override @Bean - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); + public AuthenticationManager authenticationManagerBean(AuthenticationConfiguration authenticationConfiguration) throws Exception { + return authenticationConfiguration.getAuthenticationManager(); } - @Override + @Bean protected void configure(HttpSecurity http) throws Exception { http.csrf().disable() - .authorizeRequests().anyRequest().authenticated() + .authorizeRequests() + .anyRequest().authenticated() .and() .headers().httpStrictTransportSecurity().disable() .frameOptions().disable().and() diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiStompConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiStompConfig.java index d24313581d..0427e234b0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiStompConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiStompConfig.java @@ -27,17 +27,17 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import com.google.inject.Injector; +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; @Configuration @EnableWebSocketMessageBroker @ComponentScan(basePackageClasses = {TestController.class}) @Import(RootStompConfig.class) -public class ApiStompConfig extends AbstractWebSocketMessageBrokerConfigurer { +public class ApiStompConfig implements WebSocketMessageBrokerConfigurer { private final String HEARTBEAT_THREAD_NAME = "ws-heartbeat-thread-"; private final int HEARTBEAT_POOL_SIZE = 1; private final org.apache.ambari.server.configuration.Configuration configuration; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/RootStompConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/RootStompConfig.java index ee2d407e75..bf92992249 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/RootStompConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/RootStompConfig.java @@ -20,7 +20,7 @@ package org.apache.ambari.server.configuration.spring; import java.util.ArrayList; import java.util.List; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.agent.AgentSessionManager; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java index f8a99f6da4..f24721b612 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java @@ -28,9 +28,9 @@ import java.util.regex.Pattern; import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.api.AmbariErrorHandler; import org.apache.ambari.server.api.AmbariPersistFilter; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java index 1c0aa67de8..c38e82fc6b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.logging.LogManager; import javax.crypto.BadPaddingException; -import javax.servlet.DispatcherType; +import jakarta.servlet.DispatcherType; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.StateRecoveryManager; @@ -631,7 +631,8 @@ public class AmbariServer { https_config.setSendServerVersion(false); // Secured connector - default constructor sets trustAll = true for certs - SslContextFactory sslContextFactory = new SslContextFactory(); + // SslContextFactory sslContextFactory = new SslContextFactory(); depricated + SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); disableInsecureProtocols(sslContextFactory); sslContextFactory.setKeyStorePath(keystore); sslContextFactory.setTrustStorePath(truststore); @@ -677,7 +678,7 @@ public class AmbariServer { https_config.addCustomizer(new SecureRequestCustomizer()); https_config.setSecurePort(configs.getClientSSLApiPort()); - SslContextFactory contextFactoryApi = new SslContextFactory(); + SslContextFactory.Server contextFactoryApi = new SslContextFactory.Server(); disableInsecureProtocols(contextFactoryApi); contextFactoryApi.setKeyStorePath(httpsKeystore); contextFactoryApi.setTrustStorePath(httpsTruststore); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariSessionManager.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariSessionManager.java index 830ad78774..380d48bdbd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariSessionManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariSessionManager.java @@ -19,8 +19,8 @@ package org.apache.ambari.server.controller; import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.eclipse.jetty.server.session.SessionHandler; import org.springframework.web.context.request.RequestAttributes; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java b/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java index 0e00c2f01a..866b0bd0eb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java @@ -19,8 +19,8 @@ package org.apache.ambari.server.resources.api.rest; import java.io.File; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java index e4b13afea5..191fe2374b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java @@ -44,14 +44,14 @@ import java.util.regex.Pattern; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.ActionDBAccessor; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/AbstractSecurityHeaderFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/AbstractSecurityHeaderFilter.java index 4099612c4a..2b482d8c6c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/AbstractSecurityHeaderFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/AbstractSecurityHeaderFilter.java @@ -20,13 +20,13 @@ package org.apache.ambari.server.security; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.configuration.Configuration; import org.apache.commons.lang.StringUtils; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/AmbariEntryPoint.java b/ambari-server/src/main/java/org/apache/ambari/server/security/AmbariEntryPoint.java index fcfdab1ddd..25d60ff393 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/AmbariEntryPoint.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/AmbariEntryPoint.java @@ -19,9 +19,9 @@ package org.apache.ambari.server.security; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.security.authentication.kerberos.AmbariKerberosAuthenticationProperties; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/AmbariServerSecurityHeaderFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/AmbariServerSecurityHeaderFilter.java index 8d093661e4..8f2ea864d5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/AmbariServerSecurityHeaderFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/AmbariServerSecurityHeaderFilter.java @@ -18,7 +18,7 @@ package org.apache.ambari.server.security; -import javax.servlet.ServletRequest; +import jakarta.servlet.ServletRequest; import org.apache.ambari.server.configuration.Configuration; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/AmbariViewsSecurityHeaderFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/AmbariViewsSecurityHeaderFilter.java index 6b755fe2fd..ed4762f38a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/AmbariViewsSecurityHeaderFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/AmbariViewsSecurityHeaderFilter.java @@ -18,7 +18,7 @@ package org.apache.ambari.server.security; -import javax.servlet.ServletRequest; +import jakarta.servlet.ServletRequest; import org.apache.ambari.server.configuration.Configuration; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/SecurityFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/SecurityFilter.java index a1befa7d5a..7b31e685c6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/SecurityFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/SecurityFilter.java @@ -22,13 +22,13 @@ import java.io.IOException; import java.net.URL; import java.util.regex.Pattern; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import org.apache.ambari.server.configuration.Configuration; import org.slf4j.Logger; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationEventHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationEventHandler.java index 037fc13c23..266a998d40 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationEventHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationEventHandler.java @@ -18,10 +18,10 @@ package org.apache.ambari.server.security.authentication; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.core.Authentication; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationEventHandlerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationEventHandlerImpl.java index 42cc835729..18d0c1b321 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationEventHandlerImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationEventHandlerImpl.java @@ -18,10 +18,10 @@ package org.apache.ambari.server.security.authentication; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.audit.AuditLogger; import org.apache.ambari.server.audit.event.AuditEvent; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationFilter.java index f5d5617f67..fd54c2ea76 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationFilter.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.security.authentication; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; /** * AmbariAuthenticationFilter is a {@link Filter} interface to be implemented diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilter.java index f7936a1edd..e0471da0b2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilter.java @@ -19,11 +19,11 @@ package org.apache.ambari.server.security.authentication; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +//import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; import org.apache.ambari.server.security.AmbariEntryPoint; import org.apache.ambari.server.utils.RequestUtils; import org.apache.commons.lang.StringUtils; @@ -130,7 +130,6 @@ public class AmbariBasicAuthenticationFilter extends BasicAuthenticationFilter i * @throws IOException * @throws ServletException */ - @Override public void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, FilterChain filterChain) throws IOException, ServletException { if (eventHandler != null) { eventHandler.beforeAttemptAuthentication(this, httpServletRequest, httpServletResponse); @@ -215,4 +214,6 @@ public class AmbariBasicAuthenticationFilter extends BasicAuthenticationFilter i return token.substring(0, delimiter); } } + + } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariDelegatingAuthenticationFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariDelegatingAuthenticationFilter.java index c494995ee5..e48f0198c8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariDelegatingAuthenticationFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/AmbariDelegatingAuthenticationFilter.java @@ -21,13 +21,13 @@ import java.io.IOException; import java.util.Collection; import java.util.Collections; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/jwt/AmbariJwtAuthenticationFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/jwt/AmbariJwtAuthenticationFilter.java index 67e060c8ba..bd29bebf03 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/jwt/AmbariJwtAuthenticationFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/jwt/AmbariJwtAuthenticationFilter.java @@ -24,14 +24,14 @@ import java.text.ParseException; import java.util.Date; import java.util.List; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.configuration.AmbariServerConfigurationKey; import org.apache.ambari.server.security.authentication.AmbariAuthenticationEventHandler; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilter.java index 5e34c2e7d9..bf49f61412 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilter.java @@ -20,12 +20,12 @@ package org.apache.ambari.server.security.authentication.kerberos; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.audit.AuditLogger; import org.apache.ambari.server.configuration.Configuration; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/tproxy/TrustedProxyAuthenticationDetails.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/tproxy/TrustedProxyAuthenticationDetails.java index b254e667d2..9386894708 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/tproxy/TrustedProxyAuthenticationDetails.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/tproxy/TrustedProxyAuthenticationDetails.java @@ -18,7 +18,7 @@ package org.apache.ambari.server.security.authentication.tproxy; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.ambari.server.utils.RequestUtils; import org.springframework.security.web.authentication.WebAuthenticationDetails; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/tproxy/TrustedProxyAuthenticationDetailsSource.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/tproxy/TrustedProxyAuthenticationDetailsSource.java index 3f0af651c8..677e5fef1f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/tproxy/TrustedProxyAuthenticationDetailsSource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/tproxy/TrustedProxyAuthenticationDetailsSource.java @@ -18,7 +18,7 @@ package org.apache.ambari.server.security.authentication.tproxy; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.security.authentication.AuthenticationDetailsSource; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilter.java index c37bf02a2d..690ec79098 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilter.java @@ -23,14 +23,14 @@ import java.security.Principal; import java.util.EnumSet; import java.util.regex.Pattern; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.audit.AuditLogger; import org.apache.ambari.server.audit.event.AccessUnauthorizedAuditEvent; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariUserAuthorizationFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariUserAuthorizationFilter.java index 74394e49a3..8fdcf255be 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariUserAuthorizationFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariUserAuthorizationFilter.java @@ -20,14 +20,14 @@ package org.apache.ambari.server.security.authorization; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.orm.entities.UserEntity; import org.apache.ambari.server.scheduler.ExecutionScheduleManager; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/internal/InternalTokenClientFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/internal/InternalTokenClientFilter.java index c37915ee13..4c747a5154 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/internal/InternalTokenClientFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/internal/InternalTokenClientFilter.java @@ -20,8 +20,8 @@ package org.apache.ambari.server.security.authorization.internal; import java.io.IOException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; import com.google.inject.Inject; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java index bfc3f3a13d..ae70c2e739 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java @@ -17,7 +17,7 @@ */ package org.apache.ambari.server.security.unsecured.rest; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/RequestUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/RequestUtils.java index d0efb97af6..c8296ee7bd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/utils/RequestUtils.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/RequestUtils.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/AmbariViewsMDCLoggingFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/view/AmbariViewsMDCLoggingFilter.java index 90b46145db..0a2edbd5fc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/AmbariViewsMDCLoggingFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/AmbariViewsMDCLoggingFilter.java @@ -22,13 +22,13 @@ import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.MDC; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java index d5b2c0b53d..32047db841 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java @@ -25,6 +25,7 @@ import org.apache.ambari.server.view.configuration.ViewConfig; import org.eclipse.jetty.webapp.WebAppClassLoader; import org.eclipse.jetty.webapp.WebAppContext; + /** * Class loader used to load classes and resources from a search path of URLs referring to both JAR files * and directories. The URLs will be searched in the order specified for classes and resources before @@ -67,21 +68,21 @@ public class ViewClassLoader extends WebAppClassLoader { // ----- helper methods ---------------------------------------------------- // Get a context to initialize the class loader. - private static WebAppContext getInitContext(ViewConfig viewConfig) { + private static WebAppContext getInitContext(ViewConfig viewConfig) throws IOException { WebAppContext webAppContext = new WebAppContext(); // add ambari classes as system classes - webAppContext.addSystemClass("org.apache.ambari.server."); - webAppContext.addSystemClass("org.apache.ambari.view."); + webAppContext.getSystemClassMatcher().add("org.apache.ambari.server."); + webAppContext.getSystemClassMatcher().add("org.apache.ambari.view."); // add com.google.inject as system classes to allow for injection in view components using the google annotation - webAppContext.addSystemClass("com.google.inject."); + webAppContext.getSystemClassMatcher().add("com.google.inject."); // add as system classes to avoid conflicts and linkage errors - webAppContext.addSystemClass("org.slf4j."); - webAppContext.addSystemClass("com.sun.jersey."); - webAppContext.addSystemClass("org.apache.velocity."); + webAppContext.getSystemClassMatcher().add("org.slf4j."); + webAppContext.getSystemClassMatcher().add("com.sun.jersey."); + webAppContext.getSystemClassMatcher().add("org.apache.velocity."); // set the class loader settings from the configuration if (viewConfig != null) { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewThrottleFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewThrottleFilter.java index 9092e772c2..1f27bde138 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewThrottleFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewThrottleFilter.java @@ -21,14 +21,14 @@ import java.io.IOException; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.configuration.Configuration; import org.eclipse.jetty.continuation.Continuation; diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql index afd83c75be..893371aa51 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql @@ -1513,7 +1513,7 @@ INSERT INTO adminprivilege (privilege_id, permission_id, resource_id, principal_ (1, 1, 1, 1); INSERT INTO metainfo(metainfo_key, metainfo_value) VALUES -('version','${ambariSchemaVersion}'); +('version','3.0.0'); COMMIT; -- Quartz tables diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerIT.java b/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerIT.java index 29e09fd386..e1ca9ca06a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerIT.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerIT.java @@ -27,10 +27,10 @@ import java.io.InputStream; import java.util.Map; import java.util.Scanner; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java index c28b7e5b78..0e599c02dc 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java @@ -30,9 +30,9 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.util.UUID; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.security.authentication.jwt.JwtAuthenticationPropertiesProvider; import org.apache.http.HttpStatus; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariViewErrorHandlerProxyTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariViewErrorHandlerProxyTest.java index 8718bbf4f6..b2670ea037 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariViewErrorHandlerProxyTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariViewErrorHandlerProxyTest.java @@ -26,9 +26,9 @@ import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; import org.easymock.Capture; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/ContentTypeOverrideFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/ContentTypeOverrideFilterTest.java index 048f6c8f25..f4633900f5 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/ContentTypeOverrideFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/ContentTypeOverrideFilterTest.java @@ -23,12 +23,12 @@ import static org.easymock.EasyMock.expect; import java.io.IOException; import java.util.Vector; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/UserNameOverrideFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/UserNameOverrideFilterTest.java index 6d0635e4e9..90bad9506f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/UserNameOverrideFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/UserNameOverrideFilterTest.java @@ -30,10 +30,10 @@ import static org.junit.Assert.assertTrue; import java.net.URLEncoder; import java.util.regex.Matcher; -import javax.servlet.FilterChain; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import org.apache.ambari.server.security.authorization.AuthorizationHelper; import org.easymock.Capture; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java index 8b01752e1d..3d48f3ebce 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java @@ -29,19 +29,19 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javax.servlet.AsyncContext; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpUpgradeHandler; -import javax.servlet.http.Part; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpUpgradeHandler; +import jakarta.servlet.http.Part; import org.apache.ambari.server.api.query.QueryImpl; import org.apache.ambari.server.api.resources.HostComponentResourceDefinition; @@ -132,8 +132,8 @@ public class DefaultEventCreatorTest { } @Override - public javax.servlet.http.Cookie[] getCookies() { - return new javax.servlet.http.Cookie[0]; + public jakarta.servlet.http.Cookie[] getCookies() { + return new jakarta.servlet.http.Cookie[0]; } @Override diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java index b6d5555c30..c15155cd53 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java @@ -29,8 +29,8 @@ import java.util.ArrayList; import java.util.Arrays; import javax.inject.Provider; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.api.AmbariPersistFilter; import org.apache.ambari.server.configuration.Configuration; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java index c06d3c0e9b..5109715911 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java @@ -40,8 +40,8 @@ import java.util.EnumSet; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; -import javax.servlet.DispatcherType; -import javax.servlet.SessionCookieConfig; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.SessionCookieConfig; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.H2DatabaseCleaner; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariSessionManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariSessionManagerTest.java index de2d992de0..613fb17456 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariSessionManagerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariSessionManagerTest.java @@ -26,8 +26,8 @@ import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import javax.servlet.SessionCookieConfig; -import javax.servlet.http.HttpSession; +import jakarta.servlet.SessionCookieConfig; +import jakarta.servlet.http.HttpSession; import org.eclipse.jetty.server.session.SessionHandler; import org.junit.Test; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/AbstractSecurityHeaderFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/AbstractSecurityHeaderFilterTest.java index dc9772564e..bb728c99e3 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/AbstractSecurityHeaderFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/AbstractSecurityHeaderFilterTest.java @@ -24,10 +24,10 @@ import java.io.File; import java.util.Map; import java.util.Properties; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.state.stack.OsFamily; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariEntryPointTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariEntryPointTest.java index ba752f4821..991240d30f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariEntryPointTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariEntryPointTest.java @@ -24,9 +24,9 @@ import static org.easymock.EasyMock.expectLastCall; import java.io.IOException; import java.util.Properties; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.configuration.Configuration; import org.easymock.EasyMockSupport; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariServerSecurityHeaderFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariServerSecurityHeaderFilterTest.java index a2db5ceb50..5896a8872d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariServerSecurityHeaderFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariServerSecurityHeaderFilterTest.java @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.ambari.server.configuration.Configuration; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariViewsSecurityHeaderFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariViewsSecurityHeaderFilterTest.java index d317399db6..3c091c2689 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariViewsSecurityHeaderFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariViewsSecurityHeaderFilterTest.java @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.ambari.server.configuration.Configuration; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilterTest.java index 863be2fb05..1eb5093f8a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilterTest.java @@ -28,11 +28,11 @@ import static org.easymock.EasyMock.newCapture; import java.io.IOException; import java.util.List; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.ambari.server.security.AmbariEntryPoint; import org.easymock.Capture; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariDelegatingAuthenticationFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariDelegatingAuthenticationFilterTest.java index cf1be4be0e..c77d69a448 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariDelegatingAuthenticationFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariDelegatingAuthenticationFilterTest.java @@ -23,11 +23,11 @@ import static org.easymock.EasyMock.expectLastCall; import java.util.Arrays; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.easymock.EasyMockSupport; import org.junit.Test; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/jwt/AmbariJwtAuthenticationFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/jwt/AmbariJwtAuthenticationFilterTest.java index 4e35a5eb61..be6d962dce 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/jwt/AmbariJwtAuthenticationFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/jwt/AmbariJwtAuthenticationFilterTest.java @@ -42,10 +42,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.FilterChain; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.configuration.AmbariServerConfigurationKey; import org.apache.ambari.server.configuration.Configuration; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilterTest.java index f5087a12a2..f8ed060a04 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/kerberos/AmbariKerberosAuthenticationFilterTest.java @@ -31,11 +31,11 @@ import static org.easymock.EasyMock.startsWith; import java.io.IOException; import java.util.List; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.security.AmbariEntryPoint; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java index 459bccb1aa..a4185cac8c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java @@ -27,10 +27,10 @@ import static org.easymock.EasyMock.verify; import java.util.Collections; import javax.persistence.EntityManager; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.audit.AuditLogger; import org.apache.ambari.server.configuration.AmbariServerConfiguration; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariUserAuthenticationFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariUserAuthenticationFilterTest.java index 7c3a7fd2d5..cca32a464c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariUserAuthenticationFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariUserAuthenticationFilterTest.java @@ -33,10 +33,10 @@ import static org.junit.Assert.assertNull; import java.io.IOException; import java.util.HashSet; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.orm.entities.PrincipalEntity; import org.apache.ambari.server.orm.entities.UserEntity; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/utils/RequestUtilsTest.java b/ambari-server/src/test/java/org/apache/ambari/server/utils/RequestUtilsTest.java index 6452d99f42..7b8611f2ba 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/utils/RequestUtilsTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/utils/RequestUtilsTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertEquals; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.easymock.EasyMockSupport; import org.junit.Assert; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewThrottleFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewThrottleFilterTest.java index 54ee50bf42..1be041cc38 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewThrottleFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewThrottleFilterTest.java @@ -20,9 +20,9 @@ package org.apache.ambari.server.view; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.state.stack.OsFamily; diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/configuration/ViewConfigTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/configuration/ViewConfigTest.java index 5bd4e4dbfa..6203e04ac6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/view/configuration/ViewConfigTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/view/configuration/ViewConfigTest.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServlet; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; diff --git a/ambari-views/examples/cluster-view/src/main/java/org/apache/ambari/view/cluster/ClusterConfigServlet.java b/ambari-views/examples/cluster-view/src/main/java/org/apache/ambari/view/cluster/ClusterConfigServlet.java index e58c1484a3..4af6923611 100644 --- a/ambari-views/examples/cluster-view/src/main/java/org/apache/ambari/view/cluster/ClusterConfigServlet.java +++ b/ambari-views/examples/cluster-view/src/main/java/org/apache/ambari/view/cluster/ClusterConfigServlet.java @@ -20,12 +20,12 @@ package org.apache.ambari.view.cluster; import org.apache.ambari.view.ViewContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.Map; diff --git a/ambari-views/examples/hello-servlet-view/src/main/java/org/apache/ambari/view/hello/HelloServlet.java b/ambari-views/examples/hello-servlet-view/src/main/java/org/apache/ambari/view/hello/HelloServlet.java index d417c0f80d..745b4f29d9 100644 --- a/ambari-views/examples/hello-servlet-view/src/main/java/org/apache/ambari/view/hello/HelloServlet.java +++ b/ambari-views/examples/hello-servlet-view/src/main/java/org/apache/ambari/view/hello/HelloServlet.java @@ -20,12 +20,12 @@ package org.apache.ambari.view.hello; import org.apache.ambari.view.ViewContext; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.Map; diff --git a/ambari-views/examples/hello-spring-view/src/main/java/org/apache/ambari/view/hello/HelloController.java b/ambari-views/examples/hello-spring-view/src/main/java/org/apache/ambari/view/hello/HelloController.java index 665e7afe40..9056efcd8e 100644 --- a/ambari-views/examples/hello-spring-view/src/main/java/org/apache/ambari/view/hello/HelloController.java +++ b/ambari-views/examples/hello-spring-view/src/main/java/org/apache/ambari/view/hello/HelloController.java @@ -24,7 +24,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Controller for the Hello Spring app view. diff --git a/ambari-views/examples/phone-list-upgrade-view/src/main/java/org/apache/ambari/view/phonelist/PhoneListServlet.java b/ambari-views/examples/phone-list-upgrade-view/src/main/java/org/apache/ambari/view/phonelist/PhoneListServlet.java index 6ed87cde8c..c1dba1dd44 100644 --- a/ambari-views/examples/phone-list-upgrade-view/src/main/java/org/apache/ambari/view/phonelist/PhoneListServlet.java +++ b/ambari-views/examples/phone-list-upgrade-view/src/main/java/org/apache/ambari/view/phonelist/PhoneListServlet.java @@ -22,12 +22,12 @@ import org.apache.ambari.view.DataStore; import org.apache.ambari.view.ViewContext; import org.apache.ambari.view.PersistenceException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.Collection; diff --git a/ambari-views/examples/phone-list-view/src/main/java/org/apache/ambari/view/phonelist/PhoneListServlet.java b/ambari-views/examples/phone-list-view/src/main/java/org/apache/ambari/view/phonelist/PhoneListServlet.java index 146a8e3e67..9657001843 100644 --- a/ambari-views/examples/phone-list-view/src/main/java/org/apache/ambari/view/phonelist/PhoneListServlet.java +++ b/ambari-views/examples/phone-list-view/src/main/java/org/apache/ambari/view/phonelist/PhoneListServlet.java @@ -22,12 +22,12 @@ import org.apache.ambari.view.DataStore; import org.apache.ambari.view.ViewContext; import org.apache.ambari.view.PersistenceException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.Collection; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
