This is an automated email from the ASF dual-hosted git repository.
jialiang pushed a commit to branch spring6_upgrade
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/spring6_upgrade by this push:
new f91792606d AMBARI-26357: Errors occur when compiling ambari after
upgrading jetty (#3964)
f91792606d is described below
commit f91792606d48a74cc6cce9dbf2bcd904e7fdbc21
Author: Peng Lu <[email protected]>
AuthorDate: Tue Mar 25 09:02:25 2025 +0800
AMBARI-26357: Errors occur when compiling ambari after upgrading jetty
(#3964)
* Errors occur when compiling ambari after upgrading jetty
* Remove some duplicate content
---
ambari-admin/pom.xml | 1 -
ambari-agent/pom.xml | 1 -
ambari-funtest/pom.xml | 1 -
ambari-project/pom.xml | 1 -
ambari-server-spi/pom.xml | 1 -
ambari-server/pom.xml | 6 -----
.../audit/request/DefaultEventCreatorTest.java | 26 +++++++++++++---------
.../ambari/server/controller/AmbariServerTest.java | 5 -----
ambari-serviceadvisor/pom.xml | 2 --
ambari-utility/pom.xml | 8 -------
ambari-views/pom.xml | 1 -
11 files changed, 16 insertions(+), 37 deletions(-)
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index ebf92333d9..bd9ec05bfa 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -23,7 +23,6 @@
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ambari</groupId>
<artifactId>ambari-admin</artifactId>
<packaging>jar</packaging>
<name>Ambari Admin View</name>
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 37847a5a28..6de108f6d5 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -23,7 +23,6 @@
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ambari</groupId>
<artifactId>ambari-agent</artifactId>
<name>Ambari Agent</name>
<description>Ambari Agent</description>
diff --git a/ambari-funtest/pom.xml b/ambari-funtest/pom.xml
index 8c2b86392f..27f969db6a 100644
--- a/ambari-funtest/pom.xml
+++ b/ambari-funtest/pom.xml
@@ -16,7 +16,6 @@
<version>${revision}</version>
<relativePath>../ambari-project</relativePath>
</parent>
- <groupId>org.apache.ambari</groupId>
<artifactId>ambari-funtest</artifactId>
<packaging>jar</packaging>
<name>Ambari Functional Tests</name>
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 8b4f5d0671..8ce3c7aa0f 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -20,7 +20,6 @@
<artifactId>ambari</artifactId>
<version>${revision}</version>
</parent>
- <groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
<description>Apache Ambari Project POM</description>
<name>Apache Ambari Project POM</name>
diff --git a/ambari-server-spi/pom.xml b/ambari-server-spi/pom.xml
index a31dce216a..454715a972 100644
--- a/ambari-server-spi/pom.xml
+++ b/ambari-server-spi/pom.xml
@@ -21,7 +21,6 @@
<version>${revision}</version>
<relativePath>../ambari-project</relativePath>
</parent>
-
<artifactId>ambari-server-spi</artifactId>
<url>http://ambari.apache.org</url>
<name>Ambari Server SPI</name>
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 404a9e7e33..15aeff6676 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -16,7 +16,6 @@
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ambari</groupId>
<artifactId>ambari-server</artifactId>
<packaging>jar</packaging>
<name>Ambari Server</name>
@@ -1480,11 +1479,6 @@
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.databind.version}</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
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 3d48f3ebce..794e5bf1f8 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
@@ -32,6 +32,7 @@ import java.util.Map;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletInputStream;
@@ -250,11 +251,6 @@ public class DefaultEventCreatorTest {
return false;
}
- @Override
- public boolean isRequestedSessionIdFromUrl() {
- return false;
- }
-
@Override
public boolean authenticate(HttpServletResponse httpServletResponse)
throws IOException, ServletException {
return false;
@@ -408,11 +404,6 @@ public class DefaultEventCreatorTest {
return null;
}
- @Override
- public String getRealPath(String s) {
- return null;
- }
-
@Override
public int getRemotePort() {
return 0;
@@ -467,6 +458,21 @@ public class DefaultEventCreatorTest {
public DispatcherType getDispatcherType() {
return null;
}
+
+ @Override
+ public String getRequestId() {
+ return "";
+ }
+
+ @Override
+ public String getProtocolRequestId() {
+ return "";
+ }
+
+ @Override
+ public ServletConnection getServletConnection() {
+ return null;
+ }
}));
}
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 dd51e334b8..df07791aa4 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,7 +40,6 @@ import java.util.EnumSet;
import jakarta.persistence.EntityManager;
import jakarta.persistence.TypedQuery;
-import jakarta.servlet.DispatcherType;
import jakarta.servlet.SessionCookieConfig;
import org.apache.ambari.server.AmbariException;
@@ -164,8 +163,6 @@ public class AmbariServerTest {
handler.setMaxFormContentSize(-1);
EasyMock.expectLastCall().once();
- EasyMock.expect(handler.addFilter(GzipFilter.class, "/*",
- EnumSet.of(DispatcherType.REQUEST))).andReturn(filter).once();
EasyMock.expect(handler.getMimeTypes()).andReturn(new
MimeTypes()).anyTimes();
replay(handler, filter);
@@ -180,8 +177,6 @@ public class AmbariServerTest {
EasyMock.createNiceMock(ServletContextHandler.class);
final FilterHolder filter = EasyMock.createNiceMock(FilterHolder.class);
- EasyMock.expect(handler.addFilter(GzipFilter.class, "/*",
- EnumSet.of(DispatcherType.REQUEST))).andReturn(filter).once();
filter.setInitParameter(anyObject(String.class),anyObject(String.class));
EasyMock.expectLastCall().times(3);
replay(handler, filter);
diff --git a/ambari-serviceadvisor/pom.xml b/ambari-serviceadvisor/pom.xml
index 5393d3d5e8..2a2254acc4 100644
--- a/ambari-serviceadvisor/pom.xml
+++ b/ambari-serviceadvisor/pom.xml
@@ -30,8 +30,6 @@
<version>${revision}</version>
<relativePath>../ambari-project</relativePath>
</parent>
-
- <groupId>org.apache.ambari</groupId>
<artifactId>ambari-serviceadvisor</artifactId>
<name>Ambari Service Advisor</name>
<description>Service Advisor</description>
diff --git a/ambari-utility/pom.xml b/ambari-utility/pom.xml
index 3c42783eea..15dde3df66 100644
--- a/ambari-utility/pom.xml
+++ b/ambari-utility/pom.xml
@@ -26,9 +26,7 @@
<version>${revision}</version>
<relativePath>../ambari-project</relativePath>
</parent>
-
<artifactId>ambari-utility</artifactId>
- <groupId>org.apache.ambari</groupId>
<dependencies>
<dependency>
@@ -149,12 +147,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>jakarta.ws.rs</groupId>
- <artifactId>jakarta.ws.rs-api</artifactId>
- <version>3.1.0</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
diff --git a/ambari-views/pom.xml b/ambari-views/pom.xml
index 5094ce21c2..695a18dd70 100644
--- a/ambari-views/pom.xml
+++ b/ambari-views/pom.xml
@@ -24,7 +24,6 @@
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ambari</groupId>
<artifactId>ambari-views</artifactId>
<packaging>jar</packaging>
<name>Ambari Views</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
