Author: asavu
Date: Thu Dec 8 14:07:56 2011
New Revision: 1211895
URL: http://svn.apache.org/viewvc?rev=1211895&view=rev
Log:
WHIRR-442. Release 0.6.0 is in breach of the AL2.0 and general Apache rules in
regards to the inclusion of Voldemort (Tom White via asavu)
Removed:
whirr/trunk/services/cassandra/lib/
whirr/trunk/services/hadoop/lib/
whirr/trunk/services/voldemort/lib/linkedin-voldemort-0.90.RC3.jar
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/build-tools/src/assemble-src.xml
whirr/trunk/cli/pom.xml
whirr/trunk/pom.xml
whirr/trunk/services/cassandra/pom.xml
whirr/trunk/services/hadoop/pom.xml
whirr/trunk/services/voldemort/lib/ (props changed)
Modified: whirr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1211895&r1=1211894&r2=1211895&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Thu Dec 8 14:07:56 2011
@@ -91,6 +91,9 @@ Trunk (unreleased changes)
WHIRR-403. Add Trademark Attributions (Tom White via asavu)
+ WHIRR-442. Release 0.6.0 is in breach of the AL2.0 and general
+ Apache rules in regards to the inclusion of Voldemort (Tom White via asavu)
+
BUG FIXES
WHIRR-377. Fix broken CLI logging config. (asavu via tomwhite)
Modified: whirr/trunk/build-tools/src/assemble-src.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/build-tools/src/assemble-src.xml?rev=1211895&r1=1211894&r2=1211895&view=diff
==============================================================================
--- whirr/trunk/build-tools/src/assemble-src.xml (original)
+++ whirr/trunk/build-tools/src/assemble-src.xml Thu Dec 8 14:07:56 2011
@@ -37,6 +37,7 @@
<exclude>**/*.rej</exclude>
<exclude>**/*.classpath</exclude>
<exclude>**/whirr-logo.ai</exclude>
+ <exclude>services/voldemort/lib/*.jar</exclude>
</excludes>
</fileSet>
</fileSets>
Modified: whirr/trunk/cli/pom.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/cli/pom.xml?rev=1211895&r1=1211894&r2=1211895&view=diff
==============================================================================
--- whirr/trunk/cli/pom.xml (original)
+++ whirr/trunk/cli/pom.xml Thu Dec 8 14:07:56 2011
@@ -31,11 +31,6 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>whirr-voldemort</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>whirr-core</artifactId>
<version>${project.version}</version>
</dependency>
@@ -159,4 +154,16 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>voldemort</id>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>whirr-voldemort</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: whirr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/pom.xml?rev=1211895&r1=1211894&r2=1211895&view=diff
==============================================================================
--- whirr/trunk/pom.xml (original)
+++ whirr/trunk/pom.xml Thu Dec 8 14:07:56 2011
@@ -46,7 +46,6 @@
<module>services/hadoop</module>
<module>services/zookeeper</module>
<module>services/hbase</module>
- <module>services/voldemort</module>
<module>services/elasticsearch</module>
<module>services/hama</module>
<module>services/puppet</module>
@@ -372,8 +371,11 @@
<exclude>docs/**</exclude>
<exclude>**/*.log*</exclude>
<exclude>.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/target/**</exclude>
<exclude>src/site/resources/images/whirr-logo.ai</exclude> <!--
binary -->
</excludes>
</configuration>
@@ -550,5 +552,15 @@
</plugins>
</build>
</profile>
+ <profile>
+ <!-- Activate this profile to build the Voldemort service after manually
+ placing the Voldemort JAR in services/voldemort/lib.
+ See https://issues.apache.org/jira/browse/WHIRR-442
+ -->
+ <id>voldemort</id>
+ <modules>
+ <module>services/voldemort</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: whirr/trunk/services/cassandra/pom.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cassandra/pom.xml?rev=1211895&r1=1211894&r2=1211895&view=diff
==============================================================================
--- whirr/trunk/services/cassandra/pom.xml (original)
+++ whirr/trunk/services/cassandra/pom.xml Thu Dec 8 14:07:56 2011
@@ -62,20 +62,15 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
- <!-- replace these with just a cassandra entry once it is in a maven repo
-->
<dependency>
- <groupId>apache</groupId>
- <artifactId>cassandra</artifactId>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-all</artifactId>
<version>0.7.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/apache-cassandra-0.7.0.jar</systemPath>
</dependency>
<dependency>
- <groupId>apache</groupId>
- <artifactId>thrift</artifactId>
- <version>0.5</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/libthrift-0.5.jar</systemPath>
+ <groupId>org.apache.cassandra.deps</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.5.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: whirr/trunk/services/hadoop/pom.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/hadoop/pom.xml?rev=1211895&r1=1211894&r2=1211895&view=diff
==============================================================================
--- whirr/trunk/services/hadoop/pom.xml (original)
+++ whirr/trunk/services/hadoop/pom.xml Thu Dec 8 14:07:56 2011
@@ -29,7 +29,7 @@
<version>0.7.0-SNAPSHOT</version>
<name>Apache Whirr Hadoop</name>
<properties>
- <hadoop.version>0.20.2</hadoop.version>
+ <hadoop.version>0.20.205.0</hadoop.version>
</properties>
<dependencies>
<dependency>
@@ -97,9 +97,8 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
- <version>0.20.3-SNAPSHOT</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/hadoop-test-0.20.3-SNAPSHOT.jar</systemPath>
+ <version>${hadoop.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
Propchange: whirr/trunk/services/voldemort/lib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 8 14:07:56 2011
@@ -0,0 +1 @@
+linkedin-voldemort-0.90.RC3.jar
