You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-issues@hadoop.apache.org by GitBox <gi...@apache.org> on 2019/01/10 18:35:53 UTC
[GitHub] lewismc closed pull request #137: HADOOP-10225
lewismc closed pull request #137: HADOOP-10225
URL: https://github.com/apache/hadoop/pull/137
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hadoop-build-tools/pom.xml b/hadoop-build-tools/pom.xml
index 26c8aa614f8b..0b11a9edbaf6 100644
--- a/hadoop-build-tools/pom.xml
+++ b/hadoop-build-tools/pom.xml
@@ -109,6 +109,40 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>rat-verify</id>
+ <phase>test</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <licenses>
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>ASL20</licenseFamilyCategory>
+ <licenseFamilyName>Apache Software License, 2.0</licenseFamilyName>
+ <notes>Single licensed ASL v2.0</notes>
+ <patterns>
+ <pattern>Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <exclude>maven-eclipse.xml</exclude>
+ <exclude>.classpath</exclude>
+ <exclude>**/.externalToolBuilders/**</exclude>
+ <exclude>.project</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 58abaf3d2b7a..a2935d319006 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -51,7 +51,7 @@
<kafka.version>0.8.2.1</kafka.version>
<hbase.version>1.1.3</hbase.version>
<phoenix.version>4.7.0-HBase-1.1</phoenix.version>
- <hbase-compatible-hadoop.version>2.5.1</hbase-compatible-hadoop.version>
+ <project.hbase-hadoop-compatibility.version>2.5.1</project.hbase-hadoop-compatibility.version>
<hadoop.assemblies.version>${project.version}</hadoop.assemblies.version>
<commons-daemon.version>1.0.13</commons-daemon.version>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
index a7b22a73396e..fef4b9dee405 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hbase-compatible-hadoop.version}</version>
+ <version>${project.hbase-hadoop-compatibility.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
- <version>${hbase-compatible-hadoop.version}</version>
+ <version>${project.hbase-hadoop-compatibility.version}</version>
<scope>test</scope>
</dependency>
@@ -363,7 +363,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hbase-compatible-hadoop.version}</version>
+ <version>${project.hbase-hadoop-compatibility.version}</version>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
@@ -377,14 +377,14 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hbase-compatible-hadoop.version}</version>
+ <version>${project.hbase-hadoop-compatibility.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hbase-compatible-hadoop.version}</version>
+ <version>${project.hbase-hadoop-compatibility.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 1a3cd28a6899..1b3d70172090 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</repository>
</repositories>
+ <scm>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/hadoop.git</connection>
+ <developerConnection>scm:git:http://git-wip-us.apache.org/repos/asf/hadoop.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf/hadoop.git</url>
+ <tag>HEAD</tag>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/HADOOP</url>
+ </issueManagement>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -98,9 +108,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<maven-assembly-plugin.version>2.4</maven-assembly-plugin.version>
<maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
- <maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
- <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
- <apache-rat-plugin.version>0.10</apache-rat-plugin.version>
+ <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
+ <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+ <apache-rat-plugin.version>0.12</apache-rat-plugin.version>
<wagon-ssh.version>1.0</wagon-ssh.version>
<maven-clover2-plugin.version>3.3.0</maven-clover2-plugin.version>
<maven-bundle-plugin.version>2.5.0</maven-bundle-plugin.version>
@@ -108,6 +118,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<maven-checkstyle-plugin.version>2.15</maven-checkstyle-plugin.version>
<checkstyle.version>6.6</checkstyle.version>
<dependency-check-maven.version>1.3.6</dependency-check-maven.version>
+ <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
+ <maven-scm-provider-gitexe.version>1.9.5</maven-scm-provider-gitexe.version>
+ <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+ <checksum-maven-plugin.version>1.3</checksum-maven-plugin.version>
+
+ <!-- javac base settings -->
+ <javac.src.version>1.7</javac.src.version>
+ <javac.target.version>1.7</javac.target.version>
<shell-executable>bash</shell-executable>
</properties>
@@ -131,6 +149,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<build>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>${maven-release-plugin.version}</version>
+ <configuration>
+ <preparationGoals>install</preparationGoals>
+ <mavenExecutorId>forked-path</mavenExecutorId>
+ <useReleaseProfile>false</useReleaseProfile>
+ <tagNameFormat>release-@{project.version}</tagNameFormat>
+ <arguments>-Papache-release,release</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-gitexe</artifactId>
+ <version>${maven-scm-provider-gitexe.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -372,7 +410,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<exclude>.gitignore</exclude>
<exclude>.git/**</exclude>
<exclude>.idea/**</exclude>
- <exclude>**/build/**</exclude>
+ <exclude>**/build/**</exclude>
<exclude>**/patchprocess/**</exclude>
</excludes>
</configuration>
@@ -674,5 +712,180 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</plugins>
</build>
</profile>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>rat-verify</id>
+ <phase>test</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <licenses>
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>ASL20</licenseFamilyCategory>
+ <licenseFamilyName>Apache Software License, 2.0</licenseFamilyName>
+ <notes>Single licensed ASL v2.0</notes>
+ <patterns>
+ <pattern>Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <exclude>.gitattributes</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>.idea/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>**/patchprocess/**</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.externalToolBuilders/**</exclude>
+ <exclude>**/jdiff/**</exclude>
+ <exclude>**/src/test/resources/**</exclude>
+ <exclude>hadoop-common-project/hadoop-common/dev-support/jdiff-workaround.patch</exclude>
+ <exclude>hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics2.properties</exclude>
+ <exclude>hadoop-common-project/hadoop-common/src/main/conf/workers</exclude>
+ <exclude>hadoop-common-project/hadoop-common/src/main/native/COPYING</exclude>
+ <exclude>hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c</exclude>
+ <exclude>hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.h</exclude>
+ <exclude>hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc.c</exclude>
+ <exclude>hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc.h</exclude>
+ <exclude>hadoop-common-project/hadoop-common/src/test/all-tests</exclude>
+ <exclude>hadoop-common-project/hadoop-common/src/test/empty-file</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/dev-support/all-tests</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/dev-support/commit-tests</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/dev-support/smoke-tests</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/robots.txt</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.0.2/fonts/glyphicons-halflings-regular.svg</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.0.2/js/bootstrap-editable.min.js</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.css</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.js</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-full-2.0.0.min.js</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-helpers-1.1.1.min.js</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/json-bignum.js</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/moment.min.js</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-signature.secret</exclude>
+ <exclude>hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/fuse-dfs/util/tree.h</exclude>
+ <exclude>hadoop-mapreduce-project/.eclipse.templates/.launches/AllMapredTests.launch</exclude>
+ <exclude>hadoop-mapreduce-project/.eclipse.templates/.launches/JobTracker.launch</exclude>
+ <exclude>hadoop-mapreduce-project/.eclipse.templates/.launches/SpecificTestTemplate.launch</exclude>
+ <exclude>hadoop-mapreduce-project/.eclipse.templates/.launches/TaskTracker.launch</exclude>
+ <exclude>hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/data60bytes</exclude>
+ <exclude>hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/gtest/gtest-all.cc</exclude>
+ <exclude>hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/gtest/include/gtest/gtest.h</exclude>
+ <exclude>hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/puzzle1.dta</exclude>
+ <exclude>hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json</exclude>
+ <exclude>hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3-LICENSE</exclude>
+ <exclude>hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js</exclude>
+ <exclude>hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js</exclude>
+ <exclude>hadoop-tools/hadoop-sls/src/main/html/simulate.html.template</exclude>
+ <exclude>hadoop-tools/hadoop-sls/src/main/html/simulate.info.html.template</exclude>
+ <exclude>hadoop-tools/hadoop-sls/src/main/html/track.html.template</exclude>
+ <exclude>hadoop-yarn-project/hadoop-yarn/conf/container-executor.cfg</exclude>
+ <exclude>hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-1.9.4/css/demo_table.css</exclude>
+ <exclude>hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-1.9.4/css/jui-dt.css</exclude>
+ <exclude>hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/themes-1.9.1/base/jquery-ui.css</exclude>
+ <exclude>hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/compat/fstatat.h</exclude>
+ <exclude>hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/compat/openat.h</exclude>
+ <exclude>hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/compat/unlinkat.h</exclude>
+ <exclude>/usr/local/hadoop/hadoop-build-tools/maven-eclipse.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${maven-source-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build>${implementation.build}</Implementation-Build>
+ <Implementation-Build-Date>${maven.build.timestamp}</Implementation-Build-Date>
+ <X-Compile-Source-JDK>${javac.src.version}</X-Compile-Source-JDK>
+ <X-Compile-Target-JDK>${javac.target.version}</X-Compile-Target-JDK>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <quiet>true</quiet>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build>${implementation.build}</Implementation-Build>
+ <Implementation-Build-Date>${maven.build.timestamp}</Implementation-Build-Date>
+ <X-Compile-Source-JDK>${javac.src.version}</X-Compile-Source-JDK>
+ <X-Compile-Target-JDK>${javac.target.version}</X-Compile-Target-JDK>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>${maven-gpg-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>net.ju-n.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>${checksum-maven-plugin.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-issues-help@hadoop.apache.org