This is an automated email from the ASF dual-hosted git repository.
aengineer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 61c161c Revert "HDDS-2032. Ozone client should retry writes in case
of any ratis/stateMachine exceptions"
61c161c is described below
commit 61c161ce054f8a071ec86fd8be4c9a5ccd2dab9e
Author: Anu Engineer <aengin...@apache.org>
AuthorDate: Wed Oct 16 15:36:14 2019 -0700
Revert "HDDS-2032. Ozone client should retry writes in case of any
ratis/stateMachine exceptions"
This reverts commit 9f88f427644bcf71a4916239e585d67805228cae.
---
hadoop-hdds/pom.xml | 8 ++++++++
hadoop-ozone/dev-support/checks/acceptance.sh | 2 +-
hadoop-ozone/pom.xml | 8 ++++++++
pom.xml | 15 +++------------
4 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index 9cd5db3..d79f9b6 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -41,6 +41,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</modules>
<properties>
+ <!-- version for hdds/ozone components -->
+ <hdds.version>0.5.0-SNAPSHOT</hdds.version>
+
+ <!-- Apache Ratis version -->
+ <ratis.version>0.5.0-3f446aa-SNAPSHOT</ratis.version>
+
+ <bouncycastle.version>1.60</bouncycastle.version>
+
<protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version>
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
diff --git a/hadoop-ozone/dev-support/checks/acceptance.sh
b/hadoop-ozone/dev-support/checks/acceptance.sh
index c3c1aa0..ee03c58 100755
--- a/hadoop-ozone/dev-support/checks/acceptance.sh
+++ b/hadoop-ozone/dev-support/checks/acceptance.sh
@@ -19,7 +19,7 @@ cd "$DIR/../../.." || exit 1
REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/acceptance"}
mkdir -p "$REPORT_DIR"
-OZONE_VERSION=$(grep "<ozone.version>" "pom.xml" | sed 's/<[^>]*>//g'| sed
's/^[ \t]*//')
+OZONE_VERSION=$(grep "<ozone.version>" "$DIR/../../pom.xml" | sed
's/<[^>]*>//g'| sed 's/^[ \t]*//')
DIST_DIR="$DIR/../../dist/target/ozone-$OZONE_VERSION"
if [ ! -d "$DIST_DIR" ]; then
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 6d8b465..b1c3f91 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -25,6 +25,14 @@
<packaging>pom</packaging>
<properties>
+ <hdds.version>0.5.0-SNAPSHOT</hdds.version>
+ <ozone.version>0.5.0-SNAPSHOT</ozone.version>
+ <ratis.version>0.5.0-3f446aa-SNAPSHOT</ratis.version>
+ <bouncycastle.version>1.60</bouncycastle.version>
+ <ozone.release>Crater Lake</ozone.release>
+ <declared.ozone.version>${ozone.version}</declared.ozone.version>
+ <maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
+ <guice.version>4.0</guice.version>
<docker.image>apache/ozone:${project.version}</docker.image>
</properties>
<modules>
diff --git a/pom.xml b/pom.xml
index 2e5ccb4..82b2e40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,15 +71,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<properties>
<hadoop.version>3.2.0</hadoop.version>
- <!-- version for hdds/ozone components -->
- <hdds.version>${ozone.version}</hdds.version>
- <ozone.version>0.5.0-SNAPSHOT</ozone.version>
- <ozone.release>Crater Lake</ozone.release>
- <declared.ozone.version>${ozone.version}</declared.ozone.version>
-
- <!-- Apache Ratis version -->
- <ratis.version>0.5.0-3f446aa-SNAPSHOT</ratis.version>
-
<distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>
<distMgmtSnapshotsName>Apache Development Snapshot
Repository</distMgmtSnapshotsName>
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
@@ -126,8 +117,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<!-- avro version -->
<avro.version>1.7.7</avro.version>
- <bouncycastle.version>1.60</bouncycastle.version>
-
<!-- jersey version -->
<jersey.version>1.19</jersey.version>
@@ -166,6 +155,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<apacheds.version>2.0.0-M21</apacheds.version>
<ldap-api.version>1.0.0-M33</ldap-api.version>
+ <!-- Apache Ratis version -->
+ <ratis.version>0.5.0-3f446aa-SNAPSHOT</ratis.version>
<jcache.version>1.0-alpha-1</jcache.version>
<ehcache.version>3.3.1</ehcache.version>
<hikari.version>2.4.12</hikari.version>
@@ -191,7 +182,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<!-- Plugin versions and config -->
<maven-surefire-plugin.argLine>-Xmx2048m
-XX:+HeapDumpOnOutOfMemoryError</maven-surefire-plugin.argLine>
- <maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
+ <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
<maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: hdfs-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: hdfs-commits-h...@hadoop.apache.org
