This is an automated email from the ASF dual-hosted git repository.
abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tez.git
The following commit(s) were added to refs/heads/master by this push:
new 9796ac559 TEZ-4721: Drop Hadoop 2.x support profiles and specific
shims implementation (#505) (Raghav Aggarwal reviewed by Laszlo Bodor)
9796ac559 is described below
commit 9796ac55923255564bca9a4bd5a280cbf229b231
Author: Raghav Aggarwal <[email protected]>
AuthorDate: Thu Jun 25 19:46:44 2026 +0530
TEZ-4721: Drop Hadoop 2.x support profiles and specific shims
implementation (#505) (Raghav Aggarwal reviewed by Laszlo Bodor)
---
hadoop-shim-impls/findbugs-exclude.xml | 16 -----
.../hadoop-shim-2.7/findbugs-exclude.xml | 16 -----
hadoop-shim-impls/hadoop-shim-2.7/pom.xml | 56 ---------------
.../hadoop/shim/HadoopShim25_26_27Provider.java | 33 ---------
.../org/apache/tez/hadoop/shim/HadoopShim27.java | 52 --------------
.../org.apache.tez.hadoop.shim.HadoopShimProvider | 14 ----
.../shim/TestHadoop25_26_27ShimProvider.java | 81 ----------------------
.../hadoop-shim-2.8/findbugs-exclude.xml | 16 -----
hadoop-shim-impls/hadoop-shim-2.8/pom.xml | 60 ----------------
.../org/apache/tez/hadoop/shim/HadoopShim28.java | 68 ------------------
.../tez/hadoop/shim/HadoopShim28Provider.java | 30 --------
.../org.apache.tez.hadoop.shim.HadoopShimProvider | 14 ----
.../apache/tez/hadoop/shim/TestHadoopShim28.java | 61 ----------------
.../tez/hadoop/shim/TestHadoopShim28Provider.java | 81 ----------------------
hadoop-shim-impls/pom.xml | 53 --------------
.../apache/tez/hadoop/shim/DefaultHadoopShim.java | 33 ++++++++-
.../org/apache/tez/hadoop/shim/HadoopShim.java | 10 +++
pom.xml | 6 +-
tez-api/pom.xml | 43 +++---------
.../main/java/org/apache/tez/common/GuavaShim.java | 9 ++-
.../dag/api/client/TestTimelineReaderFactory.java | 6 +-
tez-dist/pom.xml | 81 +++++++---------------
tez-plugins/pom.xml | 40 +++--------
tez-plugins/tez-yarn-timeline-history/pom.xml | 13 ----
tez-tools/analyzers/pom.xml | 23 +-----
25 files changed, 102 insertions(+), 813 deletions(-)
diff --git a/hadoop-shim-impls/findbugs-exclude.xml
b/hadoop-shim-impls/findbugs-exclude.xml
deleted file mode 100644
index 5b11308f6..000000000
--- a/hadoop-shim-impls/findbugs-exclude.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-<FindBugsFilter>
-
-</FindBugsFilter>
diff --git a/hadoop-shim-impls/hadoop-shim-2.7/findbugs-exclude.xml
b/hadoop-shim-impls/hadoop-shim-2.7/findbugs-exclude.xml
deleted file mode 100644
index 5b11308f6..000000000
--- a/hadoop-shim-impls/hadoop-shim-2.7/findbugs-exclude.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-<FindBugsFilter>
-
-</FindBugsFilter>
diff --git a/hadoop-shim-impls/hadoop-shim-2.7/pom.xml
b/hadoop-shim-impls/hadoop-shim-2.7/pom.xml
deleted file mode 100644
index 441c25331..000000000
--- a/hadoop-shim-impls/hadoop-shim-2.7/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <artifactId>hadoop-shim-impls</artifactId>
- <groupId>org.apache.tez</groupId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>hadoop-shim-2.7</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>hadoop-shim</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>hadoop-shim</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git
a/hadoop-shim-impls/hadoop-shim-2.7/src/main/java/org/apache/tez/hadoop/shim/HadoopShim25_26_27Provider.java
b/hadoop-shim-impls/hadoop-shim-2.7/src/main/java/org/apache/tez/hadoop/shim/HadoopShim25_26_27Provider.java
deleted file mode 100644
index bd1eabfa3..000000000
---
a/hadoop-shim-impls/hadoop-shim-2.7/src/main/java/org/apache/tez/hadoop/shim/HadoopShim25_26_27Provider.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tez.hadoop.shim;
-
-import org.apache.hadoop.classification.InterfaceAudience.Private;
-
-@Private
-public class HadoopShim25_26_27Provider extends HadoopShimProvider {
-
- @Override
- public HadoopShim createHadoopShim(String hadoopVersion, int majorVersion,
int minorVersion) {
- if (majorVersion == 2 && (minorVersion == 5 || minorVersion == 6 ||
minorVersion == 7)) {
- return new HadoopShim27();
- }
- return null;
- }
-}
diff --git
a/hadoop-shim-impls/hadoop-shim-2.7/src/main/java/org/apache/tez/hadoop/shim/HadoopShim27.java
b/hadoop-shim-impls/hadoop-shim-2.7/src/main/java/org/apache/tez/hadoop/shim/HadoopShim27.java
deleted file mode 100644
index c5163036a..000000000
---
a/hadoop-shim-impls/hadoop-shim-2.7/src/main/java/org/apache/tez/hadoop/shim/HadoopShim27.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tez.hadoop.shim;
-
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.hadoop.classification.InterfaceAudience.Private;
-import
org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
-import org.apache.hadoop.yarn.proto.YarnServiceProtos.SchedulerResourceTypes;
-
-@Private
-public class HadoopShim27 extends HadoopShim {
-
- @Override
- public void setHadoopCallerContext(String context) {
- // Not supported
- }
-
- @Override
- public void clearHadoopCallerContext() {
- // Not supported
- }
-
- @Override
- public Set<String>
getSupportedResourceTypes(RegisterApplicationMasterResponse response) {
- EnumSet<SchedulerResourceTypes> supportedResourceTypes =
response.getSchedulerResourceTypes();
- Set<String> supportedTypes = new HashSet<String>();
- for (SchedulerResourceTypes resourceType : supportedResourceTypes) {
- supportedTypes.add(resourceType.name());
- }
- return supportedTypes;
- }
-
-}
diff --git
a/hadoop-shim-impls/hadoop-shim-2.7/src/main/resources/META-INF/services/org.apache.tez.hadoop.shim.HadoopShimProvider
b/hadoop-shim-impls/hadoop-shim-2.7/src/main/resources/META-INF/services/org.apache.tez.hadoop.shim.HadoopShimProvider
deleted file mode 100644
index 4226f1861..000000000
---
a/hadoop-shim-impls/hadoop-shim-2.7/src/main/resources/META-INF/services/org.apache.tez.hadoop.shim.HadoopShimProvider
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-org.apache.tez.hadoop.shim.HadoopShim25_26_27Provider
diff --git
a/hadoop-shim-impls/hadoop-shim-2.7/src/test/java/org/apache/tez/hadoop/shim/TestHadoop25_26_27ShimProvider.java
b/hadoop-shim-impls/hadoop-shim-2.7/src/test/java/org/apache/tez/hadoop/shim/TestHadoop25_26_27ShimProvider.java
deleted file mode 100644
index c9937f8b9..000000000
---
a/hadoop-shim-impls/hadoop-shim-2.7/src/test/java/org/apache/tez/hadoop/shim/TestHadoop25_26_27ShimProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tez.hadoop.shim;
-
-import org.apache.hadoop.conf.Configuration;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class TestHadoop25_26_27ShimProvider {
-
- @Test
- public void testShimProvider() {
- HadoopShim25_26_27Provider provider = new HadoopShim25_26_27Provider();
- Assert.assertNull(provider.createHadoopShim("foo", 2, 2));
- Assert.assertNull(provider.createHadoopShim("foo", 2, 1));
- Assert.assertNull(provider.createHadoopShim("foo", 2, 3));
- Assert.assertNull(provider.createHadoopShim("foo", 2, 8));
- Assert.assertNull(provider.createHadoopShim("foo", 3, 3));
- Assert.assertNotNull(provider.createHadoopShim("foo", 2, 5));
- Assert.assertNotNull(provider.createHadoopShim("foo", 2, 6));
- Assert.assertNotNull(provider.createHadoopShim("foo", 2, 7));
-
- Assert.assertEquals(HadoopShim27.class,
- provider.createHadoopShim("foo", 2, 7).getClass());
- }
-
- @Test
- public void testLoaderOverride() {
- Configuration conf = new Configuration(false);
- // Set shim and version to ensure that hadoop version from the build does
not create
- // a mismatch
- conf.set(HadoopShimsLoader.TEZ_HADOOP_SHIM_PROVIDER_CLASS,
- HadoopShim25_26_27Provider.class.getName());
- conf.set(HadoopShimsLoader.TEZ_HADOOP_SHIM_HADOOP_VERSION_OVERRIDE,
"2.7.0");
- HadoopShimsLoader loader = new HadoopShimsLoader(conf, true);
- HadoopShim shim = loader.getHadoopShim();
- Assert.assertNotNull(shim);
- Assert.assertEquals(HadoopShim27.class, shim.getClass());
- }
-
- @Test
- public void testInvalidVersion() {
- Configuration conf = new Configuration(false);
- // Set incompatible version so that shim in this module does not match
- conf.set(HadoopShimsLoader.TEZ_HADOOP_SHIM_HADOOP_VERSION_OVERRIDE,
"2.9.0");
- HadoopShimsLoader loader = new HadoopShimsLoader(conf, true);
- HadoopShim shim = loader.getHadoopShim();
- Assert.assertNotNull(shim);
- Assert.assertEquals(DefaultHadoopShim.class, shim.getClass());
- }
-
- @Test
- public void testLoaderOverrideInvalidVersion() {
- Configuration conf = new Configuration(false);
- // Set incompatible version so that override shim does not return a valid
shim
- conf.set(HadoopShimsLoader.TEZ_HADOOP_SHIM_PROVIDER_CLASS,
- HadoopShim25_26_27Provider.class.getName());
- conf.set(HadoopShimsLoader.TEZ_HADOOP_SHIM_HADOOP_VERSION_OVERRIDE,
"2.1.0");
- HadoopShimsLoader loader = new HadoopShimsLoader(conf, true);
- HadoopShim shim = loader.getHadoopShim();
- Assert.assertNotNull(shim);
- Assert.assertEquals(DefaultHadoopShim.class, shim.getClass());
- }
-
-}
diff --git a/hadoop-shim-impls/hadoop-shim-2.8/findbugs-exclude.xml
b/hadoop-shim-impls/hadoop-shim-2.8/findbugs-exclude.xml
deleted file mode 100644
index 5b11308f6..000000000
--- a/hadoop-shim-impls/hadoop-shim-2.8/findbugs-exclude.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-<FindBugsFilter>
-
-</FindBugsFilter>
diff --git a/hadoop-shim-impls/hadoop-shim-2.8/pom.xml
b/hadoop-shim-impls/hadoop-shim-2.8/pom.xml
deleted file mode 100644
index 58d4c1ea5..000000000
--- a/hadoop-shim-impls/hadoop-shim-2.8/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <artifactId>hadoop-shim-impls</artifactId>
- <groupId>org.apache.tez</groupId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>hadoop-shim-2.8</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>hadoop-shim</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>hadoop-shim</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git
a/hadoop-shim-impls/hadoop-shim-2.8/src/main/java/org/apache/tez/hadoop/shim/HadoopShim28.java
b/hadoop-shim-impls/hadoop-shim-2.8/src/main/java/org/apache/tez/hadoop/shim/HadoopShim28.java
deleted file mode 100644
index c0d5577a4..000000000
---
a/hadoop-shim-impls/hadoop-shim-2.8/src/main/java/org/apache/tez/hadoop/shim/HadoopShim28.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tez.hadoop.shim;
-
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.hadoop.ipc.CallerContext;
-import
org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
-import org.apache.hadoop.yarn.proto.YarnServiceProtos.SchedulerResourceTypes;
-
-public class HadoopShim28 extends HadoopShim {
-
- final static CallerContext nullCallerContext = new
CallerContext.Builder("").build();
-
- @Override
- public void setHadoopCallerContext(String context) {
- CallerContext.setCurrent(new CallerContext.Builder(context).build());
- }
-
- @Override
- public void clearHadoopCallerContext() {
- CallerContext.setCurrent(nullCallerContext);
- }
-
- @Override
- public Set<String>
getSupportedResourceTypes(RegisterApplicationMasterResponse response) {
- EnumSet<SchedulerResourceTypes> supportedResourceTypes =
response.getSchedulerResourceTypes();
- Set<String> supportedTypes = new HashSet<String>();
- for (SchedulerResourceTypes resourceType : supportedResourceTypes) {
- supportedTypes.add(resourceType.name());
- }
- return supportedTypes;
- }
-
- @Override
- public FinalApplicationStatus
applyFinalApplicationStatusCorrection(FinalApplicationStatus orig,
- boolean isSessionMode, boolean isError) {
- switch (orig) {
- case FAILED:
- // App is failed if dag failed in non-session mode or there was an
error.
- return (!isSessionMode || isError) ?
- FinalApplicationStatus.FAILED : FinalApplicationStatus.ENDED;
- case SUCCEEDED:
- return isSessionMode ? FinalApplicationStatus.ENDED :
FinalApplicationStatus.SUCCEEDED;
- default:
- return orig;
- }
- }
-}
diff --git
a/hadoop-shim-impls/hadoop-shim-2.8/src/main/java/org/apache/tez/hadoop/shim/HadoopShim28Provider.java
b/hadoop-shim-impls/hadoop-shim-2.8/src/main/java/org/apache/tez/hadoop/shim/HadoopShim28Provider.java
deleted file mode 100644
index 318462d7e..000000000
---
a/hadoop-shim-impls/hadoop-shim-2.8/src/main/java/org/apache/tez/hadoop/shim/HadoopShim28Provider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tez.hadoop.shim;
-
-public class HadoopShim28Provider extends HadoopShimProvider {
-
- @Override
- public HadoopShim createHadoopShim(String hadoopVersion, int majorVersion,
int minorVersion) {
- if (majorVersion == 2 && minorVersion >= 8) {
- return new HadoopShim28();
- }
- return null;
- }
-}
diff --git
a/hadoop-shim-impls/hadoop-shim-2.8/src/main/resources/META-INF/services/org.apache.tez.hadoop.shim.HadoopShimProvider
b/hadoop-shim-impls/hadoop-shim-2.8/src/main/resources/META-INF/services/org.apache.tez.hadoop.shim.HadoopShimProvider
deleted file mode 100644
index 24fe49d1f..000000000
---
a/hadoop-shim-impls/hadoop-shim-2.8/src/main/resources/META-INF/services/org.apache.tez.hadoop.shim.HadoopShimProvider
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-org.apache.tez.hadoop.shim.HadoopShim28Provider
diff --git
a/hadoop-shim-impls/hadoop-shim-2.8/src/test/java/org/apache/tez/hadoop/shim/TestHadoopShim28.java
b/hadoop-shim-impls/hadoop-shim-2.8/src/test/java/org/apache/tez/hadoop/shim/TestHadoopShim28.java
deleted file mode 100644
index f3117c89d..000000000
---
a/hadoop-shim-impls/hadoop-shim-2.8/src/test/java/org/apache/tez/hadoop/shim/TestHadoopShim28.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tez.hadoop.shim;
-
-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class TestHadoopShim28 {
-
- @Test
- public void testApplyFinalApplicationStatusCorrection() {
- HadoopShim shim = new HadoopShim28();
- // Session mode success/failure, change to ended
- Assert.assertEquals(FinalApplicationStatus.ENDED,
-
shim.applyFinalApplicationStatusCorrection(FinalApplicationStatus.SUCCEEDED,
true, false));
- Assert.assertEquals(FinalApplicationStatus.ENDED,
-
shim.applyFinalApplicationStatusCorrection(FinalApplicationStatus.FAILED, true,
false));
-
- // Non-session mode success/failure, retain success/failure
- Assert.assertEquals(FinalApplicationStatus.SUCCEEDED,
-
shim.applyFinalApplicationStatusCorrection(FinalApplicationStatus.SUCCEEDED,
false, false));
- Assert.assertEquals(FinalApplicationStatus.FAILED,
-
shim.applyFinalApplicationStatusCorrection(FinalApplicationStatus.FAILED,
false, false));
-
- // Session and non-session mode error, retain failed.
- Assert.assertEquals(FinalApplicationStatus.FAILED,
-
shim.applyFinalApplicationStatusCorrection(FinalApplicationStatus.FAILED, true,
true));
- Assert.assertEquals(FinalApplicationStatus.FAILED,
-
shim.applyFinalApplicationStatusCorrection(FinalApplicationStatus.FAILED,
false, true));
-
- // Session and non-session mode killed is killed.
- Assert.assertEquals(FinalApplicationStatus.KILLED,
-
shim.applyFinalApplicationStatusCorrection(FinalApplicationStatus.KILLED, true,
false));
- Assert.assertEquals(FinalApplicationStatus.KILLED,
-
shim.applyFinalApplicationStatusCorrection(FinalApplicationStatus.KILLED,
false, false));
-
- // Session and non-session mode undefined is undefined.
- Assert.assertEquals(FinalApplicationStatus.UNDEFINED,
-
shim.applyFinalApplicationStatusCorrection(FinalApplicationStatus.UNDEFINED,
true, false));
- Assert.assertEquals(FinalApplicationStatus.UNDEFINED,
-
shim.applyFinalApplicationStatusCorrection(FinalApplicationStatus.UNDEFINED,
false, false));
- }
-}
diff --git
a/hadoop-shim-impls/hadoop-shim-2.8/src/test/java/org/apache/tez/hadoop/shim/TestHadoopShim28Provider.java
b/hadoop-shim-impls/hadoop-shim-2.8/src/test/java/org/apache/tez/hadoop/shim/TestHadoopShim28Provider.java
deleted file mode 100644
index f2f5e5ff7..000000000
---
a/hadoop-shim-impls/hadoop-shim-2.8/src/test/java/org/apache/tez/hadoop/shim/TestHadoopShim28Provider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tez.hadoop.shim;
-
-import org.apache.hadoop.conf.Configuration;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class TestHadoopShim28Provider {
-
- @Test
- public void testShimProvider() {
- HadoopShim28Provider provider = new HadoopShim28Provider();
- Assert.assertNull(provider.createHadoopShim("foo", 2, 2));
- Assert.assertNull(provider.createHadoopShim("foo", 2, 7));
- Assert.assertNull(provider.createHadoopShim("foo", 2, 5));
- Assert.assertNull(provider.createHadoopShim("foo", 2, 6));
- Assert.assertNull(provider.createHadoopShim("foo", 3, 3));
- Assert.assertNotNull(provider.createHadoopShim("foo", 2, 8));
- Assert.assertNotNull(provider.createHadoopShim("foo", 2, 111));
-
- Assert.assertEquals(HadoopShim28.class,
- provider.createHadoopShim("foo", 2, 9).getClass());
- }
-
- @Test
- public void testLoaderOverride() {
- Configuration conf = new Configuration(false);
- // Set shim and version to ensure that hadoop version from the build does
not create
- // a mismatch
- conf.set(HadoopShimsLoader.TEZ_HADOOP_SHIM_PROVIDER_CLASS,
- HadoopShim28Provider.class.getName());
- conf.set(HadoopShimsLoader.TEZ_HADOOP_SHIM_HADOOP_VERSION_OVERRIDE,
"2.8.0");
- HadoopShimsLoader loader = new HadoopShimsLoader(conf, true);
- HadoopShim shim = loader.getHadoopShim();
- Assert.assertNotNull(shim);
- Assert.assertEquals(HadoopShim28.class, shim.getClass());
- }
-
- @Test
- public void testInvalidVersion() {
- Configuration conf = new Configuration(false);
- // Set incompatible version so that shim in this module does not match
- conf.set(HadoopShimsLoader.TEZ_HADOOP_SHIM_HADOOP_VERSION_OVERRIDE,
"2.2.0");
- HadoopShimsLoader loader = new HadoopShimsLoader(conf, true);
- HadoopShim shim = loader.getHadoopShim();
- Assert.assertNotNull(shim);
- Assert.assertEquals(DefaultHadoopShim.class, shim.getClass());
- }
-
- @Test
- public void testLoaderOverrideInvalidVersion() {
- Configuration conf = new Configuration(false);
- // Set incompatible version so that override shim does not return a valid
shim
- conf.set(HadoopShimsLoader.TEZ_HADOOP_SHIM_PROVIDER_CLASS,
- HadoopShim28Provider.class.getName());
- conf.set(HadoopShimsLoader.TEZ_HADOOP_SHIM_HADOOP_VERSION_OVERRIDE,
"2.1.0");
- HadoopShimsLoader loader = new HadoopShimsLoader(conf, true);
- HadoopShim shim = loader.getHadoopShim();
- Assert.assertNotNull(shim);
- Assert.assertEquals(DefaultHadoopShim.class, shim.getClass());
- }
-
-}
diff --git a/hadoop-shim-impls/pom.xml b/hadoop-shim-impls/pom.xml
deleted file mode 100644
index fc3b2dcf8..000000000
--- a/hadoop-shim-impls/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>tez</artifactId>
- <groupId>org.apache.tez</groupId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>hadoop-shim-impls</artifactId>
- <packaging>pom</packaging>
-
- <profiles>
- <profile>
- <id>hadoop27</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>hadoop-shim-2.7</module>
- </modules>
- </profile>
- <profile>
- <id>hadoop28</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>hadoop-shim-2.8</module>
- </modules>
- </profile>
- </profiles>
-
-</project>
diff --git
a/hadoop-shim/src/main/java/org/apache/tez/hadoop/shim/DefaultHadoopShim.java
b/hadoop-shim/src/main/java/org/apache/tez/hadoop/shim/DefaultHadoopShim.java
index e7c7163e5..ef25b9326 100644
---
a/hadoop-shim/src/main/java/org/apache/tez/hadoop/shim/DefaultHadoopShim.java
+++
b/hadoop-shim/src/main/java/org/apache/tez/hadoop/shim/DefaultHadoopShim.java
@@ -18,11 +18,38 @@
*/
package org.apache.tez.hadoop.shim;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.ipc.CallerContext;
+import
org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
+import org.apache.hadoop.yarn.proto.YarnServiceProtos.SchedulerResourceTypes;
-/**
- * Default Hadoop Shim. For now, it mimics HadoopShim.
- */
+/** Default Hadoop Shim. Provides Hadoop 3.x baseline capabilities. */
@Private
public class DefaultHadoopShim extends HadoopShim {
+
+ private static final CallerContext NULL_CALLER_CONTEXT = new
CallerContext.Builder("").build();
+
+ @Override
+ public void setHadoopCallerContext(String context) {
+ CallerContext.setCurrent(new CallerContext.Builder(context).build());
+ }
+
+ @Override
+ public void clearHadoopCallerContext() {
+ CallerContext.setCurrent(NULL_CALLER_CONTEXT);
+ }
+
+ @Override
+ public Set<String>
getSupportedResourceTypes(RegisterApplicationMasterResponse response) {
+ EnumSet<SchedulerResourceTypes> supportedResourceTypes =
response.getSchedulerResourceTypes();
+ Set<String> supportedTypes = new HashSet<>();
+ for (SchedulerResourceTypes resourceType : supportedResourceTypes) {
+ supportedTypes.add(resourceType.name());
+ }
+ return supportedTypes;
+ }
}
diff --git
a/hadoop-shim/src/main/java/org/apache/tez/hadoop/shim/HadoopShim.java
b/hadoop-shim/src/main/java/org/apache/tez/hadoop/shim/HadoopShim.java
index 96405f0ab..56d642f33 100644
--- a/hadoop-shim/src/main/java/org/apache/tez/hadoop/shim/HadoopShim.java
+++ b/hadoop-shim/src/main/java/org/apache/tez/hadoop/shim/HadoopShim.java
@@ -25,6 +25,16 @@ import
org.apache.hadoop.classification.InterfaceStability.Unstable;
import
org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+/**
+ * An interoperability layer to handle API variations across different
versions of Apache Hadoop.
+ *
+ * <p>NOTE TO DEVELOPERS: This shim framework dynamically loads
version-specific implementations
+ * (via {@code HadoopShimsLoader}) at runtime. While the legacy Hadoop 2.x
specific shims have been
+ * removed, the core framework is intentionally retained. It provides a
generic, extensible
+ * mechanism to seamlessly handle any breaking API changes or missing features
that may arise in
+ * future Hadoop versions, ensuring Tez maintains broad compatibility without
tying the codebase to
+ * a single Hadoop API signature.
+ */
@Public
@Unstable
public abstract class HadoopShim {
diff --git a/pom.xml b/pom.xml
index 0aadd69e3..ccdc48d2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -783,6 +783,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
@@ -972,7 +977,6 @@
<module>tez-ui</module>
<module>tez-plugins</module>
<module>tez-tools</module>
- <module>hadoop-shim-impls</module>
<module>tez-dist</module>
<module>docs</module>
</modules>
diff --git a/tez-api/pom.xml b/tez-api/pom.xml
index 187e87d99..5131258dc 100644
--- a/tez-api/pom.xml
+++ b/tez-api/pom.xml
@@ -101,6 +101,15 @@
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
@@ -221,38 +230,4 @@
</plugins>
</reporting>
- <profiles>
- <profile>
- <id>hadoop27</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop28</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs-client</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <scope>test</scope>
- <version>${hadoop.version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/tez-api/src/main/java/org/apache/tez/common/GuavaShim.java
b/tez-api/src/main/java/org/apache/tez/common/GuavaShim.java
index 50af86039..f8bc3e610 100644
--- a/tez-api/src/main/java/org/apache/tez/common/GuavaShim.java
+++ b/tez-api/src/main/java/org/apache/tez/common/GuavaShim.java
@@ -25,7 +25,14 @@ import java.util.concurrent.Executor;
import com.google.common.util.concurrent.MoreExecutors;
/**
- * A interoperability layer to work with multiple versions of guava.
+ * An interoperability layer to work with multiple versions of guava.
+ *
+ * <p>NOTE TO DEVELOPERS: Reflection is used here to dynamically bind to the
available executor
+ * method at runtime. Guava v18.0 deprecated and removed {@code
sameThreadExecutor()}, replacing it
+ * with {@code directExecutor()}. By using reflection, Tez can remain safely
compatible with both
+ * older and newer versions of Guava provided by the underlying Hadoop
environment, without forcing
+ * a strict compile-time dependency on a specific Guava version. Do not
replace this with a direct
+ * method call unless the minimum supported Guava version across all
environments is >= 18.0.
*/
public final class GuavaShim {
diff --git
a/tez-api/src/test/java/org/apache/tez/dag/api/client/TestTimelineReaderFactory.java
b/tez-api/src/test/java/org/apache/tez/dag/api/client/TestTimelineReaderFactory.java
index e79950b0b..806eb2a2f 100644
---
a/tez-api/src/test/java/org/apache/tez/dag/api/client/TestTimelineReaderFactory.java
+++
b/tez-api/src/test/java/org/apache/tez/dag/api/client/TestTimelineReaderFactory.java
@@ -34,15 +34,15 @@ import org.junit.Test;
public class TestTimelineReaderFactory {
- // ensure on hadoop 2.6+ TimelineReaderTokenAuthenticatedStrategy is used.
+ // ensure TimelineReaderTokenAuthenticatedStrategy is used.
@Test(timeout = 5000)
- public void testShouldUseTokenDelegationAuthStrategyForHadoop26() throws
TezException {
+ public void testShouldUseTokenDelegationAuthStrategy() throws TezException {
String returnedClassName =
TimelineReaderFactory.getTimelineReaderStrategy(mock(Configuration.class),
false, 0)
.getClass()
.getCanonicalName();
- Assert.assertEquals("should use pseudo auth on hadoop2.4",
+ Assert.assertEquals("should use token delegation auth",
"org.apache.tez.dag.api.client.TimelineReaderFactory.TimelineReaderTokenAuthenticatedStrategy",
returnedClassName);
}
diff --git a/tez-dist/pom.xml b/tez-dist/pom.xml
index 08a8077cc..5c7b0a3d1 100644
--- a/tez-dist/pom.xml
+++ b/tez-dist/pom.xml
@@ -58,6 +58,31 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-yarn-timeline-history-with-acls</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-yarn-timeline-history-with-fs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-yarn-timeline-cache-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-protobuf-history-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>hadoop-shim</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<properties>
@@ -65,62 +90,6 @@
</properties>
<profiles>
- <profile>
- <id>hadoop27</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>tez-yarn-timeline-history-with-acls</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>tez-protobuf-history-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>hadoop-shim-2.7</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop28</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>tez-yarn-timeline-history-with-acls</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>tez-yarn-timeline-history-with-fs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>tez-yarn-timeline-cache-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>tez-protobuf-history-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>hadoop-shim-2.8</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>docker</id>
<build>
diff --git a/tez-plugins/pom.xml b/tez-plugins/pom.xml
index 7001858dd..88317f810 100644
--- a/tez-plugins/pom.xml
+++ b/tez-plugins/pom.xml
@@ -29,37 +29,15 @@
<artifactId>tez-plugins</artifactId>
<packaging>pom</packaging>
- <profiles>
- <profile>
- <id>hadoop27</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>tez-protobuf-history-plugin</module>
- <module>tez-yarn-timeline-history</module>
- <module>tez-yarn-timeline-history-with-acls</module>
- <module>tez-history-parser</module>
- <module>tez-aux-services</module>
- </modules>
- </profile>
- <profile>
- <id>hadoop28</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>tez-protobuf-history-plugin</module>
- <module>tez-yarn-timeline-history</module>
- <module>tez-yarn-timeline-history-with-acls</module>
- <module>tez-yarn-timeline-cache-plugin</module>
- <module>tez-yarn-timeline-history-with-fs</module>
- <module>tez-history-parser</module>
- <module>tez-aux-services</module>
- </modules>
- </profile>
-
- </profiles>
+ <modules>
+ <module>tez-protobuf-history-plugin</module>
+ <module>tez-yarn-timeline-history</module>
+ <module>tez-yarn-timeline-history-with-acls</module>
+ <module>tez-yarn-timeline-cache-plugin</module>
+ <module>tez-yarn-timeline-history-with-fs</module>
+ <module>tez-history-parser</module>
+ <module>tez-aux-services</module>
+ </modules>
<build>
<plugins>
diff --git a/tez-plugins/tez-yarn-timeline-history/pom.xml
b/tez-plugins/tez-yarn-timeline-history/pom.xml
index 5cd65b35b..4df23c94f 100644
--- a/tez-plugins/tez-yarn-timeline-history/pom.xml
+++ b/tez-plugins/tez-yarn-timeline-history/pom.xml
@@ -154,17 +154,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>hadoop27</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>tez-yarn-timeline-history</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
diff --git a/tez-tools/analyzers/pom.xml b/tez-tools/analyzers/pom.xml
index aeda3a463..cb971f398 100644
--- a/tez-tools/analyzers/pom.xml
+++ b/tez-tools/analyzers/pom.xml
@@ -29,25 +29,8 @@
<artifactId>tez-perf-analyzer</artifactId>
<packaging>pom</packaging>
- <profiles>
- <profile>
- <id>hadoop27</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>job-analyzer</module>
- </modules>
- </profile>
- <profile>
- <id>hadoop28</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>job-analyzer</module>
- </modules>
- </profile>
- </profiles>
+ <modules>
+ <module>job-analyzer</module>
+ </modules>
</project>
