Repository: hadoop Updated Branches: refs/heads/HDFS-7240 7a542fb32 -> 14e268d57
HDFS-13335. Ozone: remove hdsl/cblock/ozone source code from the official apache source release artifact. Contributed by Elek, Marton. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/14e268d5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/14e268d5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/14e268d5 Branch: refs/heads/HDFS-7240 Commit: 14e268d5792c8bad4c37ed2793346e6c9b90e777 Parents: 7a542fb Author: Anu Engineer <[email protected]> Authored: Fri Mar 23 21:43:13 2018 -0700 Committer: Anu Engineer <[email protected]> Committed: Fri Mar 23 21:43:13 2018 -0700 ---------------------------------------------------------------------- .../assemblies/hadoop-src-with-hdsl.xml | 56 ++++++++++++++++++++ .../main/resources/assemblies/hadoop-src.xml | 3 ++ pom.xml | 56 ++++++++++++++++++++ 3 files changed, 115 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/14e268d5/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 new file mode 100644 index 0000000..b1e039f --- /dev/null +++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdsl.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/14e268d5/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml ---------------------------------------------------------------------- diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml index b1e039f..bafa12b 100644 --- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml +++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml @@ -50,6 +50,9 @@ <exclude>**/build/**</exclude> <exclude>**/file:/**</exclude> <exclude>**/SecurityAuth.audit*</exclude> + <exclude>hadoop-ozone/**</exclude> + <exclude>hadoop-hdsl/**</exclude> + <exclude>hadoop-cblock/**</exclude> </excludes> </fileSet> </fileSets> http://git-wip-us.apache.org/repos/asf/hadoop/blob/14e268d5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 13466f6..ad306f5 100644 --- a/pom.xml +++ b/pom.xml @@ -560,6 +560,62 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs </plugins> </build> </profile> + <profile> + <id>hdsl-src</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <id>src-dist</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <attach>false</attach> + <finalName>hadoop-${project.version}-src-with-hdsl</finalName> + <outputDirectory>hadoop-dist/target</outputDirectory> + <!-- Not using descriptorRef and hadoop-assembly dependency --> + <!-- to avoid making hadoop-main to depend on a module --> + <descriptors> + <descriptor>hadoop-assemblies/src/main/resources/assemblies/hadoop-src-with-hdsl.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <id>src-dist-msg</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <echo/> + <echo>Hadoop source tar (including HDSL) available at: ${basedir}/hadoop-dist/target/hadoop-${project.version}-src-with-hdsl.tar.gz</echo> + <echo/> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> <profile> <id>sign</id> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
