ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [08/50] incubator-ignite git commit: # IGNITE-956: Added support for scala-2.10.
Date Thu, 11 Jun 2015 07:20:32 GMT
# 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/bae1804e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bae1804e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bae1804e

Branch: refs/heads/ignite-998
Commit: bae1804ece3eb677c7f3e2c01c8566486af83c7d
Parents: ccd6825
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Wed Jun 3 16:29:06 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Wed Jun 3 16:29:06 2015 +0700

----------------------------------------------------------------------
 modules/scalar-2.10/pom.xml        | 202 ++++++++++++++++----------------
 modules/spark-2.10/pom.xml         |  18 +++
 modules/visor-console-2.10/pom.xml |  96 +++++++++------
 3 files changed, 176 insertions(+), 140 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bae1804e/modules/scalar-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml
index b51c1b3..23eb13e 100644
--- a/modules/scalar-2.10/pom.xml
+++ b/modules/scalar-2.10/pom.xml
@@ -83,106 +83,106 @@
     </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&#153; - Scalar DSL,
ver. <strong>${project.version}</strong></nobr>
-                                                <br>
-                                                <a target=_blank href="https://incubator.apache.org/projects/ignite.html"><nobr>2015
Copyright &#169; Apache Software Foundation</nobr></a>
-                                            </td>
-                                        </tr>
-                                        </table>
-                                    ]]>
-                                </property>
-
-                                <replace dir="target/site/scaladocs" token="&lt;!--FOOTER--&gt;"
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="(&lt;dt&gt;Attributes&lt;/dt&gt;&lt;dd&gt;protected\[)&lt;a.+&gt;(.+)&lt;/a&gt;(\]\s+&lt;/dd&gt;)"
/>
-                                    <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>
+        <resources>
+            <resource>
+                <directory>../scalar/src/main/scala</directory>
+                <excludes>
+                    <exclude>**/*.scala</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
+        <testResources>
+            <testResource>
+                <directory>../scalar/src/test/scala</directory>
+                <excludes>
+                    <exclude>**/*.scala</exclude>
+                </excludes>
+            </testResource>
+        </testResources>
+
+        <!-- TODO IGNITE-956 FIX scaladocs plugins-->
+            <!--<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&#153; - Scalar
DSL, ver. <strong>${project.version}</strong></nobr>-->
+                                                <!--<br>-->
+                                                <!--<a target=_blank href="https://incubator.apache.org/projects/ignite.html"><nobr>2015
Copyright &#169; Apache Software Foundation</nobr></a>-->
+                                            <!--</td>-->
+                                        <!--</tr>-->
+                                        <!--</table>-->
+                                    <!--]]>-->
+                                <!--</property>-->
+
+                                <!--<replace dir="target/site/scaladocs" token="&lt;!&#45;&#45;FOOTER&#45;&#45;&gt;"
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="(&lt;dt&gt;Attributes&lt;/dt&gt;&lt;dd&gt;protected\[)&lt;a.+&gt;(.+)&lt;/a&gt;(\]\s+&lt;/dd&gt;)"
/>-->
+                                    <!--<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/bae1804e/modules/spark-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spark-2.10/pom.xml b/modules/spark-2.10/pom.xml
index 75d265d..2cf0af5 100644
--- a/modules/spark-2.10/pom.xml
+++ b/modules/spark-2.10/pom.xml
@@ -90,6 +90,24 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>../spark/src/main/scala</directory>
+                <excludes>
+                    <exclude>**/*.scala</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
+        <testResources>
+            <testResource>
+                <directory>../spark/src/test/scala</directory>
+                <excludes>
+                    <exclude>**/*.scala</exclude>
+                </excludes>
+            </testResource>
+        </testResources>
+
         <plugins>
             <plugin>
                 <groupId>net.alchim31.maven</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bae1804e/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
index 3df3287..f0df657 100644
--- a/modules/visor-console-2.10/pom.xml
+++ b/modules/visor-console-2.10/pom.xml
@@ -113,44 +113,62 @@
     </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>
+        <resources>
+            <resource>
+                <directory>../visor-console/src/main/scala</directory>
+                <excludes>
+                    <exclude>**/*.scala</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
+        <testResources>
+            <testResource>
+                <directory>../visor-console/src/test/scala</directory>
+                <excludes>
+                    <exclude>**/*.scala</exclude>
+                </excludes>
+            </testResource>
+        </testResources>
+
+        <!-- TODO IGNITE-956 FIX scaladocs 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-${project.version}-javadoc.jar"
basedir="target/site/scaladocs" encoding="UTF-8" />-->
+                             <!--</target>-->
+                         <!--</configuration>-->
+                     <!--</execution>-->
+                 <!--</executions>-->
+             <!--</plugin>-->
+        <!--/plugins-->
     </build>
 </project>


Mime
View raw message