Repository: incubator-ignite Updated Branches: refs/heads/ignite-956 [created] bb796512e
# IGNITW-956: WIP. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bb796512 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bb796512 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bb796512 Branch: refs/heads/ignite-956 Commit: bb796512e1902dadd2e7ef240326e2ebbd5668bb Parents: c232631 Author: AKuznetsov <[email protected]> Authored: Mon Jun 1 18:55:30 2015 +0700 Committer: AKuznetsov <[email protected]> Committed: Mon Jun 1 18:55:30 2015 +0700 ---------------------------------------------------------------------- DEVNOTES.txt | 6 ++++++ examples/pom.xml | 4 ++-- modules/scalar/pom.xml | 8 ++++---- modules/visor-console/pom.xml | 8 ++++---- parent/pom.xml | 1 + pom.xml | 7 +++++++ 6 files changed, 24 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb796512/DEVNOTES.txt ---------------------------------------------------------------------- diff --git a/DEVNOTES.txt b/DEVNOTES.txt index 1562dc4..45a59ab 100644 --- a/DEVNOTES.txt +++ b/DEVNOTES.txt @@ -3,9 +3,15 @@ Ignite Fabric Maven Build Instructions Without LGPL dependencies (default): mvn clean package -DskipTests +With Scala 2.11: + mvn clean package -DskipTests -Prelease,scala-2.11 + With LGPL dependencies: mvn clean package -DskipTests -Prelease,lgpl +With LGPL and Scala 2.11: + mvn clean package -DskipTests -Prelease,lgpl,scala-2.11 + Look for incubator-ignite-<version>-bin.zip in ./target/bin directory. NOTE: JDK version should be 1.7.0-* or >= 1.8.0-u40. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb796512/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 78c5852..a8b6b29 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -150,8 +150,8 @@ <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.11</artifactId> - <version>2.2.2</version> + <artifactId>scalatest_${scala.binary.version}</artifactId> + <version>2.2.4</version> <scope>test</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb796512/modules/scalar/pom.xml ---------------------------------------------------------------------- diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml index d3fcf2e..a9a6638 100644 --- a/modules/scalar/pom.xml +++ b/modules/scalar/pom.xml @@ -30,7 +30,7 @@ <relativePath>../../parent</relativePath> </parent> - <artifactId>ignite-scalar</artifactId> + <artifactId>ignite-scalar_2.10</artifactId> <version>1.2.0-SNAPSHOT</version> <dependencies> @@ -43,7 +43,7 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>2.11.2</version> + <version>2.10.5</version> </dependency> <dependency> @@ -70,8 +70,8 @@ <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.11</artifactId> - <version>2.2.2</version> + <artifactId>scalatest_2.10</artifactId> + <version>2.2.4</version> <scope>test</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb796512/modules/visor-console/pom.xml ---------------------------------------------------------------------- diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml index 8e71970..579ee47 100644 --- a/modules/visor-console/pom.xml +++ b/modules/visor-console/pom.xml @@ -79,13 +79,13 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>2.11.2</version> + <version>${scala.version}</version> </dependency> <dependency> <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>2.12.1</version> + <artifactId>${scala.jline.groupid}</artifactId> + <version>${scala.jline.version}</version> </dependency> <!-- Third party dependencies --> @@ -99,7 +99,7 @@ <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.11</artifactId> + <artifactId>scalatest_2.10</artifactId> <version>2.2.4</version> <scope>test</scope> <exclusions> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb796512/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index a514e35..25e6b0c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -41,6 +41,7 @@ <maven.build.timestamp.format>MMMM d yyyy</maven.build.timestamp.format> <doxygen.exec>doxygen</doxygen.exec> <git.exec>git</git.exec> + <scala.version>scala-2.10</scala.version> </properties> <groupId>org.apache.ignite</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb796512/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6f8524f..ca89910 100644 --- a/pom.xml +++ b/pom.xml @@ -420,6 +420,13 @@ </modules> </profile> + <!--<profile>--> + <!--<id>scala-2.11</id>--> + <!--<properties>--> + <!--<scala.version>2.11</scala.version>--> + <!--</properties>--> + <!--</profile>--> + <profile> <id>lgpl</id> <modules>
