Apply patch for GORA-18: Configuration not found error breaks the bui…

…ld on trunk. git-svn-id: https://svn.apache.org/repos/asf/incubator/gora/trunk@1169729 13f79535-47bb-0310-9956-ffa450edef68
danielfagerstrom · Sep 12, 2011 · 7fc5067 · 7fc5067
1 parent 189b92e
commit 7fc5067
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,6 +2,8 @@ Gora Change Log
 
 Trunk (unreleased changes):
 
+* GORA-18. Configuration not found error breaks the build on trunk (ioannis via mattmann)
+
 * GORA-26. Configurable classes should pass around Configuration consistently (ab via mattmann)
 
 * GORA-32. Map type with long values generates non-compilable Java class (Yves Langisch)

diff --git a/gora-core/ivy/ivy.xml b/gora-core/ivy/ivy.xml
@@ -35,7 +35,7 @@
 
     <dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="*->default"/>
     <dependency org="commons-lang" name="commons-lang" conf="*->default" rev="2.5"/>
-    <dependency org="log4j" name="log4j" rev="1.2.15" conf="*->master"/>
+    <dependency org="log4j" name="log4j" rev="1.2.15" conf="*->default"/>   
 
     <dependency org="org.apache.hadoop" name="hadoop-core" rev="0.20.2" conf="*->default">
       <exclude org="hsqldb" name="hsqldb"/>