You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by hs...@apache.org on 2011/03/02 05:39:32 UTC
svn commit: r1076103 - in /incubator/gora/branches/0.1-incubating: ./
CHANGES.txt gora-core/ivy/ivy.xml
gora-core/src/test/java/org/apache/gora/memory/ gora-hbase/build.xml
Author: hsaputra
Date: Wed Mar 2 04:39:32 2011
New Revision: 1076103
URL: http://svn.apache.org/viewvc?rev=1076103&view=rev
Log:
Merge from trunk to fix test error and missing dependency.
Update CHANGES.txt to list 0.1-incubating release changes.
Removed:
incubator/gora/branches/0.1-incubating/gora-core/src/test/java/org/apache/gora/memory/
Modified:
incubator/gora/branches/0.1-incubating/ (props changed)
incubator/gora/branches/0.1-incubating/CHANGES.txt
incubator/gora/branches/0.1-incubating/gora-core/ivy/ivy.xml
incubator/gora/branches/0.1-incubating/gora-hbase/build.xml
Propchange: incubator/gora/branches/0.1-incubating/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 2 04:39:32 2011
@@ -1 +1 @@
-/incubator/gora/trunk:1064028-1065931
+/incubator/gora/trunk:1064028-1075167
Modified: incubator/gora/branches/0.1-incubating/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1-incubating/CHANGES.txt?rev=1076103&r1=1076102&r2=1076103&view=diff
==============================================================================
--- incubator/gora/branches/0.1-incubating/CHANGES.txt (original)
+++ incubator/gora/branches/0.1-incubating/CHANGES.txt Wed Mar 2 04:39:32 2011
@@ -1,6 +1,6 @@
Gora Change Log
-Trunk (unreleased changes)
+0.1-incubating release:
* INFRA-3038. Initial import of code.
Modified: incubator/gora/branches/0.1-incubating/gora-core/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1-incubating/gora-core/ivy/ivy.xml?rev=1076103&r1=1076102&r2=1076103&view=diff
==============================================================================
--- incubator/gora/branches/0.1-incubating/gora-core/ivy/ivy.xml (original)
+++ incubator/gora/branches/0.1-incubating/gora-core/ivy/ivy.xml Wed Mar 2 04:39:32 2011
@@ -50,6 +50,7 @@
<!-- test dependencies -->
<dependency org="org.apache.hadoop" name="hadoop-test" rev="0.20.2" conf="test->master"/>
+ <dependency org="org.slf4j" name="slf4j-simple" rev="1.5.8" conf="test -> *,!sources,!javadoc"/>
<dependency org="junit" name="junit" rev="4.6" conf="test->default"/>
</dependencies>
Modified: incubator/gora/branches/0.1-incubating/gora-hbase/build.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1-incubating/gora-hbase/build.xml?rev=1076103&r1=1076102&r2=1076103&view=diff
==============================================================================
--- incubator/gora/branches/0.1-incubating/gora-hbase/build.xml (original)
+++ incubator/gora/branches/0.1-incubating/gora-hbase/build.xml Wed Mar 2 04:39:32 2011
@@ -21,4 +21,7 @@
<property name="project.dir" value="${basedir}/.."/>
<import file="${project.dir}/build-common.xml"/>
+
+ <!-- do nothing for now as the tests need fixing -->
+ <target name="test" depends="compile-test" description="Run core unit tests"/>
</project>