Merge branches 'ignite-1.3' and 'ignite-1067' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1.3_
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4da2ff27 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4da2ff27 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4da2ff27 Branch: refs/heads/ignite-gg-9615 Commit: 4da2ff277c6fbae556d3ecc2fa33780d5a1fe963 Parents: 5f28cce 3dcda26 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Jul 10 17:57:12 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Jul 10 17:57:12 2015 +0300 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 317 +++++++++++++++++++ assembly/LICENSE_HADOOP | 270 ++++++++++++++++ assembly/NOTICE_FABRIC | 13 + assembly/NOTICE_HADOOP | 12 + assembly/dependencies-fabric.xml | 13 + assembly/dependencies-hadoop.xml | 12 + assembly/dependencies-visor-console.xml | 20 +- assembly/release-base.xml | 10 - assembly/release-fabric.xml | 12 + assembly/release-hadoop.xml | 12 + modules/aop/licenses/aspectj-epl-license.txt | 69 ---- modules/apache-license-gen/pom.xml | 48 +++ .../src/main/resources/META-INF/licenses.txt.vm | 44 +++ .../geospatial/licenses/jts-lgpl-license.txt | 165 ---------- .../licenses/hibernate-lgpl-2.1-license.txt | 174 ---------- modules/indexing/licenses/h2-epl-license.txt | 69 ---- modules/mesos/licenses/jetty-epl-license.txt | 69 ---- modules/rest-http/pom.xml | 6 +- .../scalar-2.10/licenses/scala-bsd-license.txt | 18 -- modules/scalar/licenses/scala-bsd-license.txt | 18 -- .../licenses/cron4j-lgpl-2.1-license.txt | 174 ---------- modules/slf4j/licenses/sl4j-mit-license.txt | 21 -- .../spark-2.10/licenses/scala-bsd-license.txt | 18 -- modules/spark/licenses/scala-bsd-license.txt | 18 -- modules/ssh/licenses/jcraft-revised-bsd.txt | 28 -- modules/tools/licenses/jodd-revised-bsd.txt | 21 -- .../urideploy/licenses/jtidy-mit-license.txt | 50 --- modules/urideploy/pom.xml | 6 +- .../licenses/jline-bsd-license.txt | 18 -- .../licenses/scala-bsd-license.txt | 18 -- .../licenses/slf4j-mit-license.txt | 21 -- modules/web/pom.xml | 6 +- parent/pom.xml | 51 +++ pom.xml | 1 + 34 files changed, 833 insertions(+), 989 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4da2ff27/parent/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4da2ff27/pom.xml ----------------------------------------------------------------------
