This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 4.x in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push: new b84121d PHOENIX-6208 Backport the assembly changes in PHOENIX-6178 to 4.x b84121d is described below commit b84121d47a4939d08f3a58f1d8f25241dbbef20e Author: Istvan Toth <st...@apache.org> AuthorDate: Tue Oct 27 07:44:41 2020 +0100 PHOENIX-6208 Backport the assembly changes in PHOENIX-6178 to 4.x --- phoenix-assembly/pom.xml | 19 +-- .../src/build/components/all-common-files.xml | 12 +- phoenix-assembly/src/build/src.xml | 127 --------------------- 3 files changed, 8 insertions(+), 150 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 32939c9..00e7b05 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -107,7 +107,7 @@ <goal>single</goal> </goals> <configuration> - <finalName>phoenix-${project.version}</finalName> + <finalName>phoenix-${project.version}-bin</finalName> <attach>false</attach> <tarLongFileMode>gnu</tarLongFileMode> <appendAssemblyId>false</appendAssemblyId> @@ -117,23 +117,6 @@ <tarLongFileMode>posix</tarLongFileMode> </configuration> </execution> - <execution> - <id>package-to-source-tar</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>phoenix-${project.version}-source</finalName> - <attach>false</attach> - <tarLongFileMode>gnu</tarLongFileMode> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/build/src.xml</descriptor> - </descriptors> - <tarLongFileMode>posix</tarLongFileMode> - </configuration> - </execution> </executions> </plugin> </plugins> diff --git a/phoenix-assembly/src/build/components/all-common-files.xml b/phoenix-assembly/src/build/components/all-common-files.xml index 386fe4a..f4c4c30 100644 --- a/phoenix-assembly/src/build/components/all-common-files.xml +++ b/phoenix-assembly/src/build/components/all-common-files.xml @@ -30,6 +30,13 @@ <include>*.md</include> </includes> </fileSet> + <!-- Copy the binary license files --> + <fileSet> + <directory>${project.basedir}/../dev/release_files</directory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + <outputDirectory>/</outputDirectory> + </fileSet> <!-- Copy the executable files from the bin directory --> <fileSet> <directory>${project.basedir}/../bin</directory> @@ -86,10 +93,5 @@ <fileMode>0644</fileMode> <directoryMode>0755</directoryMode> </fileSet> - <fileSet> - <directory>${project.basedir}/../python</directory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - </fileSet> </fileSets> </component> diff --git a/phoenix-assembly/src/build/src.xml b/phoenix-assembly/src/build/src.xml deleted file mode 100644 index cfa73d6..0000000 --- a/phoenix-assembly/src/build/src.xml +++ /dev/null @@ -1,127 +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.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <!--This 'all' id is not appended to the produced bundle because we do this: http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers --> - <id>src</id> - <formats> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>true</includeBaseDirectory> - - <moduleSets> - <moduleSet> - <!-- Enable access to all projects in the current multimodule build. Eclipse - says this is an error, but builds from the command line just fine. --> - <useAllReactorProjects>true</useAllReactorProjects> - <!-- Include all the sources in the top directory --> - <sources> - <fileSets> - <fileSet> - <!-- Make sure this excludes is same as the phoenix-hadoop2-compat - excludes below --> - <excludes> - <exclude>target/</exclude> - <exclude>test/</exclude> - <exclude>.classpath</exclude> - <exclude>.project</exclude> - <exclude>.settings/</exclude> - </excludes> - </fileSet> - </fileSets> - </sources> - </moduleSet> - </moduleSets> - - <fileSets> - <!--This one is weird. When we assemble src, it'll be default profile which - at the moment is hadoop1. But we should include the hadoop2 compat module - too so can build hadoop2 from src --> - <fileSet> - <directory>${project.basedir}/..</directory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - <includes> - <include>phoenix-*</include> - </includes> - <excludes> - <exclude>target/</exclude> - <exclude>test/</exclude> - <exclude>.classpath</exclude> - <exclude>.project</exclude> - <exclude>.settings/</exclude> - </excludes> - </fileSet> - <fileSet> - <!--Get misc project files --> - <directory>${project.basedir}/..</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.txt</include> - <include>*.md</include> - <include>pom.xml</include> - </includes> - </fileSet> - <!-- Top level directories --> - <fileSet> - <directory>${project.basedir}/../bin</directory> - <outputDirectory>bin</outputDirectory> - <fileMode>0755</fileMode> - <directoryMode>0755</directoryMode> - <includes> - <include>*.py</include> - <include>*.sh</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../bin</directory> - <outputDirectory>bin</outputDirectory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - <excludes> - <exclude>*.py*</exclude> - <exclude>*.sh*</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../dev</directory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - </fileSet> - <fileSet> - <directory>${project.basedir}/../docs</directory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - </fileSet> - <fileSet> - <directory>${project.basedir}/../examples</directory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - </fileSet> - <fileSet> - <directory>${project.basedir}/../python</directory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - </fileSet> - </fileSets> - -</assembly>