Repository: hadoop Updated Branches: refs/heads/ozone-0.2 13d4347cf -> bd7fd7a20
HDDS-463. Fix the release packaging of the ozone distribution. Contributed by Elek Marton. (cherry picked from commit 3d89c3e73eba280b8780228fcd097809271b4c8a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bd7fd7a2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bd7fd7a2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bd7fd7a2 Branch: refs/heads/ozone-0.2 Commit: bd7fd7a2045afdfc9a1a7d904f210c07f7d6a54d Parents: 13d4347 Author: Bharat Viswanadham <bha...@apache.org> Authored: Mon Sep 17 11:49:09 2018 -0700 Committer: Bharat Viswanadham <bha...@apache.org> Committed: Mon Sep 17 11:51:27 2018 -0700 ---------------------------------------------------------------------- dev-support/bin/ozone-dist-layout-stitching | 11 +++- .../assemblies/hadoop-src-with-hdds.xml | 56 ++++++++++++++++++++ .../assemblies/hadoop-src-with-hdsl.xml | 56 -------------------- hadoop-dist/src/main/ozone/README.txt | 51 ++++++++++++++++++ 4 files changed, 116 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bd7fd7a2/dev-support/bin/ozone-dist-layout-stitching ---------------------------------------------------------------------- diff --git a/dev-support/bin/ozone-dist-layout-stitching b/dev-support/bin/ozone-dist-layout-stitching index b4d94b3..8f1f169 100755 --- a/dev-support/bin/ozone-dist-layout-stitching +++ b/dev-support/bin/ozone-dist-layout-stitching @@ -122,7 +122,6 @@ run mkdir "ozone-${HDDS_VERSION}" run cd "ozone-${HDDS_VERSION}" run cp -p "${ROOT}/LICENSE.txt" . run cp -p "${ROOT}/NOTICE.txt" . -run cp -p "${ROOT}/README.txt" . # Copy hadoop-common first so that it have always have all dependencies. # Remaining projects will copy only libraries which are not present already in 'share' directory. @@ -162,6 +161,14 @@ cp -r "${ROOT}/hadoop-ozone/docs/target/classes/webapps/docs" ./ rm sbin/*all.sh rm sbin/*all.cmd +#remove test and java sources +find . -name "*tests.jar" | xargs rm +find . -name "*sources.jar" | xargs rm +find . -name jdiff -type d | xargs rm -rf + +#add ozone specific readme + +run cp "${ROOT}/hadoop-dist/src/main/ozone/README.txt" README.txt #Copy docker compose files run cp -p -r "${ROOT}/hadoop-dist/src/main/compose" . @@ -169,5 +176,5 @@ mkdir -p ./share/hadoop/mapreduce mkdir -p ./share/hadoop/yarn mkdir -p ./share/hadoop/hdfs echo -echo "Hadoop Ozone dist layout available at: ${BASEDIR}/ozone" +echo "Hadoop Ozone dist layout available at: ${BASEDIR}/ozone-${HDDS_VERSION}" echo http://git-wip-us.apache.org/repos/asf/hadoop/blob/bd7fd7a2/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdds.xml ---------------------------------------------------------------------- diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdds.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdds.xml new file mode 100644 index 0000000..b1e039f --- /dev/null +++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdds.xml @@ -0,0 +1,56 @@ +<!-- + 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. +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> + <id>hadoop-src</id> + <formats> + <format>tar.gz</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>.</directory> + <includes> + <include>LICENCE.txt</include> + <include>README.txt</include> + <include>NOTICE.txt</include> + </includes> + </fileSet> + <fileSet> + <directory>.</directory> + <useDefaultExcludes>true</useDefaultExcludes> + <excludes> + <exclude>.git/**</exclude> + <exclude>**/.gitignore</exclude> + <exclude>**/.svn</exclude> + <exclude>**/*.iws</exclude> + <exclude>**/*.ipr</exclude> + <exclude>**/*.iml</exclude> + <exclude>**/.classpath</exclude> + <exclude>**/.project</exclude> + <exclude>**/.settings</exclude> + <exclude>**/target/**</exclude> + <!-- until the code that does this is fixed --> + <exclude>**/*.log</exclude> + <exclude>**/build/**</exclude> + <exclude>**/file:/**</exclude> + <exclude>**/SecurityAuth.audit*</exclude> + </excludes> + </fileSet> + </fileSets> +</assembly> http://git-wip-us.apache.org/repos/asf/hadoop/blob/bd7fd7a2/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdsl.xml ---------------------------------------------------------------------- diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdsl.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdsl.xml deleted file mode 100644 index b1e039f..0000000 --- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdsl.xml +++ /dev/null @@ -1,56 +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. ---> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> - <id>hadoop-src</id> - <formats> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>true</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>.</directory> - <includes> - <include>LICENCE.txt</include> - <include>README.txt</include> - <include>NOTICE.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>.</directory> - <useDefaultExcludes>true</useDefaultExcludes> - <excludes> - <exclude>.git/**</exclude> - <exclude>**/.gitignore</exclude> - <exclude>**/.svn</exclude> - <exclude>**/*.iws</exclude> - <exclude>**/*.ipr</exclude> - <exclude>**/*.iml</exclude> - <exclude>**/.classpath</exclude> - <exclude>**/.project</exclude> - <exclude>**/.settings</exclude> - <exclude>**/target/**</exclude> - <!-- until the code that does this is fixed --> - <exclude>**/*.log</exclude> - <exclude>**/build/**</exclude> - <exclude>**/file:/**</exclude> - <exclude>**/SecurityAuth.audit*</exclude> - </excludes> - </fileSet> - </fileSets> -</assembly> http://git-wip-us.apache.org/repos/asf/hadoop/blob/bd7fd7a2/hadoop-dist/src/main/ozone/README.txt ---------------------------------------------------------------------- diff --git a/hadoop-dist/src/main/ozone/README.txt b/hadoop-dist/src/main/ozone/README.txt new file mode 100644 index 0000000..6bbd83f --- /dev/null +++ b/hadoop-dist/src/main/ozone/README.txt @@ -0,0 +1,51 @@ +<!--- + 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. +--> + +This is the distribution of Apache Hadoop Ozone. + +Ozone is a submodule of Hadoop with separated release cycle. For more information, check + + http://ozone.hadoop.apache.org + + and + + https://cwiki.apache.org/confluence/display/HADOOP/Ozone+Contributor+Guide + +For more information about Hadoop, check: + + http://hadoop.apache.org + +This distribution includes cryptographic software. The country in +which you currently reside may have restrictions on the import, +possession, use, and/or re-export to another country, of +encryption software. BEFORE using any encryption software, please +check your country's laws, regulations and policies concerning the +import, possession, or use, and re-export of encryption software, to +see if this is permitted. See <http://www.wassenaar.org/> for more +information. + +The U.S. Government Department of Commerce, Bureau of Industry and +Security (BIS), has classified this software as Export Commodity +Control Number (ECCN) 5D002.C.1, which includes information security +software using or performing cryptographic functions with asymmetric +algorithms. The form and manner of this Apache Software Foundation +distribution makes it eligible for export under the License Exception +ENC Technology Software Unrestricted (TSU) exception (see the BIS +Export Administration Regulations, Section 740.13) for both object +code and source code. + +The following provides more details on the included cryptographic +software: + Hadoop Core uses the SSL libraries from the Jetty project written +by mortbay.org. --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
