You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/10/01 15:58:47 UTC
[01/17] ignite git commit: Release notes
Repository: ignite
Updated Branches:
refs/heads/ignite-1534-1 0f083fd18 -> 89b7f442a
Release notes
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/60349316
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60349316
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60349316
Branch: refs/heads/ignite-1534-1
Commit: 603493169e66e9bc6a9f9129b2a7709fab1a6419
Parents: 7db44f1
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Sep 24 13:33:24 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Sep 24 13:33:24 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/60349316/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index d7097fd..cd0c2a2 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -7,6 +7,8 @@ Apache Ignite In-Memory Data Fabric 1.4
* Added support for log4j2.
* Added versioned entry to cache API.
* Added client node based JDBC driver implementation.
+* Fixed consistency issue for custom events processing within discovery.
+* Fixed race in cache swap/unswap logic.
* Fixed IGNITE_HOME resolution with JBoss.
* Fixed configuration file resolution on classpath.
* Fixed MBean registration for caches.
[03/17] ignite git commit: schema-import examples fix
Posted by sb...@apache.org.
schema-import examples fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/169066b9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/169066b9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/169066b9
Branch: refs/heads/ignite-1534-1
Commit: 169066b98ae89cf9e5eba8872817f466947c5919
Parents: 59bc35a
Author: Anton Vinogradov <av...@apache.org>
Authored: Thu Sep 24 14:33:26 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Thu Sep 24 14:33:26 2015 +0300
----------------------------------------------------------------------
examples/schema-import/pom.xml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/169066b9/examples/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index d302606..fdbd631 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -26,13 +26,19 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-parent</artifactId>
+ <version>1</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <groupId>org.apache.ignite</groupId>
<artifactId>ignite-schema-import-demo</artifactId>
- <version>${project.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
[02/17] ignite git commit: minor - added space
Posted by sb...@apache.org.
minor - added space
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59bc35a6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59bc35a6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59bc35a6
Branch: refs/heads/ignite-1534-1
Commit: 59bc35a61571284c106fe4f67060eccb8b60faea
Parents: 6034931
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Sep 24 13:33:42 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Sep 24 13:33:42 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/managers/discovery/GridDiscoveryManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/59bc35a6/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 3a09b2c..1801b9c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -2437,7 +2437,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
Map<String, Collection<ClusterNode>> cacheMap = new HashMap<>(allNodes.size(), 1.0f);
Map<String, Collection<ClusterNode>> rmtCacheMap = new HashMap<>(allNodes.size(), 1.0f);
- Map<String, Collection<ClusterNode>> dhtNodesMap =new HashMap<>(allNodes.size(), 1.0f);
+ Map<String, Collection<ClusterNode>> dhtNodesMap = new HashMap<>(allNodes.size(), 1.0f);
Collection<ClusterNode> nodesWithCaches = new HashSet<>(allNodes.size());
Collection<ClusterNode> rmtNodesWithCaches = new HashSet<>(allNodes.size());
[08/17] ignite git commit: schema-import examples fix
Posted by sb...@apache.org.
schema-import examples fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a2c972bf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a2c972bf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a2c972bf
Branch: refs/heads/ignite-1534-1
Commit: a2c972bf5ef59ffd13d65eacc4356ea1ac65383c
Parents: 15d2f76
Author: Anton Vinogradov <av...@apache.org>
Authored: Thu Sep 24 18:11:17 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Thu Sep 24 18:11:17 2015 +0300
----------------------------------------------------------------------
assembly/release-fabric.xml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a2c972bf/assembly/release-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml
index 308853c..9f9fbb2 100644
--- a/assembly/release-fabric.xml
+++ b/assembly/release-fabric.xml
@@ -88,12 +88,11 @@
<includes>
<include>rest/**</include>
<include>memcached/**</include>
- <include>schema-import/**</include>
+ <include>schema-import/src/**</include>
+ <include>schema-import/bin/**</include>
+ <include>schema-import/README.txt</include>
<include>README.txt</include>
</includes>
- <excludes>
- <exclude>schema-import/pom*.xml</exclude>
- </excludes>
</fileSet>
<fileSet>
[16/17] ignite git commit: Merge branch 'ignite-1.4'
Posted by sb...@apache.org.
Merge branch 'ignite-1.4'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fd091c82
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fd091c82
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fd091c82
Branch: refs/heads/ignite-1534-1
Commit: fd091c82892040df8da935527ce72da996fa7718
Parents: 0309f96 7752aa9
Author: Anton Vinogradov <av...@apache.org>
Authored: Thu Oct 1 16:26:28 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Thu Oct 1 16:26:28 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 2 +
assembly/dependencies-fabric.xml | 2 +-
assembly/release-fabric.xml | 10 ++-
examples/schema-import/pom-standalone.xml | 90 ++++++++++++++++++++
examples/schema-import/pom.xml | 13 ++-
.../discovery/GridDiscoveryManager.java | 2 +-
pom.xml | 9 +-
7 files changed, 119 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/examples/schema-import/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fd091c82/pom.xml
----------------------------------------------------------------------
[14/17] ignite git commit: Test Failed
Posted by sb...@apache.org.
Test Failed
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/150a644e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/150a644e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/150a644e
Branch: refs/heads/ignite-1534-1
Commit: 150a644e9b939ccf921cac5c34af97358a16c50a
Parents: b08e0b2
Author: Anton Vinogradov <av...@apache.org>
Authored: Thu Oct 1 14:58:20 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Thu Oct 1 14:58:20 2015 +0300
----------------------------------------------------------------------
.../processors/cache/IgniteCacheEntryListenerTxTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/150a644e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
index cad57f0..a9e43d4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxTest.java
@@ -47,4 +47,8 @@ public class IgniteCacheEntryListenerTxTest extends IgniteCacheEntryListenerAbst
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
+
+ @Override public void testEvents(){
+ fail("https://issues.apache.org/jira/browse/IGNITE-1600");
+ }
}
\ No newline at end of file
[13/17] ignite git commit: fixed sha1 & md5, again
Posted by sb...@apache.org.
fixed sha1 & md5, again
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7752aa9b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7752aa9b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7752aa9b
Branch: refs/heads/ignite-1534-1
Commit: 7752aa9b796068cbc51cc4ad8d7fc4b59dfa1c2b
Parents: 87ff90c
Author: Anton Vinogradov <av...@apache.org>
Authored: Fri Sep 25 16:01:40 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Sep 25 16:01:40 2015 +0300
----------------------------------------------------------------------
pom.xml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7752aa9b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ddc443..606bb0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -626,7 +626,15 @@
</fileset>
</copy>
- <!-- appending filename to md5 and sha1 files. to be improved. -->
+ <!-- appending filename to md5 and sha1 files. to be improved!! -->
+ <!-- update versions task will replace " " to " ", so additional echo added. -->
+ <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.md5" append="true" message=" " />
+ <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.sha1" append="true" message=" " />
+ <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.md5" append="true" message=" " />
+ <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.sha1" append="true" message=" " />
+ <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.md5" append="true" message=" " />
+ <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.sha1" append="true" message=" " />
+
<echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
<echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
<echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
[09/17] ignite git commit: ignite-1.4 Added schema-import-demo to
exclude.
Posted by sb...@apache.org.
ignite-1.4 Added schema-import-demo to exclude.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/008c2734
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/008c2734
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/008c2734
Branch: refs/heads/ignite-1534-1
Commit: 008c27341fe9b2996b01d0b55a4e7eb488180ed0
Parents: a2c972b
Author: Andrey <an...@gridgain.com>
Authored: Fri Sep 25 10:29:51 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Sep 25 10:29:51 2015 +0700
----------------------------------------------------------------------
assembly/dependencies-fabric.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/008c2734/assembly/dependencies-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index f69ffde..f50847e 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -120,11 +120,11 @@
<exclude>org.apache.ignite:ignite-extdata-uri</exclude>
<exclude>org.apache.ignite:ignite-extdata-uri-dep</exclude>
<exclude>org.apache.ignite:ignite-examples</exclude>
+ <exclude>org.apache.ignite:ignite-schema-import-demo</exclude>
<exclude>org.apache.ignite:ignite-indexing</exclude>
<exclude>org.apache.ignite:ignite-visor-console</exclude>
<exclude>org.apache.ignite:ignite-visor-console_2.10</exclude>
<exclude>org.apache.ignite:ignite-visor-plugins</exclude>
- <exclude>org.apache.ignite:ignite-visor-trial</exclude>
<exclude>org.apache.ignite:ignite-hadoop</exclude>
<exclude>org.apache.ignite:ignite-schema-import</exclude>
<exclude>org.apache.ignite:ignite-codegen</exclude>
[17/17] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1534-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-1534-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/89b7f442
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/89b7f442
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/89b7f442
Branch: refs/heads/ignite-1534-1
Commit: 89b7f442a5213609fcba5131835a16b1900ce32e
Parents: 0f083fd fd091c8
Author: sboikov <sb...@gridgain.com>
Authored: Thu Oct 1 16:58:04 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Oct 1 16:58:04 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 2 +
assembly/dependencies-fabric.xml | 2 +-
assembly/release-fabric.xml | 10 ++-
examples/schema-import/pom-standalone.xml | 90 ++++++++++++++++++++
examples/schema-import/pom.xml | 13 ++-
.../discovery/GridDiscoveryManager.java | 2 +-
.../cache/IgniteCacheEntryListenerTxTest.java | 4 +
.../near/GridCacheNearTxExceptionSelfTest.java | 4 +
.../DataStreamerMultiThreadedSelfTest.java | 4 +-
.../DataStreamerMultinodeCreateCacheTest.java | 2 +
pom.xml | 9 +-
11 files changed, 132 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/89b7f442/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
[05/17] ignite git commit: schema-import examples fix
Posted by sb...@apache.org.
schema-import examples fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b054fdc8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b054fdc8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b054fdc8
Branch: refs/heads/ignite-1534-1
Commit: b054fdc86c574e6ba50708cbbec6dce9265cadf3
Parents: fb9b14d
Author: Anton Vinogradov <av...@apache.org>
Authored: Thu Sep 24 14:52:09 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Thu Sep 24 14:52:09 2015 +0300
----------------------------------------------------------------------
examples/schema-import/pom.xml | 2 +-
pom.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b054fdc8/examples/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index fdbd631..fce6f47 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -38,7 +38,7 @@
</properties>
<artifactId>ignite-schema-import-demo</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.3.3-p7-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/b054fdc8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d10b42..a5b47d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -466,6 +466,7 @@
<id>examples</id>
<modules>
<module>examples</module>
+ <module>examples/schema-import</module>
</modules>
</profile>
[04/17] ignite git commit: 1.4.0-SNAPSHOT
Posted by sb...@apache.org.
1.4.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb9b14db
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb9b14db
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb9b14db
Branch: refs/heads/ignite-1534-1
Commit: fb9b14dbf9b8d66a9bfb3e2a4a02b4f43a5f5ac6
Parents: 169066b
Author: Ignite Teamcity <ig...@apache.org>
Authored: Thu Sep 24 14:38:34 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Thu Sep 24 14:38:34 2015 +0300
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fb9b14db/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f70bf3a..6d10b42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,7 +303,7 @@
<!-- hotfix according to https://issues.apache.org/jira/browse/IGNITE-1399. Remove at 1.5 -->
<move todir="${basedir}/target/temp/release-package/libs/optional/ignite-platform" failonerror="false">
- <fileset dir="${basedir}/target/release-package/libs/optional/ignite-platform"/>
+ <fileset dir="${basedir}/target/release-package/libs/optional/ignite-platform" />
</move>
<zip destfile="${basedir}/target/bin/${ignite.zip.pattern}.zip" encoding="UTF-8">
@@ -325,7 +325,7 @@
<!-- hotfix according to https://issues.apache.org/jira/browse/IGNITE-1399. Remove at 1.5 -->
<move todir="${basedir}/target/release-package/libs/optional/ignite-platform" failonerror="false">
- <fileset dir="${basedir}/target/temp/release-package/libs/optional/ignite-platform"/>
+ <fileset dir="${basedir}/target/temp/release-package/libs/optional/ignite-platform" />
</move>
</target>
</configuration>
[12/17] ignite git commit: 1.4.0-SNAPSHOT
Posted by sb...@apache.org.
1.4.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/87ff90c0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/87ff90c0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/87ff90c0
Branch: refs/heads/ignite-1534-1
Commit: 87ff90c0b69224f7546032291f0d5da41d358b2e
Parents: 8e21daa
Author: Ignite Teamcity <ig...@apache.org>
Authored: Fri Sep 25 15:55:58 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Fri Sep 25 15:55:58 2015 +0300
----------------------------------------------------------------------
examples/schema-import/pom.xml | 3 +--
pom.xml | 12 ++++++------
2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/87ff90c0/examples/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index 5358e71..0c5cddd 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -20,8 +20,7 @@
<!--
POM file.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
http://git-wip-us.apache.org/repos/asf/ignite/blob/87ff90c0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b1a9f65..6ddc443 100644
--- a/pom.xml
+++ b/pom.xml
@@ -627,12 +627,12 @@
</copy>
<!-- appending filename to md5 and sha1 files. to be improved. -->
- <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.md5" append="true" message=" ${project.artifactId}-${project.version}-src.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.sha1" append="true" message=" ${project.artifactId}-${project.version}-src.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.md5" append="true" message=" ${project.artifactId}-${project.version}-src.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.sha1" append="true" message=" ${project.artifactId}-${project.version}-src.zip" />
</target>
</configuration>
</execution>
[06/17] ignite git commit: 1.4.0-SNAPSHOT
Posted by sb...@apache.org.
1.4.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de12e9ab
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de12e9ab
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de12e9ab
Branch: refs/heads/ignite-1534-1
Commit: de12e9ab1f6d2525a12867e6c3eb540d648edf94
Parents: b054fdc
Author: Ignite Teamcity <ig...@apache.org>
Authored: Thu Sep 24 14:55:33 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Thu Sep 24 14:55:33 2015 +0300
----------------------------------------------------------------------
examples/schema-import/pom.xml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/de12e9ab/examples/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index fce6f47..f51007a 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -20,10 +20,7 @@
<!--
POM file.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -38,7 +35,7 @@
</properties>
<artifactId>ignite-schema-import-demo</artifactId>
- <version>1.3.3-p7-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<dependencies>
<dependency>
[15/17] ignite git commit: Test Failed
Posted by sb...@apache.org.
Test Failed
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0309f968
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0309f968
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0309f968
Branch: refs/heads/ignite-1534-1
Commit: 0309f9688872e0c0fc7ff74514f06f47aef388b7
Parents: 150a644
Author: Anton Vinogradov <av...@apache.org>
Authored: Thu Oct 1 15:44:25 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Thu Oct 1 15:44:25 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/near/GridCacheNearTxExceptionSelfTest.java | 4 ++++
.../datastreamer/DataStreamerMultiThreadedSelfTest.java | 4 +++-
.../datastreamer/DataStreamerMultinodeCreateCacheTest.java | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0309f968/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
index d6e3804..9546d61 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
@@ -30,4 +30,8 @@ public class GridCacheNearTxExceptionSelfTest extends IgniteTxExceptionAbstractS
@Override protected CacheMode cacheMode() {
return PARTITIONED;
}
+
+ @Override public void testTransformBackup(){
+ fail("https://issues.apache.org/jira/browse/IGNITE-1601");
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/0309f968/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
index bfeebf2..c1251ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
@@ -92,6 +92,8 @@ public class DataStreamerMultiThreadedSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testStartStopIgnitesDynamicCache() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1602");
+
dynamicCache = true;
startStopIgnites();
@@ -103,7 +105,7 @@ public class DataStreamerMultiThreadedSelfTest extends GridCommonAbstractTest {
private void startStopIgnites() throws Exception {
for (int attempt = 0; attempt < 3; ++attempt) {
log.info("Iteration: " + attempt);
-
+
final Ignite ignite = startGrid(0);
Set<IgniteFuture> futs = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/0309f968/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
index ca0ff21..6bde83a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultinodeCreateCacheTest.java
@@ -58,6 +58,8 @@ public class DataStreamerMultinodeCreateCacheTest extends GridCommonAbstractTest
* @throws Exception If failed.
*/
public void testCreateCacheAndStream() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1603");
+
final int THREADS = 5;
startGrids(THREADS);
[10/17] ignite git commit: skip deployment of schema-import demo
Posted by sb...@apache.org.
skip deployment of schema-import demo
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/656b1184
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/656b1184
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/656b1184
Branch: refs/heads/ignite-1534-1
Commit: 656b11847c413689db8e7f7a85baef9f1de223c7
Parents: 008c273
Author: Anton Vinogradov <av...@apache.org>
Authored: Fri Sep 25 10:54:22 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Sep 25 10:54:22 2015 +0300
----------------------------------------------------------------------
examples/schema-import/pom.xml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/656b1184/examples/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index f51007a..5358e71 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -20,7 +20,8 @@
<!--
POM file.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -88,6 +89,14 @@
<target>1.7</target>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
[07/17] ignite git commit: schema-import examples fix
Posted by sb...@apache.org.
schema-import examples fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/15d2f762
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/15d2f762
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/15d2f762
Branch: refs/heads/ignite-1534-1
Commit: 15d2f7625a0822167ea969dc289c10385092b5d0
Parents: de12e9a
Author: Anton Vinogradov <av...@apache.org>
Authored: Thu Sep 24 16:55:00 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Thu Sep 24 16:55:00 2015 +0300
----------------------------------------------------------------------
assembly/release-fabric.xml | 9 +++
examples/schema-import/pom-standalone.xml | 90 ++++++++++++++++++++++++++
pom.xml | 5 ++
3 files changed, 104 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/15d2f762/assembly/release-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml
index a8c4541..308853c 100644
--- a/assembly/release-fabric.xml
+++ b/assembly/release-fabric.xml
@@ -51,6 +51,12 @@
<outputDirectory>/examples</outputDirectory>
<destName>pom.xml</destName>
</file>
+
+ <file>
+ <source>examples/schema-import/pom-standalone.xml</source>
+ <outputDirectory>/examples/schema-import</outputDirectory>
+ <destName>pom.xml</destName>
+ </file>
</files>
<fileSets>
@@ -85,6 +91,9 @@
<include>schema-import/**</include>
<include>README.txt</include>
</includes>
+ <excludes>
+ <exclude>schema-import/pom*.xml</exclude>
+ </excludes>
</fileSet>
<fileSet>
http://git-wip-us.apache.org/repos/asf/ignite/blob/15d2f762/examples/schema-import/pom-standalone.xml
----------------------------------------------------------------------
diff --git a/examples/schema-import/pom-standalone.xml b/examples/schema-import/pom-standalone.xml
new file mode 100644
index 0000000..e443728
--- /dev/null
+++ b/examples/schema-import/pom-standalone.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ 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.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!--
+ POM file.
+-->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-schema-import-demo</artifactId>
+ <version>to_be_replaced_by_ignite_version</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.cache</groupId>
+ <artifactId>cache-api</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-core</artifactId>
+ <version>to_be_replaced_by_ignite_version</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-spring</artifactId>
+ <version>to_be_replaced_by_ignite_version</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-log4j</artifactId>
+ <version>to_be_replaced_by_ignite_version</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-indexing</artifactId>
+ <version>to_be_replaced_by_ignite_version</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/15d2f762/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a5b47d5..6ddc443 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,6 +299,11 @@
<substitution expression="${project.version}" />
</replaceregexp>
+ <replaceregexp file="${basedir}/target/release-package/examples/schema-import/pom.xml" byline="true">
+ <regexp pattern="to_be_replaced_by_ignite_version" />
+ <substitution expression="${project.version}" />
+ </replaceregexp>
+
<chmod dir="${basedir}/target/release-package" perm="755" includes="**/*.sh" />
<!-- hotfix according to https://issues.apache.org/jira/browse/IGNITE-1399. Remove at 1.5 -->
[11/17] ignite git commit: fixed sha1 & md5, again
Posted by sb...@apache.org.
fixed sha1 & md5, again
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8e21daa8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8e21daa8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8e21daa8
Branch: refs/heads/ignite-1534-1
Commit: 8e21daa8ea1cbfc5dbb1f84e9ccaf7101152b5a6
Parents: 656b118
Author: Anton Vinogradov <av...@apache.org>
Authored: Fri Sep 25 15:50:00 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Sep 25 15:50:00 2015 +0300
----------------------------------------------------------------------
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8e21daa8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ddc443..b1a9f65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -627,12 +627,12 @@
</copy>
<!-- appending filename to md5 and sha1 files. to be improved. -->
- <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.md5" append="true" message=" ${project.artifactId}-${project.version}-src.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.sha1" append="true" message=" ${project.artifactId}-${project.version}-src.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.md5" append="true" message=" ${project.artifactId}-${project.version}-src.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.sha1" append="true" message=" ${project.artifactId}-${project.version}-src.zip" />
</target>
</configuration>
</execution>