AWS test
diff --git a/examples/pom.xml b/examples/pom.xml
index 39eecd1..aeac52b 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>ignite-examples</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index 910157d..0838512 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -35,7 +35,7 @@
</properties>
<artifactId>ignite-schema-import-demo</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index ad3c2c1..e548db2 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aop</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
@@ -107,7 +107,7 @@
</excludes>
</testResource>
</testResources>
-
+
<plugins>
<!-- Generate the OSGi MANIFEST.MF for this bundle. -->
<plugin>
diff --git a/modules/apache-license-gen/pom.xml b/modules/apache-license-gen/pom.xml
index 80bbffe..825d55b 100644
--- a/modules/apache-license-gen/pom.xml
+++ b/modules/apache-license-gen/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-apache-license-gen</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<build>
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index c6cac4d..2bf7f75 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-aws</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/camel/pom.xml b/modules/camel/pom.xml
index 912f5e5..66c7ae6 100644
--- a/modules/camel/pom.xml
+++ b/modules/camel/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-camel</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 1a5c8b9..c07c5b4 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-clients</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/cloud/pom.xml b/modules/cloud/pom.xml
index 48cd154..5ac1990 100644
--- a/modules/cloud/pom.xml
+++ b/modules/cloud/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>ignite-cloud</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml
index 9881c12..3cc30cd 100644
--- a/modules/codegen/pom.xml
+++ b/modules/codegen/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-codegen</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index b7b9faf..5df66f5 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-core</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<repositories>
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 471c36b..0f7e65a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -73,7 +73,6 @@
import org.apache.ignite.internal.util.GridConcurrentHashSet;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
-import org.apache.ignite.internal.util.io.GridByteArrayOutputStream;
import org.apache.ignite.internal.util.lang.GridTuple;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.C1;
@@ -5746,9 +5745,6 @@
* Base class for message workers.
*/
protected abstract class MessageWorkerAdapter extends IgniteSpiThread {
- /** Pre-allocated output stream (100K). */
- private final GridByteArrayOutputStream bout = new GridByteArrayOutputStream(100 * 1024);
-
/** Message queue. */
private final BlockingDeque<TcpDiscoveryAbstractMessage> queue = new LinkedBlockingDeque<>();
@@ -5840,9 +5836,7 @@
*/
protected final void writeToSocket(Socket sock, TcpDiscoveryAbstractMessage msg, long timeout)
throws IOException, IgniteCheckedException {
- bout.reset();
-
- spi.writeToSocket(sock, msg, bout, timeout);
+ spi.writeToSocket(sock, msg, timeout);
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index f9273c3..1d55b54 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -17,6 +17,7 @@
package org.apache.ignite.spi.discovery.tcp;
+import java.io.BufferedOutputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
@@ -51,7 +52,6 @@
import org.apache.ignite.configuration.AddressResolver;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.util.io.GridByteArrayOutputStream;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.X;
@@ -1340,21 +1340,6 @@
*
* @param sock Socket.
* @param msg Message.
- * @param timeout Socket write timeout.
- * @throws IOException If IO failed or write timed out.
- * @throws IgniteCheckedException If marshalling failed.
- */
- protected void writeToSocket(Socket sock, TcpDiscoveryAbstractMessage msg, long timeout) throws IOException,
- IgniteCheckedException {
- writeToSocket(sock, msg, new GridByteArrayOutputStream(8 * 1024), timeout); // 8K.
- }
-
- /**
- * Writes message to the socket.
- *
- * @param sock Socket.
- * @param msg Message.
- * @param bout Byte array output stream.
* @param timeout Timeout.
* @throws IOException If IO failed or write timed out.
* @throws IgniteCheckedException If marshalling failed.
@@ -1362,14 +1347,9 @@
@SuppressWarnings("ThrowFromFinallyBlock")
protected void writeToSocket(Socket sock,
TcpDiscoveryAbstractMessage msg,
- GridByteArrayOutputStream bout,
long timeout) throws IOException, IgniteCheckedException {
assert sock != null;
assert msg != null;
- assert bout != null;
-
- // Marshall message first to perform only write after.
- marsh.marshal(msg, bout);
SocketTimeoutObject obj = new SocketTimeoutObject(sock, U.currentTimeMillis() + timeout);
@@ -1378,11 +1358,7 @@
IOException err = null;
try {
- OutputStream out = sock.getOutputStream();
-
- bout.writeTo(out);
-
- out.flush();
+ marsh.marshal(msg, new BufferedOutputStream(sock.getOutputStream(), sock.getSendBufferSize()));
}
catch (IOException e) {
err = e;
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
index 030c653..50ba6d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
@@ -44,7 +44,6 @@
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteNodeAttributes;
import org.apache.ignite.internal.util.GridConcurrentHashSet;
-import org.apache.ignite.internal.util.io.GridByteArrayOutputStream;
import org.apache.ignite.internal.util.lang.GridAbsPredicate;
import org.apache.ignite.internal.util.lang.IgniteInClosure2X;
import org.apache.ignite.internal.util.typedef.CIX2;
@@ -2159,7 +2158,7 @@
/** {@inheritDoc} */
@Override protected void writeToSocket(Socket sock, TcpDiscoveryAbstractMessage msg,
- GridByteArrayOutputStream bout, long timeout) throws IOException, IgniteCheckedException {
+ long timeout) throws IOException, IgniteCheckedException {
waitFor(writeLock);
boolean fail = false;
@@ -2184,7 +2183,7 @@
sock.close();
}
- super.writeToSocket(sock, msg, bout, timeout);
+ super.writeToSocket(sock, msg, timeout);
if (afterWrite != null)
afterWrite.apply(msg, sock);
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
index 0df7da6..d3afdbf 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
@@ -54,7 +54,6 @@
import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
import org.apache.ignite.internal.processors.continuous.StartRoutineAckDiscoveryMessage;
import org.apache.ignite.internal.processors.port.GridPortRecord;
-import org.apache.ignite.internal.util.io.GridByteArrayOutputStream;
import org.apache.ignite.internal.util.lang.GridAbsPredicate;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
@@ -1851,7 +1850,6 @@
/** {@inheritDoc} */
@Override protected void writeToSocket(Socket sock,
TcpDiscoveryAbstractMessage msg,
- GridByteArrayOutputStream bout,
long timeout) throws IOException, IgniteCheckedException {
boolean add = msgIds.add(msg.id());
@@ -1861,7 +1859,7 @@
failed = true;
}
- super.writeToSocket(sock, msg, bout, timeout);
+ super.writeToSocket(sock, msg, timeout);
}
}
@@ -1875,7 +1873,6 @@
/** {@inheritDoc} */
@Override protected void writeToSocket(Socket sock,
TcpDiscoveryAbstractMessage msg,
- GridByteArrayOutputStream bout,
long timeout) throws IOException, IgniteCheckedException {
if (stopBeforeSndAck) {
if (msg instanceof TcpDiscoveryCustomEventMessage) {
@@ -1905,7 +1902,7 @@
}
}
- super.writeToSocket(sock, msg, bout, timeout);
+ super.writeToSocket(sock, msg, timeout);
}
}
@@ -1938,7 +1935,6 @@
/** {@inheritDoc} */
@Override protected void writeToSocket(Socket sock,
TcpDiscoveryAbstractMessage msg,
- GridByteArrayOutputStream bout,
long timeout) throws IOException, IgniteCheckedException {
if (stop)
return;
@@ -1983,7 +1979,7 @@
return;
}
- super.writeToSocket(sock, msg, bout, timeout);
+ super.writeToSocket(sock, msg, timeout);
}
}
@@ -1999,7 +1995,7 @@
/** {@inheritDoc} */
@Override protected void writeToSocket(Socket sock, TcpDiscoveryAbstractMessage msg,
- GridByteArrayOutputStream bout, long timeout) throws IOException, IgniteCheckedException {
+ long timeout) throws IOException, IgniteCheckedException {
if (msg instanceof TcpDiscoveryCustomEventMessage && latch != null) {
log.info("Stop node on custom event: " + msg);
@@ -2011,7 +2007,7 @@
if (stop)
return;
- super.writeToSocket(sock, msg, bout, timeout);
+ super.writeToSocket(sock, msg, timeout);
}
}
@@ -2033,7 +2029,7 @@
/** {@inheritDoc} */
@Override protected void writeToSocket(Socket sock, TcpDiscoveryAbstractMessage msg,
- GridByteArrayOutputStream bout, long timeout) throws IOException, IgniteCheckedException {
+ long timeout) throws IOException, IgniteCheckedException {
if (msg instanceof TcpDiscoveryNodeAddedMessage) {
if (nodeAdded1 != null) {
nodeAdded1.countDown();
@@ -2060,7 +2056,7 @@
if (debug && msg instanceof TcpDiscoveryCustomEventMessage)
log.info("--- Send custom event: " + msg);
- super.writeToSocket(sock, msg, bout, timeout);
+ super.writeToSocket(sock, msg, timeout);
}
}
@@ -2073,12 +2069,12 @@
/** {@inheritDoc} */
@Override protected void writeToSocket(Socket sock, TcpDiscoveryAbstractMessage msg,
- GridByteArrayOutputStream bout, long timeout) throws IOException, IgniteCheckedException {
+ long timeout) throws IOException, IgniteCheckedException {
if (stop)
throw new RuntimeException("Failing ring message worker explicitly");
- super.writeToSocket(sock, msg, bout, timeout);
+ super.writeToSocket(sock, msg, timeout);
}
}
@@ -2091,11 +2087,11 @@
/** {@inheritDoc} */
@Override protected void writeToSocket(Socket sock, TcpDiscoveryAbstractMessage msg,
- GridByteArrayOutputStream bout, long timeout) throws IOException, IgniteCheckedException {
+ long timeout) throws IOException, IgniteCheckedException {
if (stop)
throw new RuntimeException("Failing ring message worker explicitly");
- super.writeToSocket(sock, msg, bout, timeout);
+ super.writeToSocket(sock, msg, timeout);
if (msg instanceof TcpDiscoveryNodeAddedMessage)
stop = true;
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
index 4cf9bd0..513c5a3 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
@@ -23,7 +23,6 @@
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.io.GridByteArrayOutputStream;
import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.spi.IgniteSpiOperationTimeoutException;
import org.apache.ignite.spi.IgniteSpiOperationTimeoutHelper;
@@ -352,6 +351,7 @@
throws IOException, IgniteCheckedException {
if (!(msg instanceof TcpDiscoveryPingRequest)) {
super.writeToSocket(sock, msg, timeout);
+
return;
}
@@ -374,15 +374,6 @@
}
/** {@inheritDoc} */
- @Override protected void writeToSocket(Socket sock, TcpDiscoveryAbstractMessage msg,
- GridByteArrayOutputStream bout, long timeout) throws IOException, IgniteCheckedException {
- if (countConnCheckMsg && msg instanceof TcpDiscoveryConnectionCheckMessage)
- connCheckStatusMsgCntSent++;
-
- super.writeToSocket(sock, msg, bout, timeout);
- }
-
- /** {@inheritDoc} */
protected void writeToSocket(TcpDiscoveryAbstractMessage msg, Socket sock, int res, long timeout)
throws IOException {
if (countConnCheckMsg && msg instanceof TcpDiscoveryConnectionCheckMessage)
@@ -405,4 +396,4 @@
countConnCheckMsg = false;
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 67dd8fc..4863fdd 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-extdata-p2p</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
diff --git a/modules/extdata/uri/modules/uri-dependency/pom.xml b/modules/extdata/uri/modules/uri-dependency/pom.xml
index e2a4eee..4e04132 100644
--- a/modules/extdata/uri/modules/uri-dependency/pom.xml
+++ b/modules/extdata/uri/modules/uri-dependency/pom.xml
@@ -27,7 +27,7 @@
<artifactId>ignite-extdata-uri-dep</artifactId>
<packaging>jar</packaging>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<modelVersion>4.0.0</modelVersion>
<dependencies>
@@ -37,4 +37,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 753df72..be4f036 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -32,7 +32,7 @@
</parent>
<artifactId>ignite-extdata-uri</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
diff --git a/modules/flume/pom.xml b/modules/flume/pom.xml
index eb44126..d35c452 100644
--- a/modules/flume/pom.xml
+++ b/modules/flume/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-flume</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml
index 148da0e..b235d82 100644
--- a/modules/gce/pom.xml
+++ b/modules/gce/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-gce</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/geospatial/pom.xml b/modules/geospatial/pom.xml
index a4ce309..6ad6d27 100644
--- a/modules/geospatial/pom.xml
+++ b/modules/geospatial/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-geospatial</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
@@ -85,9 +85,9 @@
<build>
<plugins>
- <!-- Generate the OSGi MANIFEST.MF for this bundle.
- This bundle is a fragment attached to the ignite-core bundle, as it contains and exports classes in
- the org.apache.ignite.internal.processors.query.h2.opt in the same manner as ignite-indexing, thus
+ <!-- Generate the OSGi MANIFEST.MF for this bundle.
+ This bundle is a fragment attached to the ignite-core bundle, as it contains and exports classes in
+ the org.apache.ignite.internal.processors.query.h2.opt in the same manner as ignite-indexing, thus
leading to a split package situation in OSGi.
-->
<plugin>
@@ -101,5 +101,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index e01a936..8761ebf 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hadoop</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index 53ee826..75dacb1 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-hibernate</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index dc51e3a..1e07a3b 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-indexing</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
@@ -109,9 +109,9 @@
</executions>
</plugin>
- <!-- Generate the OSGi MANIFEST.MF for this bundle.
- This bundle is a fragment attached to the ignite-core bundle, as it contains and exports classes in
- the org.apache.ignite.internal.processors.query.h2.opt in the same manner as ignite-geospatial, thus
+ <!-- Generate the OSGi MANIFEST.MF for this bundle.
+ This bundle is a fragment attached to the ignite-core bundle, as it contains and exports classes in
+ the org.apache.ignite.internal.processors.query.h2.opt in the same manner as ignite-geospatial, thus
leading to a split package situation in OSGi. It also contains an internal processor.
-->
<plugin>
@@ -125,5 +125,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index 2d0cdff..27d2e7f 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jcl</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
@@ -65,5 +65,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
diff --git a/modules/jms11/pom.xml b/modules/jms11/pom.xml
index 786efa3..9032a93 100644
--- a/modules/jms11/pom.xml
+++ b/modules/jms11/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jms11</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 903370e..ae75f8a 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-jta</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/kafka/pom.xml b/modules/kafka/pom.xml
index cb28c77..a08b416 100644
--- a/modules/kafka/pom.xml
+++ b/modules/kafka/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-kafka</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 37416c0..0dd1db6 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/log4j2/pom.xml b/modules/log4j2/pom.xml
index 1e07692..5b0e9897 100644
--- a/modules/log4j2/pom.xml
+++ b/modules/log4j2/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-log4j2</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
@@ -71,5 +71,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
diff --git a/modules/mesos/pom.xml b/modules/mesos/pom.xml
index 8a15f97..4bbfa76 100644
--- a/modules/mesos/pom.xml
+++ b/modules/mesos/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-mesos</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
@@ -99,4 +99,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/mqtt/pom.xml b/modules/mqtt/pom.xml
index dbe00ae..daa196e 100644
--- a/modules/mqtt/pom.xml
+++ b/modules/mqtt/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-mqtt</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/osgi-karaf/pom.xml b/modules/osgi-karaf/pom.xml
index 4119ede..97a9048 100644
--- a/modules/osgi-karaf/pom.xml
+++ b/modules/osgi-karaf/pom.xml
@@ -7,9 +7,9 @@
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.
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-osgi-karaf</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<build>
diff --git a/modules/osgi-paxlogging/pom.xml b/modules/osgi-paxlogging/pom.xml
index 1af4de6..6e764a5 100644
--- a/modules/osgi-paxlogging/pom.xml
+++ b/modules/osgi-paxlogging/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-osgi-paxlogging</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
diff --git a/modules/osgi/pom.xml b/modules/osgi/pom.xml
index 8b2cfa5..0de4fbb 100644
--- a/modules/osgi/pom.xml
+++ b/modules/osgi/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-osgi</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
@@ -113,9 +113,9 @@
</executions>
</plugin>
- <!-- Generate the OSGi MANIFEST.MF for this bundle.
- This bundle is a fragment attached to the ignite-core bundle, as it contains and exports classes in
- the org.apache.ignite.internal.processors.query.h2.opt in the same manner as ignite-geospatial, thus
+ <!-- Generate the OSGi MANIFEST.MF for this bundle.
+ This bundle is a fragment attached to the ignite-core bundle, as it contains and exports classes in
+ the org.apache.ignite.internal.processors.query.h2.opt in the same manner as ignite-geospatial, thus
leading to a split package situation in OSGi. It also contains an internal processor.
-->
<plugin>
@@ -166,5 +166,5 @@
</plugins>
</build>
-
+
</project>
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 7c4b91b..1c47da6 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-rest-http</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml
index ab1eeef..569c13d 100644
--- a/modules/scalar-2.10/pom.xml
+++ b/modules/scalar-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar_2.10</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index 42e3766..c8d12ff 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-scalar</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index 3707949..935f0ff 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schedule</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
@@ -85,7 +85,7 @@
<build>
<plugins>
- <!-- Generate the OSGi MANIFEST.MF for this fragment. It is a fragment because it contains internal processors
+ <!-- Generate the OSGi MANIFEST.MF for this fragment. It is a fragment because it contains internal processors
that would be looked up by ignite-core. -->
<plugin>
<groupId>org.apache.felix</groupId>
diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml
index 1f6e499..87983ec 100644
--- a/modules/schema-import/pom.xml
+++ b/modules/schema-import/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-schema-import</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index d0fb6ec..a19b46b 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-slf4j</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/spark-2.10/pom.xml b/modules/spark-2.10/pom.xml
index b9eb6c9..ed42227 100644
--- a/modules/spark-2.10/pom.xml
+++ b/modules/spark-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spark_2.10</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml
index 9e1917d..d8cb894 100644
--- a/modules/spark/pom.xml
+++ b/modules/spark/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spark</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 522a12f..44a00ed 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-spring</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
@@ -137,7 +137,7 @@
</testResources>
<plugins>
- <!-- Generate the OSGi MANIFEST.MF for this bundle.
+ <!-- Generate the OSGi MANIFEST.MF for this bundle.
This bundle is a fragment attached to the ignite-core bundle, as it contains and exports classes in the org.apache.ignite
leading to a split package situation in OSGi.
-->
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index f0b237e..4b448a0 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-ssh</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 45ff9a5..6dec29a 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-tools</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
diff --git a/modules/twitter/pom.xml b/modules/twitter/pom.xml
index 39802c8..126c590 100644
--- a/modules/twitter/pom.xml
+++ b/modules/twitter/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-twitter</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 93d0aba..266dd6a 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-urideploy</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/visor-console-2.10/pom.xml b/modules/visor-console-2.10/pom.xml
index fc91ab6..bcdc8b1 100644
--- a/modules/visor-console-2.10/pom.xml
+++ b/modules/visor-console-2.10/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console_2.10</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 0bf0ae2..80de214 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-console</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index 3a32056..208dc8d 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-visor-plugins</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 5f3fb15..eee51eb 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-web</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
@@ -99,5 +99,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index cbf2cb8..111b7c8 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yardstick</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
diff --git a/modules/yarn/pom.xml b/modules/yarn/pom.xml
index 8bdeb53..a8602cf 100644
--- a/modules/yarn/pom.xml
+++ b/modules/yarn/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-yarn</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<properties>
diff --git a/modules/zookeeper/pom.xml b/modules/zookeeper/pom.xml
index be76dd7..da43d79 100644
--- a/modules/zookeeper/pom.xml
+++ b/modules/zookeeper/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>ignite-zookeeper</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/pom.xml b/pom.xml
index e93db20..3d3f276 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.apache.ignite</groupId>
<artifactId>apache-ignite</artifactId>
- <version>1.5.0.final</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
