Repository: falcon Updated Branches: refs/heads/master a19432953 -> 43c7a71bb
FALCON-1751 Support assembly:single mojo. Contributed by Ruoyu Wang. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/43c7a71b Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/43c7a71b Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/43c7a71b Branch: refs/heads/master Commit: 43c7a71bb590788448da51adb3643434fb0f0a83 Parents: a194329 Author: Ajay Yadava <[email protected]> Authored: Sat Jan 30 02:04:35 2016 +0530 Committer: Ajay Yadava <[email protected]> Committed: Sat Jan 30 02:04:35 2016 +0530 ---------------------------------------------------------------------- CHANGES.txt | 4 ++ checkstyle/pom.xml | 10 ++- distro/pom.xml | 84 ++++++++++++++++++++++++ pom.xml | 34 +++------- src/main/assemblies/distributed-package.xml | 71 ++++++++++++++------ src/main/assemblies/empty.xml | 21 ++++++ src/main/assemblies/src-package.xml | 2 +- src/main/assemblies/standalone-package.xml | 63 ++++++++++++------ 8 files changed, 220 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/43c7a71b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5bb871a..fca1b7a 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,6 +11,8 @@ Trunk FALCON-1230 Data based notification Service to notify execution instances when data becomes available(Pavan Kumar Kolamuri via Ajay Yadava) IMPROVEMENTS + FALCON-1751 Support assembly:single mojo(Ruoyu Wang via Ajay Yadava) + FALCON-763 Support feed listing for CatalogStorage (Balu Vellanki) FALCON-1764 Remove temporary folder "localhost" created during tests(Praveen Adlakha via Ajay Yadava) @@ -137,6 +139,8 @@ Proposed Release Version: 0.9 OPTIMIZATIONS BUG FIXES + FALCON-1782 Client returns FalconWebException instead of the expected error message(Praveed Adlakha via Ajay Yadava) + FALCON-1747 Falcon instance status listing is throwing error message (Peeyush Bishnoi) FALCON-1758 APIs fail when oozie workflow entries are deleted (Pavan Kolamuri via Pallavi Rao) http://git-wip-us.apache.org/repos/asf/falcon/blob/43c7a71b/checkstyle/pom.xml ---------------------------------------------------------------------- diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml index f8a1143..8ea7fa1 100644 --- a/checkstyle/pom.xml +++ b/checkstyle/pom.xml @@ -21,8 +21,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.falcon</groupId> + <parent> + <groupId>org.apache.falcon</groupId> + <artifactId>falcon-main</artifactId> + <version>0.10-SNAPSHOT</version> + </parent> <artifactId>checkstyle</artifactId> - <version>0.10-SNAPSHOT</version> <name>Checkstyle</name> + <properties> + <skipTests>true</skipTests> + </properties> </project> http://git-wip-us.apache.org/repos/asf/falcon/blob/43c7a71b/distro/pom.xml ---------------------------------------------------------------------- diff --git a/distro/pom.xml b/distro/pom.xml new file mode 100644 index 0000000..02cc179 --- /dev/null +++ b/distro/pom.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<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 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.falcon</groupId> + <artifactId>falcon-main</artifactId> + <version>0.8.0-IBM-1-SNAPSHOT</version> + </parent> + <artifactId>falcon-distro</artifactId> + <description>Apache Falcon Distro</description> + <name>Apache Falcon Distro</name> + <packaging>pom</packaging> + <profiles> + <profile> + <id>distributed</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>../src/main/assemblies/distributed-package.xml</descriptor> + <descriptor>../src/main/assemblies/src-package.xml</descriptor> + </descriptors> + <finalName>apache-falcon-distributed-${project.version}</finalName> + </configuration> + <executions> + <execution> + <id>dist-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>../src/main/assemblies/standalone-package.xml</descriptor> + <descriptor>../src/main/assemblies/src-package.xml</descriptor> + </descriptors> + <finalName>apache-falcon-${project.version}</finalName> + </configuration> + <executions> + <execution> + <id>dist-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/falcon/blob/43c7a71b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 86dfcdc..4a6bd35 100644 --- a/pom.xml +++ b/pom.xml @@ -254,24 +254,6 @@ </profile> <profile> - <id>distributed</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assemblies/distributed-package.xml</descriptor> - <descriptor>src/main/assemblies/src-package.xml</descriptor> - </descriptors> - <finalName>apache-falcon-distributed-${project.version}</finalName> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> <id>test-patch</id> <build> <plugins> @@ -344,9 +326,9 @@ <configuration> <consoleOutput>true</consoleOutput> <includeTestSourceDirectory>true</includeTestSourceDirectory> - <configLocation>falcon/checkstyle.xml</configLocation> - <headerLocation>falcon/checkstyle-java-header.txt</headerLocation> - <suppressionsLocation>falcon/checkstyle-suppressions.xml</suppressionsLocation> + <configLocation>checkstyle/src/main/resources/falcon/checkstyle.xml</configLocation> + <headerLocation>checkstyle/src/main/resources/falcon/checkstyle-java-header.txt</headerLocation> + <suppressionsLocation>checkstyle/src/main/resources/falcon/checkstyle-suppressions.xml</suppressionsLocation> <failOnViolation>true</failOnViolation> </configuration> </execution> @@ -446,6 +428,7 @@ <module>lifecycle</module> <module>webapp</module> <module>docs</module> + <module>distro</module> </modules> <repositories> @@ -1334,17 +1317,16 @@ </executions> </plugin> - <plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> + <version>2.2.1</version> <configuration> <descriptors> - <descriptor>src/main/assemblies/standalone-package.xml</descriptor> - <descriptor>src/main/assemblies/src-package.xml</descriptor> + <descriptor>src/main/assemblies/empty.xml</descriptor> </descriptors> - <finalName>apache-falcon-${project.version}</finalName> </configuration> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/falcon/blob/43c7a71b/src/main/assemblies/distributed-package.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/distributed-package.xml b/src/main/assemblies/distributed-package.xml index ff51bcb..03d38a1 100644 --- a/src/main/assemblies/distributed-package.xml +++ b/src/main/assemblies/distributed-package.xml @@ -27,8 +27,10 @@ <baseDirectory>falcon-distributed-${project.version}</baseDirectory> <fileSets> <fileSet> - <directory>src/conf/</directory> + <directory>../src/conf/</directory> <outputDirectory>conf</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0644</directoryMode> <excludes> <exclude>client.properties</exclude> <exclude>prism-client.properties</exclude> @@ -36,32 +38,38 @@ </fileSet> <fileSet> - <directory>client/target/dependency</directory> + <directory>../client/target/dependency</directory> <outputDirectory>client/lib</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> - <directory>scheduler/target/dependency</directory> + <directory>../scheduler/target/dependency</directory> <outputDirectory>client/lib</outputDirectory> + <fileMode>0644</fileMode> </fileSet> <fileSet> - <directory>oozie-el-extensions/target/dependency</directory> + <directory>../oozie-el-extensions/target/dependency</directory> <outputDirectory>oozie/libext</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> - <directory>docs/target/site</directory> + <directory>../docs/target/site</directory> <outputDirectory>docs</outputDirectory> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> - <directory>webapp/target/apidocs</directory> + <directory>../webapp/target/apidocs</directory> <outputDirectory>apidocs</outputDirectory> </fileSet> <fileSet> - <directory>src/bin</directory> + <directory>../src/bin</directory> <outputDirectory>bin</outputDirectory> <fileMode>0755</fileMode> <directoryMode>0755</directoryMode> @@ -71,7 +79,7 @@ </fileSet> <fileSet> - <directory>logs</directory> + <directory>../logs</directory> <outputDirectory>logs</outputDirectory> <directoryMode>0777</directoryMode> <excludes> @@ -81,76 +89,97 @@ </fileSet> <fileSet> - <directory>./</directory> + <directory>../</directory> <outputDirectory>/</outputDirectory> + <fileMode>0644</fileMode> <includes> <include>DISCLAIMER.txt</include> <include>NOTICE.txt</include> <include>LICENSE.txt</include> - <include>CHANGES.txt</include> <include>README</include> </includes> </fileSet> + + <fileSet> + <directory>../</directory> + <outputDirectory>/</outputDirectory> + <fileMode>0755</fileMode> + <includes> + <include>CHANGES.txt</include> + </includes> + </fileSet> <fileSet> - <directory>hadoop-dependencies/target/dependency</directory> + <directory>../hadoop-dependencies/target/dependency</directory> <outputDirectory>hadooplibs</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0644</directoryMode> </fileSet> <fileSet> - <directory>addons/recipes/hdfs-replication/src/main/resources</directory> + <directory>../addons/recipes/hdfs-replication/src/main/resources</directory> <outputDirectory>data-mirroring/hdfs-replication</outputDirectory> + <fileMode>0644</fileMode> </fileSet> <fileSet> - <directory>addons/recipes/hive-disaster-recovery/src/main/resources</directory> + <directory>../addons/recipes/hive-disaster-recovery/src/main/resources</directory> <outputDirectory>data-mirroring/hive-disaster-recovery</outputDirectory> + <fileMode>0644</fileMode> </fileSet> <fileSet> - <directory>src/main/examples</directory> + <directory>../src/main/examples</directory> <outputDirectory>examples</outputDirectory> + <directoryMode>0755</directoryMode> </fileSet> </fileSets> <files> <file> - <source>src/conf/prism-client.properties</source> + <source>../src/conf/prism-client.properties</source> <outputDirectory>conf</outputDirectory> + <fileMode>0644</fileMode> <destName>client.properties</destName> </file> <file> - <source>prism/target/prism.keystore</source> + <source>../prism/target/prism.keystore</source> <outputDirectory>conf</outputDirectory> + <fileMode>0644</fileMode> <destName>prism.keystore</destName> </file> <file> - <source>webapp/target/falcon-webapp-${project.version}.war</source> + <source>../webapp/target/falcon-webapp-${project.version}.war</source> <outputDirectory>server/webapp</outputDirectory> + <fileMode>0644</fileMode> <destName>falcon.war</destName> </file> <file> - <source>prism/target/falcon-prism-${project.version}.war</source> + <source>../prism/target/falcon-prism-${project.version}.war</source> <outputDirectory>server/webapp</outputDirectory> + <fileMode>0644</fileMode> <destName>prism.war</destName> </file> <file> - <source>client/target/falcon-client-${project.version}.jar</source> + <source>../client/target/falcon-client-${project.version}.jar</source> <outputDirectory>client/lib</outputDirectory> + <fileMode>0644</fileMode> </file> <file> - <source>oozie-el-extensions/target/falcon-oozie-el-extension-${project.version}.jar</source> + <source>../oozie-el-extensions/target/falcon-oozie-el-extension-${project.version}.jar</source> <outputDirectory>oozie/libext</outputDirectory> + <fileMode>0644</fileMode> </file> <file> - <source>oozie-el-extensions/src/main/conf/oozie-site.xml</source> + <source>../oozie-el-extensions/src/main/conf/oozie-site.xml</source> <outputDirectory>oozie/conf</outputDirectory> + <fileMode>0644</fileMode> </file> </files> </assembly> http://git-wip-us.apache.org/repos/asf/falcon/blob/43c7a71b/src/main/assemblies/empty.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/empty.xml b/src/main/assemblies/empty.xml new file mode 100644 index 0000000..35738b1 --- /dev/null +++ b/src/main/assemblies/empty.xml @@ -0,0 +1,21 @@ +<!-- + 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> + <id>empty</id> + <formats/> +</assembly> http://git-wip-us.apache.org/repos/asf/falcon/blob/43c7a71b/src/main/assemblies/src-package.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/src-package.xml b/src/main/assemblies/src-package.xml index e650167..098f086 100644 --- a/src/main/assemblies/src-package.xml +++ b/src/main/assemblies/src-package.xml @@ -26,7 +26,7 @@ <baseDirectory>falcon-sources-${project.version}</baseDirectory> <fileSets> <fileSet> - <directory>.</directory> + <directory>../</directory> <excludes> <exclude>**/target/**</exclude> <exclude>**/logs/**</exclude> http://git-wip-us.apache.org/repos/asf/falcon/blob/43c7a71b/src/main/assemblies/standalone-package.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/standalone-package.xml b/src/main/assemblies/standalone-package.xml index 2909631..bef19ce 100644 --- a/src/main/assemblies/standalone-package.xml +++ b/src/main/assemblies/standalone-package.xml @@ -27,7 +27,7 @@ <baseDirectory>falcon-${project.version}</baseDirectory> <fileSets> <fileSet> - <directory>src/conf/</directory> + <directory>../src/conf/</directory> <outputDirectory>conf</outputDirectory> <excludes> <exclude>prism-client.properties</exclude> @@ -35,32 +35,38 @@ </fileSet> <fileSet> - <directory>client/target/dependency</directory> + <directory>../client/target/dependency</directory> <outputDirectory>client/lib</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> - <directory>scheduler/target/dependency</directory> + <directory>../scheduler/target/dependency</directory> <outputDirectory>client/lib</outputDirectory> + <fileMode>0644</fileMode> </fileSet> <fileSet> - <directory>oozie-el-extensions/target/dependency</directory> + <directory>../oozie-el-extensions/target/dependency</directory> <outputDirectory>oozie/libext</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> - <directory>docs/target/site</directory> + <directory>../docs/target/site</directory> <outputDirectory>docs</outputDirectory> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> - <directory>webapp/target/apidocs</directory> + <directory>../webapp/target/apidocs</directory> <outputDirectory>apidocs</outputDirectory> </fileSet> <fileSet> - <directory>src/bin</directory> + <directory>../src/bin</directory> <outputDirectory>bin</outputDirectory> <fileMode>0755</fileMode> <directoryMode>0755</directoryMode> @@ -71,7 +77,7 @@ </fileSet> <fileSet> - <directory>logs</directory> + <directory>../logs</directory> <outputDirectory>logs</outputDirectory> <directoryMode>0777</directoryMode> <excludes> @@ -81,64 +87,83 @@ </fileSet> <fileSet> - <directory>./</directory> + <directory>.././</directory> <outputDirectory>/</outputDirectory> + <fileMode>0644</fileMode> <includes> <include>DISCLAIMER.txt</include> <include>NOTICE.txt</include> <include>LICENSE.txt</include> - <include>CHANGES.txt</include> <include>README</include> </includes> </fileSet> + + <fileSet> + <directory>../</directory> + <outputDirectory>/</outputDirectory> + <fileMode>0755</fileMode> + <includes> + <include>CHANGES.txt</include> + </includes> + </fileSet> <fileSet> - <directory>hadoop-dependencies/target/dependency</directory> + <directory>../hadoop-dependencies/target/dependency</directory> <outputDirectory>hadooplibs</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> - <directory>src/main/examples</directory> + <directory>../src/main/examples</directory> <outputDirectory>examples</outputDirectory> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> - <directory>addons/recipes/hdfs-replication/src/main/resources</directory> + <directory>../addons/recipes/hdfs-replication/src/main/resources</directory> <outputDirectory>data-mirroring/hdfs-replication</outputDirectory> + <fileMode>0644</fileMode> </fileSet> <fileSet> - <directory>addons/recipes/hive-disaster-recovery/src/main/resources</directory> + <directory>../addons/recipes/hive-disaster-recovery/src/main/resources</directory> <outputDirectory>data-mirroring/hive-disaster-recovery</outputDirectory> + <fileMode>0644</fileMode> </fileSet> </fileSets> <files> <file> - <source>client/target/falcon-client-${project.version}.jar</source> + <source>../client/target/falcon-client-${project.version}.jar</source> <outputDirectory>client/lib</outputDirectory> + <fileMode>0644</fileMode> </file> <file> - <source>prism/target/prism.keystore</source> + <source>../prism/target/prism.keystore</source> <outputDirectory>conf</outputDirectory> <destName>prism.keystore</destName> + <fileMode>0644</fileMode> </file> <file> - <source>oozie-el-extensions/target/falcon-oozie-el-extension-${project.version}.jar</source> + <source>../oozie-el-extensions/target/falcon-oozie-el-extension-${project.version}.jar</source> <outputDirectory>oozie/libext</outputDirectory> + <fileMode>0644</fileMode> </file> <file> - <source>oozie-el-extensions/src/main/conf/oozie-site.xml</source> + <source>../oozie-el-extensions/src/main/conf/oozie-site.xml</source> <outputDirectory>oozie/conf</outputDirectory> + <fileMode>0644</fileMode> </file> <file> - <source>webapp/target/falcon-webapp-${project.version}.war</source> + <source>../webapp/target/falcon-webapp-${project.version}.war</source> <outputDirectory>server/webapp</outputDirectory> <destName>falcon.war</destName> + <fileMode>0644</fileMode> </file> </files> </assembly>
