Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8674318954 for ; Mon, 15 Jun 2015 07:25:22 +0000 (UTC) Received: (qmail 36487 invoked by uid 500); 15 Jun 2015 07:25:22 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 36457 invoked by uid 500); 15 Jun 2015 07:25:22 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 36448 invoked by uid 99); 15 Jun 2015 07:25:22 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Jun 2015 07:25:22 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id F1DFF1A54DC for ; Mon, 15 Jun 2015 07:25:21 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id RJMvMoMGgax0 for ; Mon, 15 Jun 2015 07:25:06 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 7672128021 for ; Mon, 15 Jun 2015 07:24:57 +0000 (UTC) Received: (qmail 32209 invoked by uid 99); 15 Jun 2015 07:24:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Jun 2015 07:24:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 55339E0286; Mon, 15 Jun 2015 07:24:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 15 Jun 2015 07:25:07 -0000 Message-Id: In-Reply-To: <75ae70e5612d4c3f98e72f352c14575f@git.apache.org> References: <75ae70e5612d4c3f98e72f352c14575f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/50] incubator-ignite git commit: # IGNITE-956: Added support for scala-2.10. # IGNITE-956: Added support for scala-2.10. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ccd68253 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ccd68253 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ccd68253 Branch: refs/heads/ignite-sprint-6 Commit: ccd682536ce6cde4a7e947a1ffc000b50a2c2f63 Parents: 2aa1ace Author: AKuznetsov Authored: Wed Jun 3 16:06:19 2015 +0700 Committer: AKuznetsov Committed: Wed Jun 3 16:06:19 2015 +0700 ---------------------------------------------------------------------- DEVNOTES.txt | 6 + examples/pom.xml | 34 ++++++ modules/scalar-2.10/README.txt | 4 + modules/scalar-2.10/pom.xml | 188 +++++++++++++++++++++++++++++ modules/spark-2.10/README.txt | 4 + modules/spark-2.10/pom.xml | 100 +++++++++++++++ modules/spark/pom.xml | 8 +- modules/visor-console-2.10/README.txt | 4 + modules/visor-console-2.10/pom.xml | 156 ++++++++++++++++++++++++ pom.xml | 21 +++- 10 files changed, 518 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/DEVNOTES.txt ---------------------------------------------------------------------- diff --git a/DEVNOTES.txt b/DEVNOTES.txt index 1562dc4..8cc759c 100644 --- a/DEVNOTES.txt +++ b/DEVNOTES.txt @@ -3,9 +3,15 @@ Ignite Fabric Maven Build Instructions Without LGPL dependencies (default): mvn clean package -DskipTests +Without LGPL dependencies and Scala 2.10: + mvn clean package -DskipTests -Dscala-2.10 + With LGPL dependencies: mvn clean package -DskipTests -Prelease,lgpl +With LGPL dependencies and Scala 2.10: + mvn clean package -DskipTests -Prelease,lgpl -Dscala-2.10 + Look for incubator-ignite--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/ccd68253/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 2b2bfeb..960df9c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -173,6 +173,40 @@ + scala-2.10 + + + + org.apache.ignite + ignite-scalar_2.10 + ${project.version} + + + + org.scalatest + scalatest_2.10 + 2.2.2 + test + + + org.scala-lang + scala-library + + + + + + + + + net.alchim31.maven + scala-maven-plugin + + + + + + java8-examples http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/modules/scalar-2.10/README.txt ---------------------------------------------------------------------- diff --git a/modules/scalar-2.10/README.txt b/modules/scalar-2.10/README.txt new file mode 100644 index 0000000..535a193 --- /dev/null +++ b/modules/scalar-2.10/README.txt @@ -0,0 +1,4 @@ +Apache Ignite Scalar Module +--------------------------- + +Apache Ignite Scalar module to be build with Scala 2.10. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/modules/scalar-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml new file mode 100644 index 0000000..b51c1b3 --- /dev/null +++ b/modules/scalar-2.10/pom.xml @@ -0,0 +1,188 @@ + + + + + + + 4.0.0 + + + org.apache.ignite + ignite-parent + 1 + ../../parent + + + ignite-scalar_2.10 + 1.1.1-SNAPSHOT + + + + org.apache.ignite + ignite-core + ${project.version} + + + + org.scala-lang + scala-library + 2.10.4 + + + + org.apache.ignite + ignite-core + ${project.version} + test-jar + test + + + + org.apache.ignite + ignite-spring + ${project.version} + test + + + + org.apache.ignite + ignite-indexing + ${project.version} + test + + + + org.scalatest + scalatest_2.10 + 2.2.2 + test + + + org.scala-lang + scala-library + + + + + + + + + net.alchim31.maven + scala-maven-plugin + + + scaladoc + prepare-package + + doc + + + Ignite Scalar + Ignite Scalar + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + org.apache.ignite + ignite-tools + ${project.version} + + + + + scaladoc-postprocessing + + run + + prepare-package + + + + + + + + + + + + + + + + + + + + Ignite™ - Scalar DSL, ver. ${project.version} +
+ 2015 Copyright © Apache Software Foundation + + + + ]]> + + + + + + + + src="package.html" + src=org/apache/ignite/scalar/scalar$.html + + + + + location.replace("package.html") + location.replace("org/apache/ignite/scalar/scalar$.html") + + + + + docs.scala-lang.org/overviews/scaladoc/usage.html#members + docs.scala-lang.org/overviews/scaladoc/interface.html + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/modules/spark-2.10/README.txt ---------------------------------------------------------------------- diff --git a/modules/spark-2.10/README.txt b/modules/spark-2.10/README.txt new file mode 100644 index 0000000..29d3930 --- /dev/null +++ b/modules/spark-2.10/README.txt @@ -0,0 +1,4 @@ +Apache Ignite Spark Module +--------------------------- + +Apache Ignite Spark module to be build with Scala 2.10. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/modules/spark-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spark-2.10/pom.xml b/modules/spark-2.10/pom.xml new file mode 100644 index 0000000..75d265d --- /dev/null +++ b/modules/spark-2.10/pom.xml @@ -0,0 +1,100 @@ + + + + + + + 4.0.0 + + + org.apache.ignite + ignite-parent + 1 + ../../parent + + + ignite-spark_2.10 + 1.1.1-SNAPSHOT + + + + org.apache.ignite + ignite-core + ${project.version} + + + + org.apache.ignite + ignite-core + ${project.version} + test-jar + test + + + + org.scala-lang + scala-library + 2.10.4 + + + + org.apache.spark + spark-core_2.10 + 1.3.1 + + + + org.apache.spark + spark-sql_2.10 + 1.3.1 + + + + + + org.scalatest + scalatest_2.10 + 2.2.2 + test + + + org.scala-lang + scala-library + + + + + + org.apache.ignite + ignite-indexing + ${project.version} + test + + + + + + + net.alchim31.maven + scala-maven-plugin + + + + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/modules/spark/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml index a4a25f5..c22a52b 100644 --- a/modules/spark/pom.xml +++ b/modules/spark/pom.xml @@ -51,18 +51,18 @@ org.scala-lang scala-library - 2.10.4 + 2.11.2 org.apache.spark - spark-core_2.10 + spark-core_2.11 1.3.1 org.apache.spark - spark-sql_2.10 + spark-sql_2.11 1.3.1 @@ -70,7 +70,7 @@ org.scalatest - scalatest_2.10 + scalatest_2.11 2.2.2 test http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/modules/visor-console-2.10/README.txt ---------------------------------------------------------------------- diff --git a/modules/visor-console-2.10/README.txt b/modules/visor-console-2.10/README.txt new file mode 100644 index 0000000..1a018b9 --- /dev/null +++ b/modules/visor-console-2.10/README.txt @@ -0,0 +1,4 @@ +Apache Ignite Visor Console Module +--------------------------- + +Apache Ignite Visor Console module to be build with Scala 2.10. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/modules/visor-console-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/modules/visor-console-2.10/pom.xml b/modules/visor-console-2.10/pom.xml new file mode 100644 index 0000000..3df3287 --- /dev/null +++ b/modules/visor-console-2.10/pom.xml @@ -0,0 +1,156 @@ + + + + + + + 4.0.0 + + + org.apache.ignite + ignite-parent + 1 + ../../parent + + + ignite-visor-console_2.10 + 1.1.1-SNAPSHOT + + + + org.apache.ignite + ignite-core + ${project.version} + + + + org.apache.ignite + ignite-ssh + ${project.version} + + + + org.apache.ignite + ignite-spring + ${project.version} + + + + org.springframework + spring-core + ${spring.version} + + + + org.springframework + spring-beans + ${spring.version} + + + + org.springframework + spring-context + ${spring.version} + + + + org.springframework + spring-expression + ${spring.version} + + + + org.scala-lang + scala-library + 2.10.4 + + + + org.scala-lang + jline + 2.10.4 + + + + + + org.apache.ignite + ignite-indexing + ${project.version} + test + + + + org.scalatest + scalatest_2.10 + 2.2.2 + test + + + org.scala-lang + scala-library + + + + + + + + + + net.alchim31.maven + scala-maven-plugin + + + scaladoc + prepare-package + + doc + + + Ignite Console Visor + Ignite Console Visor + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + javadoc-zip + + run + + prepare-package + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ccd68253/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 54c1e1b..b74476f 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,6 @@ modules/tools modules/core modules/hadoop - modules/spark modules/extdata/p2p modules/extdata/uri modules/clients @@ -410,18 +409,34 @@ scala - true - [1.7,) + !scala-2.10 modules/scalar + modules/spark modules/visor-console modules/visor-plugins + scala-2.10 + + + scala-2.10 + + + + modules/scalar-2.10 + modules/spark-2.10 + modules/visor-console-2.10 + modules/visor-plugins + + + + + lgpl modules/hibernate