This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch branch-feature-jdk11
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit f6ca8bc9734eb4d60a1cccaabb3ec57ebd7ee9ee
Author: Doroszlai, Attila <6454655+adorosz...@users.noreply.github.com>
AuthorDate: Fri Oct 5 17:39:28 2018 +0200
AMBARI-24729. Ambari Server stops with Java 9 due to Guice error (#2418)
---
ambari-agent/pom.xml | 1 +
ambari-project/pom.xml | 6 +++---
ambari-server/pom.xml | 2 +-
.../apache/ambari/server/orm/entities/ClusterConfigEntity.java | 2 +-
.../server/orm/entities/HostComponentDesiredStateEntity.java | 3 ++-
.../ambari/server/orm/entities/HostComponentStateEntity.java | 4 ++--
.../apache/ambari/server/orm/entities/UpgradeHistoryEntity.java | 8 +++++---
.../server/serveraction/upgrades/FinalizeUpgradeAction.java | 2 +-
.../ambari/server/stack/upgrade/ConfigurationCondition.java | 4 ++--
.../java/org/apache/ambari/server/stack/upgrade/Grouping.java | 4 ++--
.../org/apache/ambari/server/stack/upgrade/HostOrderItem.java | 4 ++--
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java | 2 +-
pom.xml | 2 +-
13 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index da0f3b1..8d08587 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -88,6 +88,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <version>20.0</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 3c57f54..b20140a 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -36,7 +36,7 @@
<swagger.version>1.5.19</swagger.version>
<swagger.maven.plugin.version>3.1.5</swagger.maven.plugin.version>
<slf4j.version>1.7.20</slf4j.version>
- <guice.version>4.1.0</guice.version>
+ <guice.version>4.2.1</guice.version>
<spring.version>4.3.18.RELEASE</spring.version>
<spring.security.version>4.2.7.RELEASE</spring.security.version>
<fasterxml.jackson.version>2.9.5</fasterxml.jackson.version>
@@ -230,7 +230,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>eclipselink</artifactId>
+ <artifactId>org.eclipse.persistence.jpa</artifactId>
<version>${eclipselink.version}</version>
</dependency>
<dependency>
@@ -241,7 +241,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>26.0-jre</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 53ca716..bc7cdcf 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1238,7 +1238,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>eclipselink</artifactId>
+ <artifactId>org.eclipse.persistence.jpa</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
index 287ee89..f6de06d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
@@ -303,7 +303,7 @@ public class ClusterConfigEntity {
*/
@Override
public String toString() {
- return com.google.common.base.Objects.toStringHelper(this)
+ return com.google.common.base.MoreObjects.toStringHelper(this)
.add("clusterId", clusterId)
.add("type", type)
.add("version", version)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentDesiredStateEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentDesiredStateEntity.java
index 3a2506d..eba273f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentDesiredStateEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentDesiredStateEntity.java
@@ -41,6 +41,7 @@ import org.apache.ambari.server.state.HostComponentAdminState;
import org.apache.ambari.server.state.MaintenanceState;
import org.apache.ambari.server.state.State;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
@@ -278,7 +279,7 @@ public class HostComponentDesiredStateEntity {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).add("serviceName",
serviceName).add("componentName",
+ return MoreObjects.toStringHelper(this).add("serviceName",
serviceName).add("componentName",
componentName).add("hostId", hostId).add("desiredState",
desiredState).toString();
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentStateEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentStateEntity.java
index 0d295a4..dacaa55 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentStateEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostComponentStateEntity.java
@@ -36,7 +36,7 @@ import javax.persistence.TableGenerator;
import org.apache.ambari.server.state.State;
import org.apache.ambari.server.state.UpgradeState;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
@Entity
@Table(name = "hostcomponentstate")
@@ -260,7 +260,7 @@ public class HostComponentStateEntity {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).add("serviceName",
serviceName).add("componentName",
+ return MoreObjects.toStringHelper(this).add("serviceName",
serviceName).add("componentName",
componentName).add("hostId", hostId).add("state",
currentState).toString();
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
index 0f7ac72..5fe2ef0 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
@@ -17,6 +17,8 @@
*/
package org.apache.ambari.server.orm.entities;
+import java.util.Objects;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -32,7 +34,7 @@ import javax.persistence.UniqueConstraint;
import org.apache.commons.lang.builder.EqualsBuilder;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
/**
* The {@link UpgradeHistoryEntity} represents the version history of
components
@@ -214,7 +216,7 @@ public class UpgradeHistoryEntity {
*/
@Override
public int hashCode() {
- return Objects.hashCode(id, upgradeId, serviceName, componentName);
+ return Objects.hash(id, upgradeId, serviceName, componentName);
}
/**
@@ -222,7 +224,7 @@ public class UpgradeHistoryEntity {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("upgradeId", upgradeId)
.add("serviceName", serviceName)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index 67c0be9..46c1709 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -552,7 +552,7 @@ public class FinalizeUpgradeAction extends
AbstractUpgradeServerAction {
*/
@Override
public String toString() {
- return com.google.common.base.Objects.toStringHelper(this)
+ return com.google.common.base.MoreObjects.toStringHelper(this)
.add("host", hostName)
.add("component", componentName)
.add("current", currentVersion)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ConfigurationCondition.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ConfigurationCondition.java
index 4e59100..fafd5e7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ConfigurationCondition.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ConfigurationCondition.java
@@ -31,7 +31,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Config;
import org.apache.commons.lang.StringUtils;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
/**
* The {@link ConfigurationCondition} class is used to represent a condition on
@@ -119,7 +119,7 @@ public final class ConfigurationCondition extends Condition
{
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).add("type", type).add("property",
property).add("value",
+ return MoreObjects.toStringHelper(this).add("type", type).add("property",
property).add("value",
value).add("comparison", comparisonType).omitNullValues().toString();
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/Grouping.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/Grouping.java
index 19e826e..aab70a3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/Grouping.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/Grouping.java
@@ -42,7 +42,7 @@ import
org.apache.ambari.server.stack.upgrade.orchestrate.UpgradeContext;
import org.apache.ambari.server.utils.SetUtils;
import org.apache.commons.lang.StringUtils;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
/**
*
@@ -424,6 +424,6 @@ public class Grouping {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).add("name", name).toString();
+ return MoreObjects.toStringHelper(this).add("name", name).toString();
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/HostOrderItem.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/HostOrderItem.java
index 8fe361f..87557e7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/HostOrderItem.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/HostOrderItem.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.ambari.spi.upgrade.UpgradeType;
import org.apache.commons.lang.StringUtils;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
/**
* The {@link HostOrderItem} class represents the orchestration order of hosts
@@ -96,7 +96,7 @@ public class HostOrderItem {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).add("type", m_type).add("items",
+ return MoreObjects.toStringHelper(this).add("type", m_type).add("items",
StringUtils.join(m_actionItems, ", ")).omitNullValues().toString();
}
}
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
index 43a3d5f..63e0e74 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
@@ -1662,7 +1662,7 @@ public class UpgradeCatalog270 extends
AbstractUpgradeCatalog {
final HostAndPort hostAndPort =
HostAndPort.fromString(propertyValue);
AmbariServerConfigurationKey keyToBesaved =
AmbariServerConfigurationKey.SERVER_HOST == key ?
AmbariServerConfigurationKey.SERVER_HOST
: AmbariServerConfigurationKey.SECONDARY_SERVER_HOST;
- populateConfigurationToBeMoved(propertiesToBeMoved, oldPropertyName,
keyToBesaved, hostAndPort.getHostText());
+ populateConfigurationToBeMoved(propertiesToBeMoved, oldPropertyName,
keyToBesaved, hostAndPort.getHost());
keyToBesaved = AmbariServerConfigurationKey.SERVER_HOST == key ?
AmbariServerConfigurationKey.SERVER_PORT :
AmbariServerConfigurationKey.SECONDARY_SERVER_PORT;
populateConfigurationToBeMoved(propertiesToBeMoved, oldPropertyName,
keyToBesaved, String.valueOf(hostAndPort.getPort()));
diff --git a/pom.xml b/pom.xml
index a43f7c5..a96e9bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
<distMgmtSnapshotsName>Apache Development Snapshot
Repository</distMgmtSnapshotsName>
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
<assemblyPhase>package</assemblyPhase> <!-- use -DassemblyPhase=none to
skip building tarball, useful when you want purely compile jar -->
- <eclipselink.version>2.6.2</eclipselink.version>
+ <eclipselink.version>2.7.3</eclipselink.version>
</properties>
<pluginRepositories>
<pluginRepository>
