# 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-883-1 Commit: ccd682536ce6cde4a7e947a1ffc000b50a2c2f63 Parents: 2aa1ace Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Jun 3 16:06:19 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> 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-<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/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 @@ </profile> <profile> + <id>scala-2.10</id> + + <dependencies> + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-scalar_2.10</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.scalatest</groupId> + <artifactId>scalatest_2.10</artifactId> + <version>2.2.2</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + + <profile> <id>java8-examples</id> <activation> 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 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- + POM file. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-parent</artifactId> + <version>1</version> + <relativePath>../../parent</relativePath> + </parent> + + <artifactId>ignite-scalar_2.10</artifactId> + <version>1.1.1-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>2.10.4</version> + </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-spring</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.scalatest</groupId> + <artifactId>scalatest_2.10</artifactId> + <version>2.2.2</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + <executions> + <execution> + <id>scaladoc</id> + <phase>prepare-package</phase> + <goals> + <goal>doc</goal> + </goals> + <configuration> + <doctitle>Ignite Scalar</doctitle> + <windowtitle>Ignite Scalar</windowtitle> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + <dependencies> + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-tools</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>scaladoc-postprocessing</id> + <goals> + <goal>run</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <target> + <copy todir="target/site/scaladocs"> + <fileset dir="../../assembly/docfiles"> + <include name="img/**" /> + <include name="*.js" /> + </fileset> + </copy> + + <taskdef name="doctask" classname="org.apache.ignite.tools.ant.beautifier.GridJavadocAntTask" /> + + <doctask css="dotted" dir="target/site/scaladocs" verify="false"> + <include name="**/*.html" /> + </doctask> + + <property name="footer"> + <![CDATA[ + <table style="padding: 0px 10px 10px 10px; width: 100%" border="0"> + <tr> + <td> + <nobr>Ignite™ - Scalar DSL, ver. <strong>${project.version}</strong></nobr> + <br> + <a target=_blank href="https://incubator.apache.org/projects/ignite.html";><nobr>2015 Copyright © Apache Software Foundation</nobr></a> + </td> + </tr> + </table> + ]]> + </property> + + <replace dir="target/site/scaladocs" token="<!--FOOTER-->" value="${footer}"> + <include name="**/*.html" /> + </replace> + + <replace dir="target/site/scaladocs"> + <replacetoken>src="package.html"</replacetoken> + <replacevalue>src=org/apache/ignite/scalar/scalar$.html</replacevalue> + <include name="**/index.html" /> + </replace> + + <replace dir="target/site/scaladocs"> + <replacetoken>location.replace("package.html")</replacetoken> + <replacevalue>location.replace("org/apache/ignite/scalar/scalar$.html")</replacevalue> + <include name="**/index.js" /> + </replace> + + <replace dir="target/site/scaladocs"> + <replacetoken>docs.scala-lang.org/overviews/scaladoc/usage.html#members</replacetoken> + <replacevalue>docs.scala-lang.org/overviews/scaladoc/interface.html</replacevalue> + <fileset dir="target/site/scaladocs" /> + </replace> + + <replaceregexp byline="true" flags="im" encoding="UTF-8"> + <regexp pattern="(<dt>Attributes</dt><dd>protected\[)<a.+>(.+)</a>(\]\s+</dd>)" /> + <substitution expression="\1\2\3" /> + <fileset dir="target/site/scaladocs" /> + </replaceregexp> + + <zip destfile="target/ignite-scalar-${project.version}-javadoc.jar" basedir="target/site/scaladocs" encoding="UTF-8" /> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> 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 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- + POM file. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-parent</artifactId> + <version>1</version> + <relativePath>../../parent</relativePath> + </parent> + + <artifactId>ignite-spark_2.10</artifactId> + <version>1.1.1-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>2.10.4</version> + </dependency> + + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-core_2.10</artifactId> + <version>1.3.1</version> + </dependency> + + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-sql_2.10</artifactId> + <version>1.3.1</version> + </dependency> + + <!-- Test dependencies --> + + <dependency> + <groupId>org.scalatest</groupId> + <artifactId>scalatest_2.10</artifactId> + <version>2.2.2</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> 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 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>2.10.4</version> + <version>2.11.2</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.10</artifactId> + <artifactId>spark-core_2.11</artifactId> <version>1.3.1</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-sql_2.10</artifactId> + <artifactId>spark-sql_2.11</artifactId> <version>1.3.1</version> </dependency> @@ -70,7 +70,7 @@ <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> + <artifactId>scalatest_2.11</artifactId> <version>2.2.2</version> <scope>test</scope> <exclusions> 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 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- + POM file. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-parent</artifactId> + <version>1</version> + <relativePath>../../parent</relativePath> + </parent> + + <artifactId>ignite-visor-console_2.10</artifactId> + <version>1.1.1-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-ssh</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-spring</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring.version}</version> + </dependency> + + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>2.10.4</version> + </dependency> + + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>jline</artifactId> + <version>2.10.4</version> + </dependency> + <!-- Third party dependencies --> + + <!-- Test dependencies --> + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.scalatest</groupId> + <artifactId>scalatest_2.10</artifactId> + <version>2.2.2</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- Test dependencies --> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + <executions> + <execution> + <id>scaladoc</id> + <phase>prepare-package</phase> + <goals> + <goal>doc</goal> + </goals> + <configuration> + <doctitle>Ignite Console Visor</doctitle> + <windowtitle>Ignite Console Visor</windowtitle> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <id>javadoc-zip</id> + <goals> + <goal>run</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <target> + <zip destfile="target/ignite-visor-console-2.10-${project.version}-javadoc.jar" basedir="target/site/scaladocs" encoding="UTF-8" /> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> 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 @@ <module>modules/tools</module> <module>modules/core</module> <module>modules/hadoop</module> - <module>modules/spark</module> <module>modules/extdata/p2p</module> <module>modules/extdata/uri</module> <module>modules/clients</module> @@ -410,18 +409,34 @@ <id>scala</id> <activation> - <activeByDefault>true</activeByDefault> - <jdk>[1.7,)</jdk> + <property><name>!scala-2.10</name></property> </activation> <modules> <module>modules/scalar</module> + <module>modules/spark</module> <module>modules/visor-console</module> <module>modules/visor-plugins</module> </modules> </profile> <profile> + <id>scala-2.10</id> + + <activation> + <property><name>scala-2.10</name></property> + </activation> + + <modules> + <module>modules/scalar-2.10</module> + <module>modules/spark-2.10</module> + <module>modules/visor-console-2.10</module> + <module>modules/visor-plugins</module> + </modules> + </profile> + + + <profile> <id>lgpl</id> <modules> <module>modules/hibernate</module>
