Merge remote-tracking branch 'remotes/origin/ignite-release-test-no-mod' into
sprint-3
Conflicts:
examples/pom-standalone.xml
examples/schema-import/pom.xml
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/8da80d4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8da80d4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8da80d4f
Branch: refs/heads/ignite-565
Commit: 8da80d4fb395a98f7b22c408c6592fbe3b9f6d93
Parents: 184b200 278e9ff
Author: avinogradov <[email protected]>
Authored: Thu Mar 26 13:22:46 2015 +0300
Committer: avinogradov <[email protected]>
Committed: Thu Mar 26 13:22:46 2015 +0300
----------------------------------------------------------------------
examples/pom-standalone.xml | 18 +-
examples/pom.xml | 106 +-
examples/schema-import/pom.xml | 11 +-
modules/aop/pom.xml | 25 +-
modules/aws/pom.xml | 43 +-
modules/clients/pom.xml | 43 +-
modules/codegen/pom.xml | 15 +-
modules/core/pom.xml | 77 +-
modules/extdata/p2p/pom.xml | 23 +-
modules/extdata/uri/pom.xml | 25 +-
modules/geospatial/pom.xml | 43 +-
modules/hadoop/pom.xml | 38 +-
modules/hibernate/pom.xml | 32 +-
modules/indexing/pom.xml | 43 +-
modules/jcl/pom.xml | 16 +-
modules/jta/pom.xml | 30 +-
modules/log4j/pom.xml | 16 +-
modules/rest-http/pom.xml | 14 +-
modules/scalar/pom.xml | 51 +-
modules/schedule/pom.xml | 16 +-
modules/schema-import/pom.xml | 14 +-
modules/slf4j/pom.xml | 14 +-
modules/spring/pom.xml | 20 +-
modules/ssh/pom.xml | 20 +-
modules/tools/pom.xml | 11 +-
.../ant/beautifier/GridJavadocAntTask.java | 2 +-
modules/urideploy/pom.xml | 52 +-
modules/visor-console/pom.xml | 24 +-
modules/visor-plugins/pom.xml | 14 +-
modules/web/pom.xml | 26 +-
modules/yardstick/pom.xml | 22 +-
parent/pom.xml | 711 +++++++++++
pom.xml | 1146 ++----------------
33 files changed, 1299 insertions(+), 1462 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8da80d4f/examples/pom-standalone.xml
----------------------------------------------------------------------
diff --cc examples/pom-standalone.xml
index 8162a05,996753e..f07b214
--- a/examples/pom-standalone.xml
+++ b/examples/pom-standalone.xml
@@@ -28,7 -28,6 +28,7 @@@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <ignite.version>1.0.1-RC-SNAPSHOT</ignite.version>
++ <ignite.version>1.0.0</ignite.version>
</properties>
<groupId>org.apache.ignite</groupId>
