Skip to content
This repository has been archived by the owner on Nov 20, 2019. It is now read-only.

Commit

Permalink
Merge pull request #268 from miguel0afd/PreparationRC2
Browse files Browse the repository at this point in the history
Preparation for 1.0.0-RC2
  • Loading branch information
mafernandez-stratio committed Dec 22, 2015
2 parents 1037c17 + 15cf51d commit 8fcd5e4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
</parent>

<artifactId>crossdata-examples</artifactId>
<version>1.0.0-RC2-SNAPSHOT</version>
<version>1.0.0-RC2</version>
<packaging>jar</packaging>
<name>Examples</name>
<description>Examples using Crossdata with MongoDB and Cassandra</description>
<url>http://stratio.github.io/crossdata/</url>

<properties>
<crossdata.version>1.0.0-RC2-SNAPSHOT</crossdata.version>
<crossdata.version>1.0.0-RC2</crossdata.version>
<mongodb.provider.version>0.9.2</mongodb.provider.version>
<casbah.version>2.8.0</casbah.version>
<scala.binary.version>2.10</scala.binary.version>
Expand Down
8 changes: 4 additions & 4 deletions scripts/stratio-xd-shell
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ function usage {

export SPARK_HOME="$(pwd)"

xdjars="$SPARK_HOME/lib/crossdata-core-1.0.0-RC2-SNAPSHOT-jar-with-dependencies.jar"
MONGODB_LIB="$SPARK_HOME/lib/crossdata-mongodb-1.0.0-RC2-SNAPSHOT-jar-with-dependencies.jar"
CASSANDRA_LIB="$SPARK_HOME/lib/crossdata-cassandra-1.0.0-RC2-SNAPSHOT-jar-with-dependencies.jar"
ELASTICSEARCH_LIB="$SPARK_HOME/lib/crossdata-elasticsearch-1.0.0-RC2-SNAPSHOT-jar-with-dependencies.jar"
xdjars="$SPARK_HOME/lib/crossdata-core-1.0.0-RC2-jar-with-dependencies.jar"
MONGODB_LIB="$SPARK_HOME/lib/crossdata-mongodb-1.0.0-RC2-jar-with-dependencies.jar"
CASSANDRA_LIB="$SPARK_HOME/lib/crossdata-cassandra-1.0.0-RC2-jar-with-dependencies.jar"
ELASTICSEARCH_LIB="$SPARK_HOME/lib/crossdata-elasticsearch-1.0.0-RC2-jar-with-dependencies.jar"


# Keep all the arguments, then remove the XD specific ones and only keep the Spark arguments.
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/resources/server-reference.conf
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ crossdata-server.config.spark.driver.memory = 512M
crossdata-server.config.spark.executor.memory = 512M
crossdata-server.config.spark.cores.max = 4
crossdata-server.config.spark.akka.heartbeat.interval = 5000
crossdata-server.config.spark.jars = "server/target/crossdata-server-1.0.0-RC2-SNAPSHOT.jar"
crossdata-server.config.spark.jars = "server/target/crossdata-server-1.0.0-RC2.jar"

################################
# #
Expand Down
2 changes: 1 addition & 1 deletion testsAT/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
<stratio-test-bdd.version>0.2.0-SNAPSHOT</stratio-test-bdd.version>
<crossdata.version>1.0.0-RC2-SNAPSHOT</crossdata.version>
<crossdata.version>1.0.0-RC2</crossdata.version>
<assertj-core.version>1.7.0</assertj-core.version>
</properties>
<groupId>com.stratio.crossdata</groupId>
Expand Down

0 comments on commit 8fcd5e4

Please sign in to comment.