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
The following commit(s) were added to refs/heads/trunk by this push:
new ce246f35c6 AMBARI-26320: Fix jersey conflict error when ambari server
start (#3953)
ce246f35c6 is described below
commit ce246f35c69556f142ef20ac23050a6cee1dacc7
Author: jialiang <[email protected]>
AuthorDate: Tue Mar 11 09:09:54 2025 +0800
AMBARI-26320: Fix jersey conflict error when ambari server start (#3953)
---
ambari-agent/pom.xml | 12 ++++++++
ambari-server/pom.xml | 35 +++++++++++++++++++++-
ambari-utility/pom.xml | 8 +++++
ambari-views/examples/hello-spring-view/pom.xml | 2 +-
ambari-views/examples/helloworld-view/pom.xml | 2 +-
.../examples/phone-list-upgrade-view/pom.xml | 2 +-
ambari-views/examples/phone-list-view/pom.xml | 2 +-
.../examples/property-validator-view/pom.xml | 2 +-
ambari-views/examples/property-view/pom.xml | 2 +-
ambari-views/examples/restricted-view/pom.xml | 2 +-
ambari-views/examples/simple-view/pom.xml | 2 +-
11 files changed, 62 insertions(+), 9 deletions(-)
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 6df63da55f..045f54dc14 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -108,6 +108,18 @@
<artifactId>hadoop-common</artifactId>
<version>2.7.3</version>
<exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index eff3bced80..36fcdeda57 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1444,6 +1444,7 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
@@ -1504,6 +1505,14 @@
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1623,7 +1632,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
- <version>3.2.4</version>
+ <version>3.3.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -1806,6 +1815,30 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
diff --git a/ambari-utility/pom.xml b/ambari-utility/pom.xml
index cb1c4ce4be..5df8f93ce0 100644
--- a/ambari-utility/pom.xml
+++ b/ambari-utility/pom.xml
@@ -41,6 +41,14 @@
<artifactId>swagger-maven-plugin</artifactId>
<scope>provided</scope>
<exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
diff --git a/ambari-views/examples/hello-spring-view/pom.xml
b/ambari-views/examples/hello-spring-view/pom.xml
index 8d022da6f6..de621c9a48 100644
--- a/ambari-views/examples/hello-spring-view/pom.xml
+++ b/ambari-views/examples/hello-spring-view/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/ambari-views/examples/helloworld-view/pom.xml
b/ambari-views/examples/helloworld-view/pom.xml
index 23be8969c9..6f7bbaf186 100644
--- a/ambari-views/examples/helloworld-view/pom.xml
+++ b/ambari-views/examples/helloworld-view/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
</dependency>
</dependencies>
diff --git a/ambari-views/examples/phone-list-upgrade-view/pom.xml
b/ambari-views/examples/phone-list-upgrade-view/pom.xml
index e12ccfc534..11043230b6 100644
--- a/ambari-views/examples/phone-list-upgrade-view/pom.xml
+++ b/ambari-views/examples/phone-list-upgrade-view/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/ambari-views/examples/phone-list-view/pom.xml
b/ambari-views/examples/phone-list-view/pom.xml
index 15757e8537..a25f2312aa 100644
--- a/ambari-views/examples/phone-list-view/pom.xml
+++ b/ambari-views/examples/phone-list-view/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/ambari-views/examples/property-validator-view/pom.xml
b/ambari-views/examples/property-validator-view/pom.xml
index c83575e73c..f081b7a77b 100644
--- a/ambari-views/examples/property-validator-view/pom.xml
+++ b/ambari-views/examples/property-validator-view/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
diff --git a/ambari-views/examples/property-view/pom.xml
b/ambari-views/examples/property-view/pom.xml
index 0243463439..7a6df95776 100644
--- a/ambari-views/examples/property-view/pom.xml
+++ b/ambari-views/examples/property-view/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
diff --git a/ambari-views/examples/restricted-view/pom.xml
b/ambari-views/examples/restricted-view/pom.xml
index 15f40d4ecf..eca2bc6c5e 100644
--- a/ambari-views/examples/restricted-view/pom.xml
+++ b/ambari-views/examples/restricted-view/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
diff --git a/ambari-views/examples/simple-view/pom.xml
b/ambari-views/examples/simple-view/pom.xml
index 105cfda977..ca6a037acf 100644
--- a/ambari-views/examples/simple-view/pom.xml
+++ b/ambari-views/examples/simple-view/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.8</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
