Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HDDS-2302. Manage common pom versions in one common place #21

Closed
wants to merge 2 commits into from
Closed

HDDS-2302. Manage common pom versions in one common place #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ba4d89
HDDS-2032. Ozone client should retry writes in case of any ratis/stat…
elek Oct 14, 2019
ef0a5c3
fix ozone version calculation
elek Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions hadoop-hdds/pom.xml
View file
Open in desktop
Expand Up @@ -41,14 +41,6 @@ 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>

Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dev-support/checks/acceptance.sh
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ cd "$DIR/../../.." || exit 1
REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/acceptance"}
mkdir -p "$REPORT_DIR"

OZONE_VERSION=$(grep "<ozone.version>" "$DIR/../../pom.xml" | sed 's/<[^>]*>//g'| sed 's/^[ \t]*//')
OZONE_VERSION=$(grep "<ozone.version>" "pom.xml" | sed 's/<[^>]*>//g'| sed 's/^[ \t]*//')
DIST_DIR="$DIR/../../dist/target/ozone-$OZONE_VERSION"

if [ ! -d "$DIST_DIR" ]; then
Expand Down
8 changes: 0 additions & 8 deletions hadoop-ozone/pom.xml
View file
Open in desktop
Expand Up @@ -25,14 +25,6 @@
<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>
Expand Down
15 changes: 12 additions & 3 deletions pom.xml
View file
Open in desktop
Expand Up @@ -71,6 +71,15 @@ 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>
Expand Down Expand Up @@ -117,6 +126,8 @@ 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>

Expand Down Expand Up @@ -155,8 +166,6 @@ 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>
Expand All @@ -182,7 +191,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>2.21.0</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.0.0-M1</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>

Expand Down