Release 3.4.0: add new test profile
diff --git a/hadoop-api-shim-test-3.2/pom.xml b/hadoop-api-shim-test-3.2/pom.xml index ae4a560..535e011 100644 --- a/hadoop-api-shim-test-3.2/pom.xml +++ b/hadoop-api-shim-test-3.2/pom.xml
@@ -60,8 +60,8 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.3.2.test.version}</version> - </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId>
diff --git a/hadoop-api-shim-test-3.3/pom.xml b/hadoop-api-shim-test-3.3/pom.xml index 4aff179..bfe2fba 100644 --- a/hadoop-api-shim-test-3.3/pom.xml +++ b/hadoop-api-shim-test-3.3/pom.xml
@@ -59,7 +59,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.3.2.test.version}</version> + <version>${hadoop.3.3.test.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -71,6 +71,7 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <type>test-jar</type> + <version>${hadoop.3.3.test.version}</version> <scope>test</scope> </dependency>
diff --git a/hadoop-api-shim-test-3.4/pom.xml b/hadoop-api-shim-test-3.4/pom.xml new file mode 100644 index 0000000..80f11ef --- /dev/null +++ b/hadoop-api-shim-test-3.4/pom.xml
@@ -0,0 +1,102 @@ +<?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. +--> +<!--suppress VulnerableLibrariesLocal --> +<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 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.hadoop.extensions</groupId> + <artifactId>hadoop-api-shim-project</artifactId> + <relativePath>../pom.xml</relativePath> + <version>1.0-SNAPSHOT</version> + </parent> + + <artifactId>hadoop-api-shim-test-3.4</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>jar</packaging> + + <name>hadoop-api-shim-test-3.4</name> + <description> + Test against hadoop-3.4.x + </description> + + + <properties> + + </properties> + + <dependencies> + + <dependency> + <groupId>org.apache.hadoop.extensions</groupId> + <artifactId>hadoop-api-shim</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.hadoop.extensions</groupId> + <artifactId>hadoop-api-shim</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.3.4.test.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <scope>test</scope> + </dependency> + + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> + <configuration> + + <trimStackTrace>false</trimStackTrace> + <dependenciesToScan> + <dependency>org.apache.hadoop.extensions:hadoop-api-shim-library:test-jar</dependency> + </dependenciesToScan> + </configuration> + </plugin> + </plugins> + </build> +</project>
diff --git a/hadoop-api-shim-test-3.4/src/test/resources/core-site.xml b/hadoop-api-shim-test-3.4/src/test/resources/core-site.xml new file mode 100644 index 0000000..13d4d31 --- /dev/null +++ b/hadoop-api-shim-test-3.4/src/test/resources/core-site.xml
@@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- + ~ 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. + --> + +<configuration> + <property> + <name>hadoop.test.binding</name> + <value>org.apache.hadoop.fs.shim.test.binding.Hadoop340Features</value> + </property> +</configuration>
diff --git a/hadoop-api-shim-test-3.4/src/test/resources/log4j.properties b/hadoop-api-shim-test-3.4/src/test/resources/log4j.properties new file mode 100644 index 0000000..653c8a7 --- /dev/null +++ b/hadoop-api-shim-test-3.4/src/test/resources/log4j.properties
@@ -0,0 +1,91 @@ +# 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. +# log4j configuration used during build and unit tests + +log4j.rootLogger=info,stdout +log4j.threshold=ALL +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} (%F:%M(%L)) - %m%n + +log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR +log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN +log4j.logger.org.apache.hadoop.util.GSet=WARN +# MiniDFS clusters can be noisy +log4j.logger.org.apache.hadoop.hdfs.server=ERROR +log4j.logger.org.apache.hadoop.metrics2=WARN +log4j.logger.org.apache.hadoop.net.NetworkTopology=WARN +log4j.logger.org.apache.hadoop.util.JvmPauseMonitor=WARN +log4j.logger.org.apache.hadoop.ipc=WARN +log4j.logger.org.apache.hadoop.http=WARN +log4j.logger.org.apache.hadoop.security.authentication.server.AuthenticationFilter=WARN +log4j.logger.org.apache.hadoop.util.HostsFileReader=WARN +log4j.logger.org.apache.commons.beanutils=WARN +log4j.logger.org.apache.hadoop.hdfs.StateChange=WARN +log4j.logger.BlockStateChange=WARN +log4j.logger.org.apache.hadoop.hdfs.DFSUtil=WARN + +## YARN can be noisy too +log4j.logger.org.apache.hadoop.yarn.server.resourcemanager.scheduler=WARN +log4j.logger.org.apache.hadoop.yarn.server.nodemanager=WARN +log4j.logger.org.apache.hadoop.yarn.event=WARN +log4j.logger.org.apache.hadoop.yarn.util.ResourceCalculatorPlugin=ERROR +log4j.logger.org.apache.hadoop.yarn.server.nodemanager.containermanager.monitor=WARN +log4j.logger.org.apache.hadoop.mapred.IndexCache=WARN +log4j.logger.org.apache.hadoop.yarn.webapp.WebApps=WARN +log4j.logger.org.apache.hadoop.yarn.server.resourcemanager.security=WARN +log4j.logger.org.apache.hadoop.yarn.util.AbstractLivelinessMonitor=WARN +log4j.logger.org.apache.hadoop.security.token.delegation=WARN +log4j.logger.org.apache.hadoop.mapred.ShuffleHandler=WARN +log4j.logger.org.apache.hadoop.ipc.Server=WARN +#log4j.logger.=WARN + + +# for debugging low level S3a operations, uncomment these lines +# Log all S3A classes +#log4j.logger.org.apache.hadoop.fs.s3a=DEBUG +#log4j.logger.org.apache.hadoop.fs.s3a.S3AUtils=INFO +#log4j.logger.org.apache.hadoop.fs.s3a.Listing=INFO +# Log S3Guard classes +#log4j.logger.org.apache.hadoop.fs.s3a.s3guard=DEBUG +# if set to debug, this will log the PUT/DELETE operations on a store +log4j.logger.org.apache.hadoop.fs.s3a.s3guard.Operations=DEBUG + +# Log Committer classes +#log4j.logger.org.apache.hadoop.fs.s3a.commit=DEBUG + +# Enable debug logging of AWS Dynamo client +#log4j.logger.com.amazonaws.services.dynamodbv2.AmazonDynamoDB=DEBUG + +# Log all HTTP requests made; includes S3 interaction. This may +# include sensitive information such as account IDs in HTTP headers. +#log4j.logger.com.amazonaws.request=DEBUG + +# Turn on low level HTTP protocol debugging +#log4j.logger.com.amazonaws.thirdparty.apache.http=DEBUG + +log4j.logger.org.apache.hadoop.mapreduce.lib.output=DEBUG +log4j.logger.org.apache.hadoop.fs.s3a.S3AStorageStatistics=INFO + +# Set to debug if you need to debug S3A endpoint problems. +#log4j.logger.org.apache.hadoop.fs.s3a.DefaultS3ClientFactory=DEBUG + +# This causes all remote iterator stats +# to be logged when the RemoteIterators.foreach() method is +# invoked +#log4j.logger.org.apache.hadoop.util.functional.RemoteIterators=DEBUG + +# Auditing operations in all detail +# Log before a request is made to S3 +#log4j.logger.org.apache.hadoop.fs.s3a.audit=DEBUG +# log request creation, span lifecycle and other low-level details +#log4j.logger.org.apache.hadoop.fs.s3a.audit=TRACE
diff --git a/hadoop-api-shim/src/test/java/org/apache/hadoop/fs/shim/test/binding/Hadoop340Features.java b/hadoop-api-shim/src/test/java/org/apache/hadoop/fs/shim/test/binding/Hadoop340Features.java new file mode 100644 index 0000000..1f3d652 --- /dev/null +++ b/hadoop-api-shim/src/test/java/org/apache/hadoop/fs/shim/test/binding/Hadoop340Features.java
@@ -0,0 +1,30 @@ +/* + * 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.hadoop.fs.shim.test.binding; + +/** + * Hadoop 3.4.0 features. + */ +public class Hadoop340Features extends Hadoop335Features { + + @Override + public boolean isImplemented(final String feature) { + return super.isImplemented(feature); + } +}
diff --git a/pom.xml b/pom.xml index 822ab47..0267de4 100644 --- a/pom.xml +++ b/pom.xml
@@ -52,6 +52,7 @@ <hadoop.test.version>3.3.0</hadoop.test.version> <hadoop.3.2.test.version>3.2.4</hadoop.3.2.test.version> <hadoop.3.3.test.version>3.3.5</hadoop.3.3.test.version> + <hadoop.3.4.test.version>3.4.0</hadoop.3.4.test.version> <junit.version>4.13.2</junit.version> <junit.jupiter.version>5.5.1</junit.jupiter.version> @@ -71,6 +72,7 @@ <module>hadoop-api-shim-test</module> <module>hadoop-api-shim-test-3.2</module> <module>hadoop-api-shim-test-3.3</module> + <module>hadoop-api-shim-test-3.4</module> </modules> <dependencyManagement>