Merge branch 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-3
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fb400f0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fb400f0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fb400f0b
Branch: refs/heads/ignite-611
Commit: fb400f0b837d166f50723cf50460361d19d44e64
Parents: 5657b41 5fc2cd0
Author: Valentin Kulichenko <vkuliche...@gridgain.com>
Authored: Sun Mar 29 23:39:43 2015 -0700
Committer: Valentin Kulichenko <vkuliche...@gridgain.com>
Committed: Sun Mar 29 23:39:43 2015 -0700
----------------------------------------------------------------------
DEVNOTES.txt | 15 +++++----------
RELEASE_NOTES.txt | 20 +++++++++++++++++++-
modules/geospatial/README.txt | 15 +++++++++++++++
modules/hibernate/README.txt | 15 +++++++++++++++
modules/schedule/README.txt | 15 +++++++++++++++
pom.xml | 23 ++++++++++++++++++++---
6 files changed, 89 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb400f0b/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 89d74a1,74cb5ea..b4a61ce
--- a/pom.xml
+++ b/pom.xml
@@@ -49,9 -123,8 +49,12 @@@
<module>modules/extdata/p2p</module>
<module>modules/extdata/uri</module>
<module>modules/clients</module>
++<<<<<<< HEAD
+ <module>examples</module>
++=======
+ <module>modules/tools</module>
++>>>>>>> 5fc2cd053467e65872f796e11e3edd2e6017d80d
<module>modules/spring</module>
- <module>modules/hibernate</module>
<module>modules/web</module>
<module>modules/aop</module>
<module>modules/urideploy</module>
@@@ -422,24 -1360,40 +423,40 @@@
</profile>
<profile>
- <id>java8</id>
+ <id>benchmarks</id>
+ <modules>
+ <module>modules/yardstick</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>scala</id>
+
<activation>
- <jdk>[1.8,)</jdk>
+ <activeByDefault>true</activeByDefault>
</activation>
- <properties>
- <javadoc.opts>-Xdoclint:none</javadoc.opts>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
+ <modules>
+ <module>modules/scalar</module>
+ <module>modules/visor-console</module>
+ <module>modules/visor-plugins</module>
+ </modules>
</profile>
+
+ <profile>
+ <id>lgpl</id>
+ <modules>
+ <module>modules/hibernate</module>
+ <module>modules/geospatial</module>
+ <module>modules/schedule</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>examples</id>
+ <modules>
+ <module>examples</module>
+ </modules>
+ </profile>
</profiles>
</project>
