incubator-gora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mattm...@apache.org
Subject svn commit: r1167670 - in /incubator/gora/branches/0.1.1-incubating: bin/gora build-common.xml gora-cassandra/ivy/ivy.xml gora-core/ivy/ivy.xml gora-hbase/ivy/ivy.xml gora-sql/ivy/ivy.xml gora-tutorial/ivy/ivy.xml
Date Sun, 11 Sep 2011 05:06:57 GMT
Author: mattmann
Date: Sun Sep 11 05:06:57 2011
New Revision: 1167670

URL: http://svn.apache.org/viewvc?rev=1167670&view=rev
Log:
- bring branch Ivy files in line with Eclipse (still works from the command line).

Modified:
    incubator/gora/branches/0.1.1-incubating/bin/gora
    incubator/gora/branches/0.1.1-incubating/build-common.xml
    incubator/gora/branches/0.1.1-incubating/gora-cassandra/ivy/ivy.xml
    incubator/gora/branches/0.1.1-incubating/gora-core/ivy/ivy.xml
    incubator/gora/branches/0.1.1-incubating/gora-hbase/ivy/ivy.xml
    incubator/gora/branches/0.1.1-incubating/gora-sql/ivy/ivy.xml
    incubator/gora/branches/0.1.1-incubating/gora-tutorial/ivy/ivy.xml

Modified: incubator/gora/branches/0.1.1-incubating/build-common.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/build-common.xml?rev=1167670&r1=1167669&r2=1167670&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/build-common.xml (original)
+++ incubator/gora/branches/0.1.1-incubating/build-common.xml Sun Sep 11 05:06:57 2011
@@ -20,7 +20,7 @@
 <project name="gora-common" xmlns:ivy="antlib:org.apache.ivy.ant">
 
   <property name="name" value="${ant.project.name}" />
-  <property name="version" value="0.1-incubating" />
+  <property name="version" value="0.1.1-incubating" />
   <property name="final.name" value="${ant.project.name}-${version}" />
   <property name="year" value="2010" />
   <property name="module.version.target" value="${version}" />

Modified: incubator/gora/branches/0.1.1-incubating/gora-cassandra/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-cassandra/ivy/ivy.xml?rev=1167670&r1=1167669&r2=1167670&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-cassandra/ivy/ivy.xml (original)
+++ incubator/gora/branches/0.1.1-incubating/gora-cassandra/ivy/ivy.xml Sun Sep 11 05:06:57
2011
@@ -24,7 +24,7 @@
       status="integration"/>
 
   <configurations>
-    <include file="${project.dir}/ivy/ivy-configurations.xml"/>
+    <include file="../../ivy/ivy-configurations.xml"/>
   </configurations>
   
   <publications>
@@ -34,7 +34,7 @@
 
   <dependencies>
     <!-- conf="*->@" means every conf is mapped to the conf of the same name of the
artifact-->
-    <dependency org="org.apache.gora" name="gora-core" rev="latest.integration" changing="true"
conf="*->@"/> 
+    <dependency org="org.apache.gora" name="gora-core" rev="0.1.1-incubating" conf="*->*"/>

     <dependency org="org.jdom" name="jdom" rev="1.1" conf="*->master"/>
 
     <dependency org="org.slf4j" name="slf4j-jdk14" rev="1.5.8" conf="*->master"/>

Modified: incubator/gora/branches/0.1.1-incubating/gora-core/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-core/ivy/ivy.xml?rev=1167670&r1=1167669&r2=1167670&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-core/ivy/ivy.xml (original)
+++ incubator/gora/branches/0.1.1-incubating/gora-core/ivy/ivy.xml Sun Sep 11 05:06:57 2011
@@ -23,7 +23,7 @@
       status="integration"/>
 
   <configurations>
-    <include file="${project.dir}/ivy/ivy-configurations.xml"/>
+    <include file="../../ivy/ivy-configurations.xml"/>
   </configurations>
 
   <publications defaultconf="compile">

Modified: incubator/gora/branches/0.1.1-incubating/gora-hbase/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-hbase/ivy/ivy.xml?rev=1167670&r1=1167669&r2=1167670&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-hbase/ivy/ivy.xml (original)
+++ incubator/gora/branches/0.1.1-incubating/gora-hbase/ivy/ivy.xml Sun Sep 11 05:06:57 2011
@@ -24,7 +24,7 @@
       status="integration"/>
 
   <configurations>
-    <include file="${project.dir}/ivy/ivy-configurations.xml"/>
+    <include file="../..//ivy/ivy-configurations.xml"/>
   </configurations>
   
   <publications>
@@ -34,7 +34,7 @@
 
   <dependencies>
     <!-- conf="*->@" means every conf is mapped to the conf of the same name of the
artifact-->
-    <dependency org="org.apache.gora" name="gora-core" rev="latest.integration" changing="true"
conf="*->@"/> 
+    <dependency org="org.apache.gora" name="gora-core" rev="0.1.1-incubating" conf="*->*"/>

     <dependency org="org.jdom" name="jdom" rev="1.1" conf="*->master"/>
 
     <!-- test dependencies -->

Modified: incubator/gora/branches/0.1.1-incubating/gora-sql/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-sql/ivy/ivy.xml?rev=1167670&r1=1167669&r2=1167670&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-sql/ivy/ivy.xml (original)
+++ incubator/gora/branches/0.1.1-incubating/gora-sql/ivy/ivy.xml Sun Sep 11 05:06:57 2011
@@ -23,7 +23,7 @@
       status="integration"/>
 
   <configurations>
-    <include file="${project.dir}/ivy/ivy-configurations.xml"/>
+    <include file="../../ivy/ivy-configurations.xml"/>
   </configurations>
   
   <publications>
@@ -33,12 +33,12 @@
 
   <dependencies>
     <!-- conf="*->@" means every conf is mapped to the conf of the same name of the
artifact-->
-    <dependency org="org.apache.gora" name="gora-core" rev="latest.integration" changing="true"
conf="*->@"/> 
+    <dependency org="org.apache.gora" name="gora-core" rev="0.1.1-incubating" conf="*->*"/>

     <dependency org="org.jdom" name="jdom" rev="1.1" conf="*->master"/>
     <dependency org="com.healthmarketscience.sqlbuilder" name="sqlbuilder" rev="2.0.6"
conf="*->default"/>
 
     <!-- test dependencies -->
-    <dependency org="org.hsqldb" name="hsqldb" rev="2.0.0" conf="test->default"/>
+    <dependency org="org.hsqldb" name="hsqldb" rev="2.2.4" conf="test->default"/>
 
   </dependencies>
     

Modified: incubator/gora/branches/0.1.1-incubating/gora-tutorial/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-tutorial/ivy/ivy.xml?rev=1167670&r1=1167669&r2=1167670&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-tutorial/ivy/ivy.xml (original)
+++ incubator/gora/branches/0.1.1-incubating/gora-tutorial/ivy/ivy.xml Sun Sep 11 05:06:57
2011
@@ -23,16 +23,16 @@
       status="integration"/>
 
   <configurations>
-    <include file="${project.dir}/ivy/ivy-configurations.xml"/>
+    <include file="../../ivy/ivy-configurations.xml"/>
   </configurations>
 
   <publications defaultconf="compile">
     <artifact name="gora-tutorial" conf="compile"/>
   </publications>
-
+ 
   <dependencies>
-    <dependency org="org.apache.gora" name="gora-hbase" rev="latest.integration" changing="true"
conf="*->@"/>
-    <dependency org="org.apache.gora" name="gora-sql" rev="latest.integration" changing="true"
conf="*->@"/>
+    <dependency org="org.apache.gora" name="gora-hbase" rev="0.1.1-incubating" conf="*->*"/>
+    <dependency org="org.apache.gora" name="gora-sql" rev="0.1.1-incubating" conf="*->*"/>
     
     <!-- Uncomment below if you are using MySQL -->
     <!-- <dependency org="mysql" name="mysql-connector-java" rev="5.1.13" conf="*->default"/>
-->



Mime
View raw message