diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub index fdd6c6081862..02eb46b4ff7d 100644 --- a/dev-support/Jenkinsfile_GitHub +++ b/dev-support/Jenkinsfile_GitHub @@ -50,7 +50,7 @@ pipeline { // stage works in its own subdirectory. there is an "output" under each of these // directories, which we retrieve after the build is complete. WORKDIR_REL_GENERAL_CHECK = 'yetus-general-check' - WORKDIR_REL_JDK8_HADOOP2_CHECK = 'yetus-jdk8-hadoop2-check' + WORKDIR_REL_JDK8_HADOOP3_CHECK = 'yetus-jdk8-hadoop3-check' WORKDIR_REL_JDK11_HADOOP3_CHECK = 'yetus-jdk11-hadoop3-check' } @@ -149,7 +149,7 @@ pipeline { } } } - stage ('yetus jdk8 Hadoop2 checks') { + stage ('yetus jdk8 Hadoop3 checks') { agent { node { label 'Hadoop' @@ -159,7 +159,7 @@ pipeline { // customized per parallel stage PLUGINS = "${JDK_SPECIFIC_PLUGINS}" SET_JAVA_HOME = '/usr/lib/jvm/java-8' - WORKDIR_REL = "${WORKDIR_REL_JDK8_HADOOP2_CHECK}" + WORKDIR_REL = "${WORKDIR_REL_JDK8_HADOOP3_CHECK}" // identical for all parallel stages WORKDIR = "${WORKSPACE}/${WORKDIR_REL}" YETUSDIR = "${WORKDIR}/${YETUS_REL}" @@ -259,7 +259,6 @@ pipeline { // customized per parallel stage PLUGINS = "${JDK_SPECIFIC_PLUGINS}" SET_JAVA_HOME = '/usr/lib/jvm/java-11' - HADOOP_PROFILE = '3.0' WORKDIR_REL = "${WORKDIR_REL_JDK11_HADOOP3_CHECK}" // identical for all parallel stages WORKDIR = "${WORKSPACE}/${WORKDIR_REL}" diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index d149436d6212..2481acfb28e1 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -589,13 +589,16 @@ function hadoopcheck_rebuild else hbase_hadoop2_versions="2.8.5 2.9.2 2.10.0" fi - else - yetus_info "Setting Hadoop 2 versions to test based on branch-2.3+/master/feature branch rules." + elif [[ "${PATCH_BRANCH}" = branch-2.* ]]; then + yetus_info "Setting Hadoop 2 versions to test based on branch-2.3+ rules." if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then hbase_hadoop2_versions="2.10.0" else hbase_hadoop2_versions="2.10.0" fi + else + yetus_info "Setting Hadoop 2 versions to null on master/feature branch rules since we do not support hadoop 2 for hbase 3.x any more." + hbase_hadoop2_versions="" fi if [[ "${PATCH_BRANCH}" = branch-1* ]]; then yetus_info "Setting Hadoop 3 versions to test based on branch-1.x rules." @@ -635,13 +638,22 @@ function hadoopcheck_rebuild for hadoopver in ${hbase_hadoop3_versions}; do logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt" + # no hbase_hadoop2_versions means hadoop 3.x only, so we do not need to + # specify hadoop.profile # disabled because "maven_executor" needs to return both command and args # shellcheck disable=2046 - echo_and_redirect "${logfile}" \ - $(maven_executor) clean install \ - -DskipTests -DHBasePatchProcess \ - -Dhadoop-three.version="${hadoopver}" \ - -Dhadoop.profile=3.0 + if [[ -n "${hbase_hadoop2_versions}" ]]; then + echo_and_redirect "${logfile}" \ + $(maven_executor) clean install \ + -DskipTests -DHBasePatchProcess \ + -Dhadoop-three.version="${hadoopver}" \ + -Dhadoop.profile=3.0 + else + echo_and_redirect "${logfile}" \ + $(maven_executor) clean install \ + -DskipTests -DHBasePatchProcess \ + -Dhadoop-three.version="${hadoopver}" + fi count=$(${GREP} -c '\[ERROR\]' "${logfile}") if [[ ${count} -gt 0 ]]; then add_vote_table -1 hadoopcheck "${BUILDMODEMSG} causes ${count} errors with Hadoop v${hadoopver}." @@ -655,7 +667,11 @@ function hadoopcheck_rebuild fi if [[ -n "${hbase_hadoop3_versions}" ]]; then - add_vote_table +1 hadoopcheck "Patch does not cause any errors with Hadoop ${hbase_hadoop2_versions} or ${hbase_hadoop3_versions}." + if [[ -n "${hbase_hadoop2_versions}" ]]; then + add_vote_table +1 hadoopcheck "Patch does not cause any errors with Hadoop ${hbase_hadoop2_versions} or ${hbase_hadoop3_versions}." + else + add_vote_table +1 hadoopcheck "Patch does not cause any errors with Hadoop ${hbase_hadoop3_versions}." + fi else add_vote_table +1 hadoopcheck "Patch does not cause any errors with Hadoop ${hbase_hadoop2_versions}." fi diff --git a/hbase-backup/pom.xml b/hbase-backup/pom.xml index e3c379ff076c..5260a44cbcc8 100644 --- a/hbase-backup/pom.xml +++ b/hbase-backup/pom.xml @@ -123,126 +123,11 @@ - - - hadoop-2.0 - - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-common - - - net.java.dev.jets3t - jets3t - - - javax.servlet.jsp - jsp-api - - - org.mortbay.jetty - jetty - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-json - - - javax.servlet - servlet-api - - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - - - com.google.code.findbugs - jsr305 - - - - - - - com.google.guava - guava - ${hadoop.guava.version} - - - com.google.code.findbugs - jsr305 - - - - - - io.netty - netty - ${netty.hadoop.version} - - - com.google.code.findbugs - jsr305 - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop-two.version} - - - javax.servlet - servlet-api - - - javax.inject - javax.inject - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-distcp - ${hadoop-two.version} - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index f3845795f532..64d0c8594600 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -191,81 +191,11 @@ true - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-auth - - - org.apache.hadoop - hadoop-common - - - net.java.dev.jets3t - jets3t - - - javax.servlet.jsp - jsp-api - - - org.mortbay.jetty - jetty - - - org.mortbay.jetty - jetty-util - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-json - - - javax.servlet - servlet-api - - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile 3.0-SNAPSHOT diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index f9d039a5ba53..85ceba8f3f15 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -266,61 +266,11 @@ true - - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-common - - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile 3.0-SNAPSHOT diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index 1bd867363f64..7ed78001b1fe 100644 --- a/hbase-endpoint/pom.xml +++ b/hbase-endpoint/pom.xml @@ -201,80 +201,11 @@ - - - hadoop-2.0 - - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-auth - - - org.apache.hadoop - hadoop-client - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-hdfs - - - org.apache.hadoop - hadoop-hdfs - test-jar - test - - - org.apache.hadoop - hadoop-minicluster - test - - - com.google.guava - guava - - - org.apache.zookeeper - zookeeper - - - - - - io.netty - netty - ${netty.hadoop.version} - test - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 08bff98c6947..2ed4e92a70d7 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -262,61 +262,11 @@ - - - hadoop-2.0 - - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - - - org.apache.hadoop - hadoop-common - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile 3.0-SNAPSHOT diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml index 54111bd89ff4..0b870d80c248 100644 --- a/hbase-external-blockcache/pom.xml +++ b/hbase-external-blockcache/pom.xml @@ -167,64 +167,11 @@ true - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-common - - - com.google.guava - guava - - - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml index 0bf21d292708..41c2f61a817b 100644 --- a/hbase-http/pom.xml +++ b/hbase-http/pom.xml @@ -310,81 +310,11 @@ - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-minicluster - - - com.google.guava - guava - - - org.apache.zookeeper - zookeeper - - - test - - - org.apache.hadoop - hadoop-auth - - - org.codehaus.jackson - jackson-core-asl - 1.9.13 - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 460879d214bd..3f97cac5fdb1 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -281,86 +281,14 @@ - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-mapreduce-client-jobclient - test-jar - test - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-minikdc - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile - 3.0-SNAPSHOT + ${hadoop-three.version} diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 9b519dd1fe06..e85b42377f40 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -256,132 +256,11 @@ true - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-common - - - net.java.dev.jets3t - jets3t - - - javax.servlet.jsp - jsp-api - - - org.mortbay.jetty - jetty - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-json - - - javax.servlet - servlet-api - - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - - - com.google.code.findbugs - jsr305 - - - - - org.apache.hadoop - hadoop-hdfs - - - javax.servlet.jsp - jsp-api - - - javax.servlet - servlet-api - - - io.netty - netty - - - stax - stax-api - - - xerces - xercesImpl - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - - - com.google.guava - guava - - - - - - org.apache.hadoop - hadoop-minicluster - test - - - org.apache.zookeeper - zookeeper - - - - - - io.netty - netty - ${netty.hadoop.version} - test - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml index d4b993774de4..7f968a3e82f6 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -130,34 +130,11 @@ - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-common - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile diff --git a/hbase-replication/pom.xml b/hbase-replication/pom.xml index a4518ef1276a..ff43b4b2552f 100644 --- a/hbase-replication/pom.xml +++ b/hbase-replication/pom.xml @@ -124,79 +124,14 @@ - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-common - - - net.java.dev.jets3t - jets3t - - - javax.servlet.jsp - jsp-api - - - org.mortbay.jetty - jetty - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-json - - - javax.servlet - servlet-api - - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - - - com.google.code.findbugs - jsr305 - - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile - 3.0-SNAPSHOT + ${hadoop-three.version} diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 8aa7b77338ec..aea746fb4863 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -376,55 +376,11 @@ - - - hadoop-2.0 - - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - test - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-auth - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 5cf303ec0c38..48992b67bce5 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -594,123 +594,11 @@ - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-distcp - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-auth - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-mapreduce-client-core - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-mapreduce-client-jobclient - test-jar - test - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-hdfs - - - org.apache.hadoop - hadoop-hdfs - test-jar - test - - - org.apache.hadoop - hadoop-minicluster - test - - - com.google.guava - guava - - - org.apache.zookeeper - zookeeper - - - - - - io.netty - netty - ${netty.hadoop.version} - test - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile diff --git a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml index fcb22b7e3701..090e0682196c 100644 --- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml +++ b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml @@ -63,71 +63,11 @@ module. Essentially, you must list the same hadoop-* dependencies so provided dependencies will not be transitively included. --> - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-auth - provided - - - org.apache.hadoop - hadoop-common - provided - - - org.codehaus.jackson - jackson-jaxrs - 1.9.13 - provided - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-core-asl - - - - - org.codehaus.jackson - jackson-xc - 1.9.13 - provided - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-core-asl - - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml index fdd389a1fb34..47b0ad584c89 100644 --- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml +++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml @@ -169,153 +169,11 @@ module. Essentially, you must list the same hadoop-* dependencies since provided dependencies are not transitively included. --> - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-common - provided - - - net.java.dev.jets3t - jets3t - - - javax.servlet.jsp - jsp-api - - - org.mortbay.jetty - jetty - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-json - - - javax.servlet - servlet-api - - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - - - com.google.code.findbugs - jsr305 - - - - - org.apache.hadoop - hadoop-hdfs - provided - - - javax.servlet.jsp - jsp-api - - - javax.servlet - servlet-api - - - io.netty - netty - - - stax - stax-api - - - xerces - xercesImpl - - - ${hadoop-two.version} - - - org.apache.hadoop - hadoop-mapreduce-client-core - provided - - - com.google.guava - guava - - - - - org.codehaus.jackson - jackson-jaxrs - 1.9.13 - provided - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-core-asl - - - - - org.codehaus.jackson - jackson-xc - 1.9.13 - provided - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-core-asl - - - - - org.apache.hadoop - hadoop-auth - provided - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile ${hadoop-three.version} diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index b6df68120677..f10b3f133a16 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -198,128 +198,11 @@ - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-auth - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-client - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-mapreduce-client-jobclient - test-jar - test - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-hdfs - - - org.apache.hadoop - hadoop-hdfs - test-jar - test - - - org.apache.hadoop - hadoop-minicluster - test - - - com.google.guava - guava - - - org.apache.zookeeper - zookeeper - - - - - org.apache.hadoop - hadoop-minikdc - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile 3.0-SNAPSHOT diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index 05121871d927..723bedcb0dc5 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -119,103 +119,11 @@ - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-common - compile - - - org.apache.hadoop - hadoop-auth - compile - - - org.apache.hadoop - hadoop-client - compile - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - compile - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-mapreduce-client-jobclient - compile - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-hdfs - compile - - - org.apache.hadoop - hadoop-hdfs - test-jar - compile - - - org.apache.hadoop - hadoop-minicluster - compile - - - com.google.guava - guava - - - org.apache.zookeeper - zookeeper - - - - - org.apache.hadoop - hadoop-minikdc - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 948a609a32f0..215ec7bad4ac 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -411,107 +411,11 @@ - - - - hadoop-2.0 - - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-client - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-mapreduce-client-jobclient - test-jar - test - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-minicluster - test - - - com.google.guava - guava - - - org.apache.zookeeper - zookeeper - - - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml index 198e13a43252..2090ca4e8b1b 100644 --- a/hbase-zookeeper/pom.xml +++ b/hbase-zookeeper/pom.xml @@ -210,61 +210,11 @@ - - - - hadoop-2.0 - - - - !hadoop.profile - - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-auth - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile diff --git a/pom.xml b/pom.xml index 461c8e8e3856..4efda288714d 100755 --- a/pom.xml +++ b/pom.xml @@ -1479,12 +1479,10 @@ 3.0.4 ${compileSource} - 2.10.0 3.1.2 - ${hadoop-two.version} + --> + ${hadoop-three.version} 11.0.2 hbase-hadoop2-compat src/main/assembly/hadoop-two-compat.xml @@ -2412,41 +2410,6 @@ --> 2200m - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - hadoop3-profile-required - - enforce - - - - - - hadoop.profile - .*3\.0$ - - HBase with JDK11 requires Hadoop3. Activate the profile with `-Dhadoop.profile=3.0`. - - - HBase with JDK11 requires Hadoop3. Activate the profile with `-Dhadoop.profile=3.0`. - - - - - - - - - @@ -2630,392 +2593,14 @@ - - - hadoop-2.0 - - - - !hadoop.profile - - - - hbase-hadoop2-compat - - - ${hadoop-two.version} - hbase-hadoop2-compat - src/main/assembly/hadoop-two-compat.xml - - 3.6.2.Final - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${hadoop-two.version} - - - com.sun.jersey - jersey-core - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-xc - - - io.netty - netty - - - javax.servlet - servlet-api - - - javax.inject - javax.inject - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - - - org.apache.hadoop - hadoop-mapreduce-client-jobclient - ${hadoop-two.version} - - - com.sun.jersey - jersey-core - - - io.netty - netty - - - javax.servlet - servlet-api - - - - - org.apache.hadoop - hadoop-mapreduce-client-jobclient - ${hadoop-two.version} - test-jar - test - - - com.sun.jersey - jersey-core - - - io.netty - netty - - - javax.servlet - servlet-api - - - - - org.apache.hadoop - hadoop-hdfs - ${hadoop-two.version} - - - com.sun.jersey - jersey-core - - - javax.servlet.jsp - jsp-api - - - javax.servlet - servlet-api - - - io.netty - netty - - - stax - stax-api - - - xerces - xercesImpl - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - com.google.guava - guava - - - - - org.apache.hadoop - hadoop-hdfs - ${hadoop-two.version} - test-jar - test - - - javax.servlet.jsp - jsp-api - - - javax.servlet - servlet-api - - - io.netty - netty - - - stax - stax-api - - - xerces - xercesImpl - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - com.google.guava - guava - - - com.sun.jersey - jersey-core - - - - - org.apache.hadoop - hadoop-auth - ${hadoop-two.version} - - - com.google.guava - guava - - - net.minidev - json-smart - - - - - org.apache.hadoop - hadoop-common - ${hadoop-two.version} - - - com.sun.jersey - jersey-core - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-xc - - - commons-beanutils - commons-beanutils - - - javax.servlet.jsp - jsp-api - - - javax.servlet - servlet-api - - - stax - stax-api - - - io.netty - netty - - - com.google.code.findbugs - jsr305 - - - junit - junit - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - - - org.apache.hadoop - hadoop-common - ${hadoop-two.version} - test-jar - test - - - com.sun.jersey - jersey-core - - - com.google.code.findbugs - jsr305 - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-xc - - - - - - javax.activation - javax.activation-api - 1.2.0 - test - - - org.apache.hadoop - hadoop-client - ${hadoop-two.version} - - - - org.apache.hadoop - hadoop-minicluster - ${hadoop-two.version} - - - - commons-httpclient - commons-httpclient - - - javax.servlet.jsp - jsp-api - - - javax.servlet - servlet-api - - - stax - stax-api - - - io.netty - netty - - - com.google.code.findbugs - jsr305 - - - - - org.apache.hadoop - hadoop-minikdc - ${hadoop-two.version} - test - - - org.apache.hadoop - hadoop-annotations - ${hadoop-two.version} - - - - org.apache.hadoop - hadoop-distcp - ${hadoop-two.version} - - - - org.apache.hadoop - hadoop-hdfs-client - ${hadoop-two.version} - - - - - + profiles with activation properties matching the profile here. + Generally, it should be sufficient to copy the first + few lines of the profile you want to match. --> + hadoop-3.0 - - hadoop.profile - 3.0 - + !hadoop.profile