You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ac...@apache.org on 2012/03/25 18:25:57 UTC

svn commit: r1305073 - in /incubator/giraph/trunk: CHANGELOG pom.xml src/main/assembly/compile.xml

Author: aching
Date: Sun Mar 25 16:25:56 2012
New Revision: 1305073

URL: http://svn.apache.org/viewvc?rev=1305073&view=rev
Log:
GIRAPH-159: Case insensitive file/directory name matching will produce
errors on M/R jar unpack (bfem via aching).

Added:
    incubator/giraph/trunk/src/main/assembly/compile.xml
Modified:
    incubator/giraph/trunk/CHANGELOG
    incubator/giraph/trunk/pom.xml

Modified: incubator/giraph/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/incubator/giraph/trunk/CHANGELOG?rev=1305073&r1=1305072&r2=1305073&view=diff
==============================================================================
--- incubator/giraph/trunk/CHANGELOG (original)
+++ incubator/giraph/trunk/CHANGELOG Sun Mar 25 16:25:56 2012
@@ -2,6 +2,9 @@ Giraph Change Log
 
 Release 0.2.0 - unreleased
 
+  GIRAPH-159: Case insensitive file/directory name matching will
+  produce errors on M/R jar unpack (bfem via aching).
+
   GIRAPH-166: add '*.patch' to list of files that Apache Rat ignores
   (ekoontz via aching).
 

Modified: incubator/giraph/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/giraph/trunk/pom.xml?rev=1305073&r1=1305072&r2=1305073&view=diff
==============================================================================
--- incubator/giraph/trunk/pom.xml (original)
+++ incubator/giraph/trunk/pom.xml Sun Mar 25 16:25:56 2012
@@ -234,9 +234,8 @@ under the License.
             <phase>compile</phase>
             <!-- append to the packaging phase. -->
             <configuration>
-              <descriptorRefs>
-                <descriptorRef>jar-with-dependencies</descriptorRef>
-              </descriptorRefs>
+              <descriptor>${basedir}/src/main/assembly/compile.xml</descriptor>
+              <outputDirectory>target</outputDirectory>
             </configuration>
             <goals>
               <goal>single</goal>

Added: incubator/giraph/trunk/src/main/assembly/compile.xml
URL: http://svn.apache.org/viewvc/incubator/giraph/trunk/src/main/assembly/compile.xml?rev=1305073&view=auto
==============================================================================
--- incubator/giraph/trunk/src/main/assembly/compile.xml (added)
+++ incubator/giraph/trunk/src/main/assembly/compile.xml Sun Mar 25 16:25:56 2012
@@ -0,0 +1,41 @@
+<!--
+   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">
+  <id>jar-with-dependencies</id>
+   <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>true</useProjectArtifact>
+      <outputDirectory>/</outputDirectory>
+      <unpackOptions>
+        <excludes>
+          <exclude>
+	    META-INF/LICENSE
+          </exclude>
+        </excludes>
+      </unpackOptions>
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>