falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject falcon git commit: FALCON-1898 Build fails on assembly:assembly when using maven-assembly-plugin version 2.6
Date Wed, 13 Apr 2016 02:15:58 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 95bf312f4 -> 3e22a77fe


FALCON-1898 Build fails on assembly:assembly when using maven-assembly-plugin version 2.6

Author: bvellanki <bvellanki@hortonworks.com>

Reviewers: "Venkat Ranganathan <venkat@hortonworks.com>, Venkatesan Ramachandran <vramachandran@hortonworks.com>"

Closes #96 from bvellanki/master


Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/3e22a77f
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/3e22a77f
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/3e22a77f

Branch: refs/heads/master
Commit: 3e22a77fec451ae5169548f2cee70ab483eba650
Parents: 95bf312
Author: bvellanki <bvellanki@hortonworks.com>
Authored: Tue Apr 12 19:15:47 2016 -0700
Committer: bvellanki <bvellanki@hortonworks.com>
Committed: Tue Apr 12 19:15:47 2016 -0700

----------------------------------------------------------------------
 pom.xml                                     |  12 +-
 src/main/assemblies/assembly-src.xml        |  48 +++++
 src/main/assemblies/assembly-standalone.xml | 249 +++++++++++++++++++++++
 src/main/assemblies/empty.xml               |  21 --
 4 files changed, 304 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/3e22a77f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a62c030..f777dc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1348,11 +1348,13 @@
               <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.6</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assemblies/empty.xml</descriptor>
-                    </descriptors>
-                </configuration>
+                  <configuration>
+                      <descriptors>
+                          <descriptor>src/main/assemblies/assembly-standalone.xml</descriptor>
+                          <descriptor>src/main/assemblies/assembly-src.xml</descriptor>
+                      </descriptors>
+                      <finalName>falcon-${project.version}</finalName>
+                  </configuration>
             </plugin>
  
             <plugin>

http://git-wip-us.apache.org/repos/asf/falcon/blob/3e22a77f/src/main/assemblies/assembly-src.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/assembly-src.xml b/src/main/assemblies/assembly-src.xml
new file mode 100644
index 0000000..2cbc06b
--- /dev/null
+++ b/src/main/assemblies/assembly-src.xml
@@ -0,0 +1,48 @@
+<?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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <id>sources</id>
+    <baseDirectory>falcon-sources-${project.version}</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>./</directory>
+            <excludes>
+                <exclude>**/target/**</exclude>
+                <exclude>**/logs/**</exclude>
+                <exclude>**/activemq-data/**</exclude>
+                <exclude>**/.git*/**</exclude>
+                <exclude>backlog</exclude>
+                <exclude>**/.idea/**</exclude>
+                <exclude>**/*.iml</exclude>
+                <exclude>**/addons/designer/**</exclude>
+                <exclude>**/*.ipr</exclude>
+                <exclude>**/*.iws</exclude>
+                <exclude>**/*.log</exclude>
+                <exclude>**/dist/**</exclude>
+                <exclude>**/node_modules/**</exclude>
+                <exclude>**/node/**</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/falcon/blob/3e22a77f/src/main/assemblies/assembly-standalone.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/assembly-standalone.xml b/src/main/assemblies/assembly-standalone.xml
new file mode 100644
index 0000000..8e3f75d
--- /dev/null
+++ b/src/main/assemblies/assembly-standalone.xml
@@ -0,0 +1,249 @@
+<?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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <id>bin</id>
+    <baseDirectory>falcon-${project.version}</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>src/conf/</directory>
+            <outputDirectory>conf</outputDirectory>
+            <excludes>
+                <exclude>prism-client.properties</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet>
+            <directory>client/target/dependency</directory>
+            <outputDirectory>client/lib</outputDirectory>
+            <excludes>
+                <exclude>testng-*.jar</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet>
+            <directory>oozie-el-extensions/target/dependency</directory>
+            <outputDirectory>oozie/libext</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>docs/target/site</directory>
+            <outputDirectory>docs</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>webapp/target/apidocs</directory>
+            <outputDirectory>apidocs</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>src/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+            <excludes>
+                <exclude>prism*</exclude>
+                <exclude>package.sh</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet>
+            <directory>logs</directory>
+            <outputDirectory>logs</outputDirectory>
+            <directoryMode>0777</directoryMode>
+            <excludes>
+                <exclude>*</exclude>
+                <exclude>**/**</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet>
+            <directory>./</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>DISCLAIMER.txt</include>
+                <include>NOTICE.txt</include>
+                <include>LICENSE.txt</include>
+                <include>CHANGES.txt</include>
+                <include>README</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>hadoop-dependencies/target/dependency</directory>
+            <outputDirectory>hadooplibs</outputDirectory>
+            <excludes>
+                <exclude>testng-*.jar</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet>
+            <directory>src/main/examples</directory>
+            <outputDirectory>examples</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>addons/extensions/hdfs-mirroring/src/main/META</directory>
+            <outputDirectory>extensions/hdfs-mirroring/META</outputDirectory>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>./</directory>
+            <outputDirectory>extensions/hdfs-mirroring/libs/build</outputDirectory>
+            <excludes>
+                <exclude>*/**</exclude>
+            </excludes>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>./</directory>
+            <outputDirectory>extensions/hdfs-mirroring/libs/runtime</outputDirectory>
+            <excludes>
+                <exclude>*/**</exclude>
+            </excludes>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>addons/extensions/hdfs-mirroring/src/main/resources</directory>
+            <outputDirectory>extensions/hdfs-mirroring/resources</outputDirectory>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>addons/extensions/hdfs-snapshot-mirroring/src/main/META</directory>
+            <outputDirectory>extensions/hdfs-snapshot-mirroring/META</outputDirectory>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>./</directory>
+            <outputDirectory>extensions/hdfs-snapshot-mirroring/libs/build</outputDirectory>
+            <excludes>
+                <exclude>*/**</exclude>
+            </excludes>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>./</directory>
+            <outputDirectory>extensions/hdfs-snapshot-mirroring/libs/runtime</outputDirectory>
+            <excludes>
+                <exclude>*/**</exclude>
+            </excludes>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>addons/extensions/hdfs-snapshot-mirroring/src/main/resources</directory>
+            <outputDirectory>extensions/hdfs-snapshot-mirroring/resources</outputDirectory>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>addons/extensions/hive-mirroring/src/main/META</directory>
+            <outputDirectory>extensions/hive-mirroring/META</outputDirectory>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>./</directory>
+            <fileMode>0755</fileMode>
+            <outputDirectory>extensions/hive-mirroring/libs/build</outputDirectory>
+            <excludes>
+                <exclude>*/**</exclude>
+            </excludes>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>./</directory>
+            <outputDirectory>extensions/hive-mirroring/libs/runtime</outputDirectory>
+            <excludes>
+                <exclude>*/**</exclude>
+            </excludes>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>addons/extensions/hive-mirroring/src/main/resources</directory>
+            <outputDirectory>extensions/hive-mirroring/resources</outputDirectory>
+            <fileMode>0755</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>client/target/falcon-client-${project.version}.jar</source>
+            <outputDirectory>client/lib</outputDirectory>
+        </file>
+
+        <file>
+            <source>prism/target/prism.keystore</source>
+            <outputDirectory>conf</outputDirectory>
+            <destName>prism.keystore</destName>
+        </file>
+
+        <file>
+            <source>oozie-el-extensions/target/falcon-oozie-el-extension-${project.version}.jar</source>
+            <outputDirectory>oozie/libext</outputDirectory>
+        </file>
+
+        <file>
+            <source>oozie-el-extensions/src/main/conf/oozie-site.xml</source>
+            <outputDirectory>oozie/conf</outputDirectory>
+        </file>
+
+        <file>
+            <source>webapp/target/falcon-webapp-${project.version}.war</source>
+            <outputDirectory>server/webapp</outputDirectory>
+            <destName>falcon.war</destName>
+        </file>
+
+        <file>
+            <source>addons/extensions/hdfs-mirroring/README</source>
+            <outputDirectory>extensions/hdfs-mirroring</outputDirectory>
+            <fileMode>0755</fileMode>
+        </file>
+
+        <file>
+            <source>addons/extensions/hive-mirroring/README</source>
+            <outputDirectory>extensions/hive-mirroring</outputDirectory>
+            <fileMode>0755</fileMode>
+        </file>
+    </files>
+</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/falcon/blob/3e22a77f/src/main/assemblies/empty.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/empty.xml b/src/main/assemblies/empty.xml
deleted file mode 100644
index 35738b1..0000000
--- a/src/main/assemblies/empty.xml
+++ /dev/null
@@ -1,21 +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>
-    <id>empty</id>
-    <formats/>
-</assembly>


Mime
View raw message