Skip to content

Commit 2a5e5e9

Browse files
committed
HBASE-19526 Update hadoop version to 3.0 GA
1 parent 26b69dc commit 2a5e5e9

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

dev-support/hbase-personality.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ function hadoopcheck_rebuild
300300
else
301301
hbase_hadoop2_versions="${hbase_common_hadoop2_versions}"
302302
fi
303-
hbase_hadoop3_versions="3.0.0-beta1"
303+
hbase_hadoop3_versions="3.0.0"
304304
fi
305305

306306
export MAVEN_OPTS="${MAVEN_OPTS}"

hbase-resource-bundle/src/main/resources/supplemental-models.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ under the License.
601601
</supplement>
602602

603603
<supplement>
604-
<project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 -->
604+
<project> <!-- hadoop.profile=3.0 from hadoop-3.0.0 -->
605605
<groupId>com.codahale.metrics</groupId>
606606
<artifactId>metrics-core</artifactId>
607607
<version>3.0.1</version>
@@ -615,7 +615,7 @@ under the License.
615615
</project>
616616
</supplement>
617617
<supplement>
618-
<project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 -->
618+
<project> <!-- hadoop.profile=3.0 from hadoop-3.0.0 -->
619619
<groupId>com.squareup.okhttp</groupId>
620620
<artifactId>okhttp</artifactId>
621621
<version>2.4.0</version>
@@ -629,7 +629,7 @@ under the License.
629629
</project>
630630
</supplement>
631631
<supplement>
632-
<project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 -->
632+
<project> <!-- hadoop.profile=3.0 from hadoop-3.0.0 -->
633633
<groupId>com.squareup.okio</groupId>
634634
<artifactId>okio</artifactId>
635635
<version>1.4.0</version>
@@ -644,7 +644,7 @@ under the License.
644644
</supplement>
645645

646646
<supplement>
647-
<project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 -->
647+
<project> <!-- hadoop.profile=3.0 from hadoop-3.0.0 -->
648648
<groupId>de.ruedigermoeller</groupId>
649649
<artifactId>fst</artifactId>
650650
<version>2.24</version>
@@ -663,7 +663,7 @@ under the License.
663663
</supplement>
664664

665665
<supplement>
666-
<project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha1 -->
666+
<project> <!-- hadoop.profile=3.0 from hadoop-3.0.0 -->
667667
<groupId>org.objenesis</groupId>
668668
<artifactId>objenesis</artifactId>
669669
<version>2.1</version>
@@ -800,7 +800,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
800800
</project>
801801
</supplement>
802802
<supplement>
803-
<project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-beta1 -->
803+
<project> <!-- hadoop.profile=3.0 from hadoop-3.0.0 -->
804804
<groupId>org.codehaus.woodstox</groupId>
805805
<artifactId>stax2-api</artifactId>
806806
<version>3.1.4</version>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,7 @@
14021402
<java.min.version>${compileSource}</java.min.version>
14031403
<!-- Dependencies -->
14041404
<hadoop-two.version>2.7.4</hadoop-two.version>
1405-
<hadoop-three.version>3.0.0-beta1</hadoop-three.version>
1405+
<hadoop-three.version>3.0.0</hadoop-three.version>
14061406
<!-- These must be defined here for downstream build tools that don't look at profiles.
14071407
They ought to match the values found in our default hadoop profile, which is
14081408
currently "hadoop-2.0". See HBASE-15925 for more info. -->

src/main/asciidoc/_chapters/configuration.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Linux Shell::
176176
177177
Windows::
178178
Prior to HBase 0.96, running HBase on Microsoft Windows was limited only for testing purposes.
179-
Running production systems on Windows machines is not recommended.
179+
Running production systems on Windows machines is not recommended.
180180
181181
182182
[[hadoop]]
@@ -221,7 +221,7 @@ Use the following legend to interpret this table:
221221
|Hadoop-2.7.1+ | NT | S | S | S
222222
|Hadoop-2.8.0 | X | X | X | X
223223
|Hadoop-2.8.1 | X | X | X | X
224-
|Hadoop-3.0.0-alphax | NT | NT | NT | NT
224+
|Hadoop-3.0.0 | NT | NT | NT | NT
225225
|===
226226
227227
.Hadoop Pre-2.6.1 and JDK 1.8 Kerberos
@@ -349,7 +349,7 @@ to _false_. For example:
349349
</property>
350350
</configuration>
351351
----
352-
352+
353353
[[distributed]]
354354
=== Distributed
355355

src/main/asciidoc/_chapters/developer.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ mvn -Dhadoop.profile=3.0 ...
402402
The above will build against whatever explicit hadoop 3.y version we have in our _pom.xml_ as our '3.0' version.
403403
Tests may not all pass so you may need to pass `-DskipTests` unless you are inclined to fix the failing tests.
404404

405-
To pick a particular Hadoop 3.y release, you'd set e.g. `-Dhadoop-three.version=3.0.0-alpha1`.
405+
To pick a particular Hadoop 3.y release, you'd set hadoop-three.version property e.g. `-Dhadoop-three.version=3.0.0`.
406406

407407
[[build.protobuf]]
408408
==== Build Protobuf

0 commit comments

Comments
 (0)