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/05/21 11:51:34 UTC
[01/18] incubator-ignite git commit: "Version changed
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-471-2 cb3bc8fe8 -> fdb5b17ff
"Version changed
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa07e18f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa07e18f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa07e18f
Branch: refs/heads/ignite-471-2
Commit: fa07e18f7583a5c4f306056dcba5dfd4fe60ac5d
Parents: f9a4dd7
Author: Ignite Teamcity <ig...@apache.org>
Authored: Wed May 20 13:22:53 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Wed May 20 13:22:53 2015 +0300
----------------------------------------------------------------------
modules/core/src/main/resources/ignite.properties | 2 +-
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa07e18f/modules/core/src/main/resources/ignite.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/ignite.properties b/modules/core/src/main/resources/ignite.properties
index 80bffed..aec41ea 100644
--- a/modules/core/src/main/resources/ignite.properties
+++ b/modules/core/src/main/resources/ignite.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-ignite.version=1.0.4
+ignite.version=1.0.6-SNAPSHOT1.0.6
ignite.build=0
ignite.revision=DEV
ignite.rel.date=01011970
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa07e18f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8886c8a..0c6d0ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,7 +291,7 @@
<substitution expression="${project.version}" />
</replaceregexp>
- <chmod dir="${basedir}/target/release-package" perm="755" includes="**/*.sh"/>
+ <chmod dir="${basedir}/target/release-package" perm="755" includes="**/*.sh" />
<zip destfile="${basedir}/target/bin/${ignite.zip.pattern}.zip" encoding="UTF-8">
<zipfileset dir="${basedir}/target/release-package" prefix="${ignite.zip.pattern}" filemode="755">
@@ -566,7 +566,7 @@
<include name="**/*" />
</fileset>
</copy>
- <copy file="${basedir}/KEYS" todir="${basedir}/target/site" failonerror="false"/>
+ <copy file="${basedir}/KEYS" todir="${basedir}/target/site" failonerror="false" />
</target>
</configuration>
</execution>
[07/18] incubator-ignite git commit: DEPENDENCIES, LICENSE,
NOTICE files fix for main project + LICENSE, NOTICE files overrided for core
Posted by sb...@apache.org.
DEPENDENCIES, LICENSE, NOTICE files fix for main project
+ LICENSE, NOTICE files overrided for core
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cff73bfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cff73bfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cff73bfa
Branch: refs/heads/ignite-471-2
Commit: cff73bfa9e08ab8e9f6c70c335bd4c86750e92f4
Parents: 7ec8df6
Author: avinogradov <av...@gridgain.com>
Authored: Wed May 20 18:41:27 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Wed May 20 18:41:27 2015 +0300
----------------------------------------------------------------------
modules/core/src/main/java/META-INF/LICENSE | 238 +++++++++++++++++++++++
modules/core/src/main/java/META-INF/NOTICE | 12 ++
parent/pom.xml | 1 -
pom.xml | 17 ++
4 files changed, 267 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cff73bfa/modules/core/src/main/java/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/META-INF/LICENSE b/modules/core/src/main/java/META-INF/LICENSE
new file mode 100644
index 0000000..7649b39
--- /dev/null
+++ b/modules/core/src/main/java/META-INF/LICENSE
@@ -0,0 +1,238 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+
+
+==============================================================================
+Apache Ignite (incubating) Subcomponents:
+
+The Apache Ignite project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+
+==============================================================================
+For SnapTree:
+==============================================================================
+This product bundles SnapTree, which is available under a
+"3-clause BSD" license. For details, see
+https://github.com/nbronson/snaptree/blob/master/LICENSE.
+
+==============================================================================
+For JSR 166 classes in "org.jsr166" package
+==============================================================================
+This product bundles JSR-166 classes which are donated to public domain.
+For details, see CC0 1.0 Universal (1.0), Public Domain Dedication,
+http://creativecommons.org/publicdomain/zero/1.0/
+
+==============================================================================
+For books used for tests in "org.apache.ignite.internal.processors.hadoop.books"
+==============================================================================
+This code bundles book text files used for testing purposes which contain
+the following header:
+
+This eBook is for the use of anyone anywhere at no cost and with
+almost no restrictions whatsoever. You may copy it, give it away or
+re-use it under the terms of the Project Gutenberg License included
+with this eBook or online at www.gutenberg.org
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cff73bfa/modules/core/src/main/java/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/META-INF/NOTICE b/modules/core/src/main/java/META-INF/NOTICE
new file mode 100644
index 0000000..298d05b
--- /dev/null
+++ b/modules/core/src/main/java/META-INF/NOTICE
@@ -0,0 +1,12 @@
+Apache Ignite (incubating)
+Copyright 2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
+This software includes code from IntelliJ IDEA Community Edition
+Copyright (C) JetBrains s.r.o.
+https://www.jetbrains.com/idea/
+Licensed under Apache License, Version 2.0.
+http://search.maven.org/#artifactdetails%7Corg.jetbrains%7Cannotations%7C13.0%7Cjar
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cff73bfa/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cd098d9..e3f70b4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -619,7 +619,6 @@
<exclude>**/keystore/*.pfx</exclude><!--bin-files-->
<!--special excludes-->
<exclude>DEVNOTES.txt</exclude>
- <exclude>DEPENDENCIES</exclude><!--automatically generated file. presents at source pack-->
<exclude>src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java</exclude><!--BSD license-->
<exclude>src/main/java/org/apache/ignite/internal/util/snaptree/*.java</exclude><!--BSD license-->
<exclude>src/main/java/org/jsr166/*.java</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cff73bfa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b91c904..26f5456 100644
--- a/pom.xml
+++ b/pom.xml
@@ -512,6 +512,23 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <!-- no <resourceBundle>, fix unexpected generation of
+ DEPENDENCIES, LICENSE, NOTICE files-->
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
[18/18] incubator-ignite git commit: ignite-471-2: remove assert
Posted by sb...@apache.org.
ignite-471-2: remove assert
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fdb5b17f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fdb5b17f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fdb5b17f
Branch: refs/heads/ignite-471-2
Commit: fdb5b17ffcbd5ffe3d9ad5aed08c65b395aca3ea
Parents: f2f9f66
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu May 21 12:50:25 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu May 21 12:50:25 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheProcessor.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fdb5b17f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index d4acbb1..37e3f4d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -774,8 +774,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
for (GridCacheAdapter<?, ?> cache : caches.values())
onKernalStart(cache);
- boolean utilityCacheStarted = false;
-
// Wait for caches in SYNC preload mode.
for (CacheConfiguration cfg : ctx.config().getCacheConfiguration()) {
GridCacheAdapter<?, ?> cache = caches.get(maskNull(cfg.getName()));
@@ -789,14 +787,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
cache.preloader().syncFuture().get();
}
- if (CU.isUtilityCache(cache.name())) {
+ if (CU.isUtilityCache(cache.name()))
ctx.cacheObjects().onUtilityCacheStarted();
-
- utilityCacheStarted = true;
- }
}
-
- assert utilityCacheStarted;
}
/** {@inheritDoc} */
[04/18] incubator-ignite git commit: # ignite-456: Implemented
Posted by sb...@apache.org.
# ignite-456: Implemented
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3cc3fbe3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3cc3fbe3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3cc3fbe3
Branch: refs/heads/ignite-471-2
Commit: 3cc3fbe3168acaf49e691ffe74d780239968b311
Parents: c4d81fe
Author: null <null>
Authored: Wed May 20 15:45:33 2015 +0300
Committer: null <null>
Committed: Wed May 20 15:45:33 2015 +0300
----------------------------------------------------------------------
dev-tools/build.gradle | 35 +-
dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 51017 bytes
.../gradle/wrapper/gradle-wrapper.properties | 6 +
dev-tools/gradlew | 164 ++++++++++
dev-tools/src/main/groovy/jiraslurp.groovy | 326 ++++++++++++++-----
parent/pom.xml | 4 +
6 files changed, 442 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/build.gradle
----------------------------------------------------------------------
diff --git a/dev-tools/build.gradle b/dev-tools/build.gradle
index b760bc1..164a775 100644
--- a/dev-tools/build.gradle
+++ b/dev-tools/build.gradle
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
apply plugin: 'groovy'
repositories {
@@ -25,21 +26,29 @@ dependencies {
}
task help {
- println '''There are two interfaces to work with JIRA attachment validation tool
- - to do the batch validation of all latest patch attachments
- gradle slurp
- - to grab a single JIRA's latest attachment and run test validation on it
- JIRA_NUM=INGITE-### gradle patchapply'''
+ println '''There are 3 interfaces to work with JIRA attachment validation tool
+ - to do the batch validation of all latest patch attachments
+ gradle slurp
+ - to grab a single JIRA's latest attachment and run test validation on it
+ JIRA_NUM=INGITE-### gradle patchapply
+ - to run all test builds for a single JIRA's latest attachment and run test validation on it
+ JIRA_NUM=INGITE-### gradle runAllBuilds'''
+}
+
+task slurp(dependsOn: 'classes', type: JavaExec) {
+ args(project.buildDir, "slurp,${System.getenv('TEST_BUILDS')}")
+ main = 'jiraslurp'
+ classpath = sourceSets.main.runtimeClasspath
}
-task slurp (dependsOn: 'classes', type: JavaExec) {
- args (project.buildDir, 'slurp')
- main = 'jiraslurp'
- classpath = sourceSets.main.runtimeClasspath
+task patchapply(dependsOn: 'classes', type: JavaExec) {
+ args("patchApply,${System.getenv('JIRA_NUM')}")
+ main = 'jiraslurp'
+ classpath = sourceSets.main.runtimeClasspath
}
-task patchapply (dependsOn: 'classes', type: JavaExec) {
- args ("JIRA_NUM=${System.getenv('JIRA_NUM')}")
- main = 'jiraslurp'
- classpath = sourceSets.main.runtimeClasspath
+task runAllBuilds(dependsOn: 'classes', type: JavaExec) {
+ args("runAllBuilds,${System.getenv('JIRA_NUM')}")
+ main = 'jiraslurp'
+ classpath = sourceSets.main.runtimeClasspath
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/dev-tools/gradle/wrapper/gradle-wrapper.jar b/dev-tools/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..b761216
Binary files /dev/null and b/dev-tools/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/dev-tools/gradle/wrapper/gradle-wrapper.properties b/dev-tools/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..3111cd7
--- /dev/null
+++ b/dev-tools/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Feb 24 21:36:05 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/gradlew
----------------------------------------------------------------------
diff --git a/dev-tools/gradlew b/dev-tools/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/dev-tools/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/dev-tools/src/main/groovy/jiraslurp.groovy
----------------------------------------------------------------------
diff --git a/dev-tools/src/main/groovy/jiraslurp.groovy b/dev-tools/src/main/groovy/jiraslurp.groovy
index 0a876fa..34ac79c 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -20,33 +20,52 @@
*/
final GIT_REPO = "https://git1-us-west.apache.org/repos/asf/incubator-ignite.git"
final ATTACHMENT_URL = "https://issues.apache.org/jira/secure/attachment"
-final validated_filename = "validated-jira.txt"
-final LAST_SUCCESSFUL_ARTIFACT = "guestAuth/repository/download/Ignite_PatchValidation_Main/.lastSuccessful/$validated_filename"
+final validated_filename = "${System.getProperty("user.home")}/validated-jira.txt"
+final LAST_SUCCESSFUL_ARTIFACT = "guestAuth/repository/download/Ignite_PatchValidation_PatchChecker/.lastSuccessful/$validated_filename"
final def JIRA_CMD = System.getProperty('JIRA_COMMAND', 'jira.sh')
LinkedHashMap<String, String> jirasAttached = [:]
+/**
+ * Gets jiras for which test tasks were already triggered.
+ *
+ * @return List of pairs [jira,attachemntId].
+ */
def readHistory = {
- final int MAX_HISTORY = 5000
-
- List validated_list = []
- def validated = new File(validated_filename)
- if (validated.exists()) {
- validated_list = validated.text.split('\n')
- validated.delete()
- } else {
- try {
- validated_list =
- new URL("http://204.14.53.152/$LAST_SUCCESSFUL_ARTIFACT").text.split('\n')
- } catch (Exception e) {
- println e.getMessage()
+ final int MAX_HISTORY = 5000
+
+ List validated_list = []
+
+ // TODO do not use folder.
+ def validated = new File(validated_filename)
+
+ if (validated.exists()) {
+ // TODO use commented way.
+ validated_list = validated.text.split('\n')
}
- }
- // Let's make sure the preserved history isn't too long
- if (validated_list.size > MAX_HISTORY) {
- validated_list = validated_list[validated_list.size-MAX_HISTORY..validated_list.size-1]
- }
- validated_list
+
+ // TODO use it way.
+// try {
+// def historyUrl = "http://${System.getenv('TC_URL')}/$LAST_SUCCESSFUL_ARTIFACT"
+//
+// println "Reading history from $historyUrl"
+//
+// validated_list = new URL(historyUrl).text.split('\n')
+//
+// println "Got validated list=$validated_list"
+// }
+// catch (Exception e) {
+// println e.getMessage()
+//
+// }
+
+ // Let's make sure the preserved history isn't too long
+ if (validated_list.size > MAX_HISTORY)
+ validated_list = validated_list[validated_list.size - MAX_HISTORY..validated_list.size - 1]
+
+ println "History=$validated_list"
+
+ validated_list
}
/**
@@ -54,83 +73,230 @@ def readHistory = {
* @return <code>null</code> or <code>JIRA-###,latest_attach_id</code>
*/
def getLatestAttachment = { jira ->
- def latestAttr = jira.attachments[0].attachment.list().sort {
- it.@id.toInteger()
- }.reverse()[0]
- String row = null
- if (latestAttr == null) {
- println "${jira.key} is in invalid state: patch is not available"
- } else {
- row = "${jira.key},${latestAttr.@id}"
- }
+ def latestAttr = jira.attachments[0].attachment.list().sort {
+ it.@id.toInteger()
+ }.reverse()[0]
+
+ String row = null
+
+ if (latestAttr == null) {
+ println "${jira.key} is in invalid state: patch is not available"
+ }
+ else {
+ row = "${jira.key},${latestAttr.@id}"
+ }
}
def checkForAttachments = {
- def JIRA_FILTER =
- "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-xml/12330308/SearchRequest-12330308.xml?tempMax=100&field=key&field=attachments"
- def rss = new XmlSlurper().parse(JIRA_FILTER)
- List list = readHistory{}
-
- rss.channel.item.each { jira ->
- String row = getLatestAttachment (jira)
- if (row != null && !list.contains(row)) {
- def pair = row.split(',')
- jirasAttached.put(pair[0] as String, pair[1] as String)
- list.add(row)
+ def JIRA_FILTER =
+ "https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-xml/12330308/SearchRequest-12330308.xml?tempMax=100&field=key&field=attachments"
+ def rss = new XmlSlurper().parse(JIRA_FILTER)
+
+ List list = readHistory {}
+
+ rss.channel.item.each { jira ->
+ String row = getLatestAttachment(jira)
+
+ if (row != null && !list.contains(row)) {
+ def pair = row.split(',')
+
+ jirasAttached.put(pair[0] as String, pair[1] as String)
+
+ list.add(row)
+ }
}
- }
- // Write everything back to persist the list
- def validated = new File(validated_filename)
- validated << list.join('\n')
+ // Write everything back to persist the list
+ def validated = new File(validated_filename)
+
+ if (validated.exists())
+ validated.delete()
+
+ validated << list.join('\n')
}
+/**
+ * Monitors given process and show errors if exist.
+ */
def checkprocess = { process ->
- process.waitFor()
- if (process.exitValue() != 0) {
- println "Return code: " + process.exitValue()
- println "Errout:\n" + process.err.text
- assert process.exitValue() == 0 || process.exitValue() == 128
- }
+ println process.text
+
+ process.waitFor()
+
+ if (process.exitValue() != 0) {
+ println "Return code: " + process.exitValue()
+ println "Errout:\n" + process.err.text
+
+ assert process.exitValue() == 0 || process.exitValue() == 128
+ }
}
-def create_gitbranch = {jira, attachementURL ->
- println jira
- GIT_REPO
- println "$ATTACHMENT_URL/$attachementURL/"
-
- def patchFile = new File("${jira}.patch")
- patchFile << new URL("$ATTACHMENT_URL/$attachementURL/").text
- checkprocess "git clone --depth 1 $GIT_REPO".execute()
- checkprocess "git checkout -b sprint-2 origin/sprint-2".execute(null, new File('incubator-ignite'))
- checkprocess "git am ../${patchFile.name}".execute(null, new File('incubator-ignite'))
- patchFile.delete()
+/**
+ * Applys patch from jira to given git state.
+ */
+def applyPatch = { jira, attachementURL ->
+ def userEmail = System.getenv("env.GIT_USER_EMAIL");
+ def userName = System.getenv("env.GIT_USER_NAME");
+
+ println "Patch apllying with jira='$jira' and attachment='$ATTACHMENT_URL/$attachementURL/'."
+
+ def patchFile = new File("${jira}-${attachementURL}.patch")
+
+ try {
+ patchFile << new URL("$ATTACHMENT_URL/$attachementURL/").text
+
+ try {
+ checkprocess "git branch".execute()
+
+ checkprocess "git config user.email \"$userEmail\"".execute(null, new File("../"))
+ checkprocess "git config user.name \"$userName\"".execute(null, new File("../"))
+
+ // Create a new uniqueue branch to applying patch
+ def newTestBranch = "test-branch-${jira}-${attachementURL}-${System.currentTimeMillis()}"
+ checkprocess "git checkout -b ${newTestBranch}".execute(null, new File("../"))
+
+ checkprocess "git branch".execute()
+
+ checkprocess "git am dev-tools/${patchFile.name}".execute(null, new File("../"))
+
+ println "Patch was applied successfully."
+ }
+ catch (Exception e) {
+ println "Patch was not applied successfully. Aborting patch applying."
+
+ checkprocess "git am --abort".execute(null, new File("../"))
+
+ throw e;
+ }
+ }
+ finally {
+ assert patchFile.delete(), 'Could not delete patch file.'
+ }
}
def JIRA_xml = { jiranum ->
- "https://issues.apache.org/jira/si/jira.issueviews:issue-xml/$jiranum/${jiranum}.xml"
+ "https://issues.apache.org/jira/si/jira.issueviews:issue-xml/$jiranum/${jiranum}.xml"
+}
+
+/**
+ * Runs all given test builds to validate last patch from given jira.
+ */
+def runAllTestBuilds = { builds, jiraNum ->
+ assert jiraNum != 'null', 'Jira number should not be null.'
+ assert jiraNum != null, 'Jira number should not be null.'
+
+ if (jiraNum) {
+ def tcURL = System.getenv('TC_URL')
+ def user = System.getenv('TASK_RUNNER_USER')
+ def pwd = System.getenv('TASK_RUNNER_PWD')
+
+ builds.each {
+ try {
+ println "Triggering $it build for $jiraNum jira..."
+
+ String postData =
+ "<build>" +
+ " <buildType id='$it'/>" +
+ " <properties>" +
+ " <property name='JIRA_NUM' value='$jiraNum'/>" +
+ " </properties>" +
+ "</build>";
+
+ URL url = new URL("http://$tcURL:80/httpAuth/app/rest/buildQueue");
+
+ HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+
+ String encoded = new sun.misc.BASE64Encoder().encode("$user:$pwd".getBytes());
+
+ conn.setRequestProperty("Authorization", "Basic " + encoded);
+
+ conn.setDoOutput(true);
+ conn.setRequestMethod("POST");
+ conn.setRequestProperty("Content-Type", "application/xml");
+ conn.setRequestProperty("Content-Length", String.valueOf(postData.length()));
+
+ OutputStream os = conn.getOutputStream();
+ os.write(postData.getBytes());
+ os.flush();
+ os.close();
+
+ conn.connect();
+
+ // Read response.
+ print "Response: "
+
+ BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+
+ String line;
+ while ((line = br.readLine()) != null)
+ println line
+
+ br.close();
+ }
+ catch (Exception e) {
+ e.printStackTrace()
+ }
+ }
+ }
}
+/**
+ * Main.
+ */
args.each {
- println it
- def parameters = it.split('=')
-
- if (parameters[0] == 'slurp') {
- checkForAttachments()
- // For each ticket with new attachment, let's trigger remove build
- jirasAttached.each { k, v ->
- // Trailing slash is important for download; only need to pass JIRA number
- println "Triggering the build for: $k = $ATTACHMENT_URL/$v/"
+ println "Arg=$it"
+
+ def parameters = it.split(",")
+
+ println parameters
+
+ if (parameters.length == 2 && parameters[0] == "slurp" && parameters[1] != 'null') {
+ def builds = parameters[1].split(' ');
+
+ println "Running in 'slurp' mode. Test builds=${builds}"
+
+ checkForAttachments()
+
+ // For each ticket with new attachment, let's trigger remove build
+ jirasAttached.each { k, v ->
+ // Trailing slash is important for download; only need to pass JIRA number
+ println "Triggering the test builds for: $k = $ATTACHMENT_URL/$v/"
+
+ runAllTestBuilds(builds,k)
+ }
+ }
+ else if (parameters.length == 2 && parameters[0] == "patchApply" && parameters[1] ==~ /\w+-\d+/) {
+ def jiraNum = parameters[1]
+
+ println "Running in 'patch apply' mode with jira number '$jiraNum'"
+
+ // Extract JIRA rss from the and pass the ticket element into attachment extraction
+ def rss = new XmlSlurper().parse(JIRA_xml(parameters[1]))
+
+ String row = getLatestAttachment(rss.channel.item)
+
+ println "Got row: $row."
+
+ if (row != null) {
+ def pair = row.split(',')
+ def jira = pair[0]
+ def attachementURL = pair[1]
+
+ applyPatch(jira, attachementURL)
+ }
}
- } else if (parameters.length == 2 && parameters[0] == 'JIRA_NUM' && parameters[1] ==~ /\w+-\d+/) {
- // Extract JIRA rss from the and pass the ticket element into attachment extraction
- def rss = new XmlSlurper().parse(JIRA_xml(parameters[1]))
- String row = getLatestAttachment(rss.channel.item)
- if (row != null) {
- def pair = row.split(',')
- create_gitbranch(pair[0], pair[1])
+ else if (parameters.length >= 2 && parameters[0] == "runAllBuilds" && parameters[1] ==~ /\w+-\d+/) {
+ def jiraNum = parameters[1]
+
+ def attachementURL=null
+
+ if (parameters[2] ==~ /\d+/)
+ attachementURL = parameters[2]
+
+ println "Running in 'all builds' mode with jira number='$jiraNum' and attachment URL='$attachementURL'."
+
+ runAllTestBuilds jiraNum attachmentURL
}
- }
}
/* Workflow:
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3cc3fbe3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cd098d9..f06586a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -634,6 +634,10 @@
<exclude>src/main/java/META-INF/services/javax.cache.spi.CachingProvider</exclude><!--cannot be changed-->
<exclude>src/main/java/org/jetbrains/annotations/*.java</exclude><!--copyright-->
<exclude>src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider</exclude><!--cannot be changed-->
+ <exclude>dev-tools/IGNITE-*.patch</exclude>
+ <exclude>dev-tools/.gradle/**/*</exclude>
+ <exclude>dev-tools/gradle/wrapper/**/*</exclude>
+ <exclude>dev-tools/gradlew</exclude>
<!--shmem-->
<exclude>ipc/shmem/**/Makefile.in</exclude><!--auto generated files-->
<exclude>ipc/shmem/**/Makefile</exclude><!--auto generated files-->
[03/18] incubator-ignite git commit: IGNITE-927 Revisit license
packaging
Posted by sb...@apache.org.
IGNITE-927
Revisit license packaging
IGNITE-926
Revisit artifacts namings
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/73679128
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/73679128
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/73679128
Branch: refs/heads/ignite-471-2
Commit: 736791283c0333316fed5957f6cc64d1645e480e
Parents: 4423a46
Author: avinogradov <av...@gridgain.com>
Authored: Wed May 20 15:40:18 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Wed May 20 15:40:18 2015 +0300
----------------------------------------------------------------------
modules/ssh/licenses/jcraft-revised-bsd.txt | 28 --------------------
modules/tools/licenses/jodd-revised-bsd.txt | 21 ---------------
.../licenses/jcraft-revised-bsd.txt | 28 --------------------
pom.xml | 6 ++---
4 files changed, 3 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73679128/modules/ssh/licenses/jcraft-revised-bsd.txt
----------------------------------------------------------------------
diff --git a/modules/ssh/licenses/jcraft-revised-bsd.txt b/modules/ssh/licenses/jcraft-revised-bsd.txt
deleted file mode 100644
index 3748f98..0000000
--- a/modules/ssh/licenses/jcraft-revised-bsd.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-3-clause BSD license
-------------------------------------------------------------------------------
-Copyright (c) 2002-2014 Atsuhiko Yamanaka, JCraft,Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the distribution.
-
- 3. The names of the authors may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73679128/modules/tools/licenses/jodd-revised-bsd.txt
----------------------------------------------------------------------
diff --git a/modules/tools/licenses/jodd-revised-bsd.txt b/modules/tools/licenses/jodd-revised-bsd.txt
deleted file mode 100644
index 129f3f0..0000000
--- a/modules/tools/licenses/jodd-revised-bsd.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Jodd software is released under Revised BSD License.
-
-Copyright (c) 2003-2014, Jodd Team All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-Neither the name of the Jodd nor the names of its contributors may be used to endorse or promote products derived from this software without specific
-prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73679128/modules/visor-console/licenses/jcraft-revised-bsd.txt
----------------------------------------------------------------------
diff --git a/modules/visor-console/licenses/jcraft-revised-bsd.txt b/modules/visor-console/licenses/jcraft-revised-bsd.txt
deleted file mode 100644
index 3748f98..0000000
--- a/modules/visor-console/licenses/jcraft-revised-bsd.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-3-clause BSD license
-------------------------------------------------------------------------------
-Copyright (c) 2002-2014 Atsuhiko Yamanaka, JCraft,Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the distribution.
-
- 3. The names of the authors may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73679128/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cb790bd..29ef8ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<ignite.site>scp://localhost:/home</ignite.site>
<ignite.site.folder>${project.artifactId}-${project.version}</ignite.site.folder>
<!--fix <attachartifact>...< /> at apache-release profile if changed-->
- <ignite.zip.pattern>ignite-${ignite.edition}-${project.version}</ignite.zip.pattern>
+ <ignite.zip.pattern>ignite-${ignite.edition}-${project.version}-bin</ignite.zip.pattern>
</properties>
<scm>
@@ -490,8 +490,8 @@
<configuration>
<failOnError>false</failOnError>
<target>
- <attachartifact file="${basedir}/target/bin/ignite-fabric-${project.version}.zip" classifier="fabric" type="zip" />
- <attachartifact file="${basedir}/target/bin/ignite-hadoop-${project.version}.zip" classifier="hadoop" type="zip" />
+ <attachartifact file="${basedir}/target/bin/ignite-fabric-${project.version}-bin.zip" classifier="fabric" type="zip" />
+ <attachartifact file="${basedir}/target/bin/ignite-hadoop-${project.version}-bin.zip" classifier="hadoop" type="zip" />
</target>
</configuration>
</execution>
[06/18] incubator-ignite git commit: revert IGNITE-927 Revisit
license packaging
Posted by sb...@apache.org.
revert
IGNITE-927
Revisit license packaging
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ec8df69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ec8df69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ec8df69
Branch: refs/heads/ignite-471-2
Commit: 7ec8df69b8fa385e765dbaf3df481a5fb7a72a97
Parents: 0a4b126
Author: avinogradov <av...@gridgain.com>
Authored: Wed May 20 16:27:15 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Wed May 20 16:27:15 2015 +0300
----------------------------------------------------------------------
modules/ssh/licenses/jcraft-revised-bsd.txt | 28 ++++++++++++++++++++
modules/tools/licenses/jodd-revised-bsd.txt | 21 +++++++++++++++
.../licenses/jcraft-revised-bsd.txt | 28 ++++++++++++++++++++
3 files changed, 77 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ec8df69/modules/ssh/licenses/jcraft-revised-bsd.txt
----------------------------------------------------------------------
diff --git a/modules/ssh/licenses/jcraft-revised-bsd.txt b/modules/ssh/licenses/jcraft-revised-bsd.txt
new file mode 100644
index 0000000..3748f98
--- /dev/null
+++ b/modules/ssh/licenses/jcraft-revised-bsd.txt
@@ -0,0 +1,28 @@
+3-clause BSD license
+------------------------------------------------------------------------------
+Copyright (c) 2002-2014 Atsuhiko Yamanaka, JCraft,Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+
+ 3. The names of the authors may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ec8df69/modules/tools/licenses/jodd-revised-bsd.txt
----------------------------------------------------------------------
diff --git a/modules/tools/licenses/jodd-revised-bsd.txt b/modules/tools/licenses/jodd-revised-bsd.txt
new file mode 100644
index 0000000..129f3f0
--- /dev/null
+++ b/modules/tools/licenses/jodd-revised-bsd.txt
@@ -0,0 +1,21 @@
+Jodd software is released under Revised BSD License.
+
+Copyright (c) 2003-2014, Jodd Team All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+Neither the name of the Jodd nor the names of its contributors may be used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ec8df69/modules/visor-console/licenses/jcraft-revised-bsd.txt
----------------------------------------------------------------------
diff --git a/modules/visor-console/licenses/jcraft-revised-bsd.txt b/modules/visor-console/licenses/jcraft-revised-bsd.txt
new file mode 100644
index 0000000..3748f98
--- /dev/null
+++ b/modules/visor-console/licenses/jcraft-revised-bsd.txt
@@ -0,0 +1,28 @@
+3-clause BSD license
+------------------------------------------------------------------------------
+Copyright (c) 2002-2014 Atsuhiko Yamanaka, JCraft,Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+
+ 3. The names of the authors may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
[13/18] incubator-ignite git commit: ignite-471-2: keep fixing tests
Posted by sb...@apache.org.
ignite-471-2: keep fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/df8ec602
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/df8ec602
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/df8ec602
Branch: refs/heads/ignite-471-2
Commit: df8ec602b278ae246b3d1aa0f41b923f948226ad
Parents: 119acfd
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu May 21 11:33:59 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu May 21 11:33:59 2015 +0300
----------------------------------------------------------------------
.../ignite/testsuites/IgniteBasicTestSuite.java | 4 ++--
...gniteCacheP2pUnmarshallingErrorTestSuit.java | 20 ++++++++++++++++----
2 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df8ec602/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index ed8579f..561b2a8 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@ -47,7 +47,7 @@ public class IgniteBasicTestSuite extends TestSuite {
}
/**
- * @param ignoredTests
+ * @param ignoredTests Tests don't include in the execution.
* @return Test suite.
* @throws Exception Thrown in case of the failure.
*/
@@ -62,7 +62,7 @@ public class IgniteBasicTestSuite extends TestSuite {
suite.addTest(IgniteStartUpTestSuite.suite());
suite.addTest(IgniteExternalizableSelfTestSuite.suite());
suite.addTest(IgniteP2PSelfTestSuite.suite());
- suite.addTest(IgniteCacheP2pUnmarshallingErrorTestSuit.suite());
+ suite.addTest(IgniteCacheP2pUnmarshallingErrorTestSuit.suite(ignoredTests));
suite.addTestSuite(GridSelfTest.class);
suite.addTestSuite(GridProjectionSelfTest.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df8ec602/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuit.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuit.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuit.java
index 9b40280..ebf904e 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuit.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheP2pUnmarshallingErrorTestSuit.java
@@ -19,6 +19,9 @@ package org.apache.ignite.testsuites;
import junit.framework.*;
import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.testframework.*;
+
+import java.util.*;
/**
* Checks behavior on exception while unmarshalling key.
@@ -29,12 +32,21 @@ public class IgniteCacheP2pUnmarshallingErrorTestSuit extends TestSuite {
* @throws Exception If failed.
*/
public static TestSuite suite() throws Exception {
+ return suite(null);
+ }
+
+ /**
+ * @param ignoredTests Tests don't include in the execution.
+ * @return Test suite.
+ * @throws Exception Thrown in case of the failure.
+ */
+ public static TestSuite suite(Set<Class> ignoredTests) throws Exception {
TestSuite suite = new TestSuite("P2p Unmarshalling Test Suite");
- suite.addTestSuite(IgniteCacheP2pUnmarshallingErrorTest.class);
- suite.addTestSuite(IgniteCacheP2pUnmarshallingNearErrorTest.class);
- suite.addTestSuite(IgniteCacheP2pUnmarshallingRebalanceErrorTest.class);
- suite.addTestSuite(IgniteCacheP2pUnmarshallingTxErrorTest.class);
+ GridTestUtils.addTestIfNeeded(suite, IgniteCacheP2pUnmarshallingErrorTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, IgniteCacheP2pUnmarshallingNearErrorTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, IgniteCacheP2pUnmarshallingRebalanceErrorTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, IgniteCacheP2pUnmarshallingTxErrorTest.class, ignoredTests);
return suite;
}
[02/18] incubator-ignite git commit: "Version changed
Posted by sb...@apache.org.
"Version changed
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c4d81fec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c4d81fec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c4d81fec
Branch: refs/heads/ignite-471-2
Commit: c4d81fec5546a748b2a67f6ddeffac2fc8b52d3a
Parents: fa07e18
Author: Ignite Teamcity <ig...@apache.org>
Authored: Wed May 20 13:31:58 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Wed May 20 13:31:58 2015 +0300
----------------------------------------------------------------------
modules/core/src/main/resources/ignite.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4d81fec/modules/core/src/main/resources/ignite.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/ignite.properties b/modules/core/src/main/resources/ignite.properties
index aec41ea..58aed26 100644
--- a/modules/core/src/main/resources/ignite.properties
+++ b/modules/core/src/main/resources/ignite.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-ignite.version=1.0.6-SNAPSHOT1.0.6
+ignite.version=1.0.6
ignite.build=0
ignite.revision=DEV
ignite.rel.date=01011970
[12/18] incubator-ignite git commit: ignite-471-2: keep fixing tests
Posted by sb...@apache.org.
ignite-471-2: keep fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/119acfd4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/119acfd4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/119acfd4
Branch: refs/heads/ignite-471-2
Commit: 119acfd4a55190e95dbef751395bf854d247db51
Parents: 713c0e6
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu May 21 11:04:20 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu May 21 11:04:20 2015 +0300
----------------------------------------------------------------------
.../internal/util/nio/GridNioSelfTest.java | 25 +++++++++++---------
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +-
.../testsuites/IgniteUtilSelfTestSuite.java | 14 ++++++++++-
3 files changed, 28 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/119acfd4/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
index e3baeb0..254d3ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
@@ -644,7 +644,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
try {
client = createClient(U.getLocalHost(), PORT, U.getLocalHost());
- MessageWithId msg = new MessageWithId();
+ MessageWithId msg = new MessageWithId(idProvider.getAndIncrement());
byte[] data = serializeMessage(msg);
@@ -746,7 +746,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
client = createClient(U.getLocalHost(), PORT, U.getLocalHost());
while (cntr.getAndIncrement() < MSG_CNT * THREAD_CNT) {
- MessageWithId msg = new MessageWithId();
+ MessageWithId msg = new MessageWithId(idProvider.getAndIncrement());
byte[] data = serializeMessage(msg);
@@ -829,13 +829,11 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
U.sleep(4000);
info("After sleep.");
- }
- catch (Exception e) {
+ } catch (Exception e) {
error("Failed to create client: " + e.getMessage());
fail("Failed to create client: " + e.getMessage());
- }
- finally {
+ } finally {
info("Test thread finished.");
}
}
@@ -904,13 +902,11 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
U.sleep(4000);
info("After sleep.");
- }
- catch (Exception e) {
+ } catch (Exception e) {
error("Failed to create client: ", e);
fail("Failed to create client: " + e.getMessage());
- }
- finally {
+ } finally {
info("Test thread finished.");
}
}
@@ -1408,7 +1404,14 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
*/
private static class MessageWithId implements Serializable {
/** */
- private final int id = idProvider.getAndIncrement();
+ private final int id;
+
+ /**
+ * @param id Message ID.
+ */
+ public MessageWithId(int id) {
+ this.id = id;
+ }
/** */
@SuppressWarnings({"unused"})
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/119acfd4/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index 1a642d4..ed8579f 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@ -55,7 +55,7 @@ public class IgniteBasicTestSuite extends TestSuite {
TestSuite suite = new TestSuite("Ignite Basic Test Suite");
suite.addTest(IgniteLangSelfTestSuite.suite());
- suite.addTest(IgniteUtilSelfTestSuite.suite());
+ suite.addTest(IgniteUtilSelfTestSuite.suite(ignoredTests));
suite.addTest(IgniteMarshallerSelfTestSuite.suite(ignoredTests));
suite.addTest(IgniteKernalSelfTestSuite.suite());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/119acfd4/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
index 32cd038..92ad2e1 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
@@ -26,10 +26,13 @@ import org.apache.ignite.internal.util.offheap.unsafe.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.spi.discovery.*;
+import org.apache.ignite.testframework.*;
import org.apache.ignite.thread.*;
import org.apache.ignite.util.*;
import org.apache.ignite.util.mbeans.*;
+import java.util.*;
+
/**
* Test suite for Ignite utility classes.
*/
@@ -39,6 +42,15 @@ public class IgniteUtilSelfTestSuite extends TestSuite {
* @throws Exception If failed.
*/
public static TestSuite suite() throws Exception {
+ return suite(null);
+ }
+
+ /**
+ * @param ignoredTests Tests don't include in the execution.
+ * @return Test suite.
+ * @throws Exception Thrown in case of the failure.
+ */
+ public static TestSuite suite(Set<Class> ignoredTests) throws Exception {
TestSuite suite = new TestSuite("Ignite Util Test Suite");
suite.addTestSuite(GridThreadPoolExecutorServiceSelfTest.class);
@@ -66,7 +78,7 @@ public class IgniteUtilSelfTestSuite extends TestSuite {
suite.addTestSuite(GridNioSessionMetaKeySelfTest.class);
suite.addTestSuite(GridNioSelfTest.class);
suite.addTestSuite(GridNioFilterChainSelfTest.class);
- suite.addTestSuite(GridNioSslSelfTest.class);
+ GridTestUtils.addTestIfNeeded(suite, GridNioSslSelfTest.class, ignoredTests);
suite.addTestSuite(GridNioDelimitedBufferTest.class);
return suite;
[14/18] incubator-ignite git commit: ignite-471-2: keep fixing tests
Posted by sb...@apache.org.
ignite-471-2: keep fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bdacb9a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bdacb9a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bdacb9a6
Branch: refs/heads/ignite-471-2
Commit: bdacb9a61f4211024b45d509b9e30ea96bd916c5
Parents: df8ec60
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu May 21 12:00:22 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu May 21 12:00:22 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/testsuites/IgniteBasicTestSuite.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdacb9a6/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index 561b2a8..b703a16 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@ -26,11 +26,9 @@ import org.apache.ignite.internal.processors.closure.*;
import org.apache.ignite.internal.processors.continuous.*;
import org.apache.ignite.internal.product.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.messaging.*;
import org.apache.ignite.spi.*;
-import org.apache.ignite.testframework.config.*;
+import org.apache.ignite.testframework.*;
import java.util.*;
@@ -72,7 +70,7 @@ public class IgniteBasicTestSuite extends TestSuite {
if (U.isLinux() || U.isMacOs())
suite.addTest(IgniteIpcSharedMemorySelfTestSuite.suite());
- suite.addTestSuite(GridReleaseTypeSelfTest.class);
+ GridTestUtils.addTestIfNeeded(suite, GridReleaseTypeSelfTest.class, ignoredTests);
suite.addTestSuite(GridProductVersionSelfTest.class);
suite.addTestSuite(GridAffinityProcessorRendezvousSelfTest.class);
suite.addTestSuite(GridClosureProcessorSelfTest.class);
[05/18] incubator-ignite git commit: IGNITE-926 Revisit artifacts
namings
Posted by sb...@apache.org.
IGNITE-926
Revisit artifacts namings
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0a4b1267
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0a4b1267
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0a4b1267
Branch: refs/heads/ignite-471-2
Commit: 0a4b12670e6f38229690288eaadde776d380c600
Parents: 7367912
Author: avinogradov <av...@gridgain.com>
Authored: Wed May 20 16:03:48 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Wed May 20 16:03:48 2015 +0300
----------------------------------------------------------------------
pom.xml | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a4b1267/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 29ef8ed..b91c904 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
</parent>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite</artifactId>
+ <artifactId>apache-ignite</artifactId>
<version>1.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -39,7 +39,7 @@
<ignite.site>scp://localhost:/home</ignite.site>
<ignite.site.folder>${project.artifactId}-${project.version}</ignite.site.folder>
<!--fix <attachartifact>...< /> at apache-release profile if changed-->
- <ignite.zip.pattern>ignite-${ignite.edition}-${project.version}-bin</ignite.zip.pattern>
+ <ignite.zip.pattern>${project.artifactId}-${ignite.edition}-${project.version}-bin</ignite.zip.pattern>
</properties>
<scm>
@@ -470,7 +470,7 @@
<descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
</descriptorRefs>
<tarLongFileMode>gnu</tarLongFileMode>
- <finalName>ignite-${project.version}-src</finalName>
+ <finalName>${project.artifactId}-${project.version}-src</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
@@ -482,7 +482,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>attach-artifact</id>
+ <id>attach-artifact</id><!-- allows to sign *bin.zip files -->
<phase>package</phase>
<goals>
<goal>run</goal>
@@ -490,8 +490,8 @@
<configuration>
<failOnError>false</failOnError>
<target>
- <attachartifact file="${basedir}/target/bin/ignite-fabric-${project.version}-bin.zip" classifier="fabric" type="zip" />
- <attachartifact file="${basedir}/target/bin/ignite-hadoop-${project.version}-bin.zip" classifier="hadoop" type="zip" />
+ <attachartifact file="${basedir}/target/bin/${project.artifactId}-fabric-${project.version}-bin.zip" classifier="fabric" type="zip" />
+ <attachartifact file="${basedir}/target/bin/${project.artifactId}-hadoop-${project.version}-bin.zip" classifier="hadoop" type="zip" />
</target>
</configuration>
</execution>
@@ -538,7 +538,7 @@
<fileSet>
<directory>${basedir}/target</directory>
<includes>
- <include>ignite-${project.version}-src.zip</include>
+ <include>${project.artifactId}-${project.version}-src.zip</include>
<include>bin/*.zip</include>
</includes>
</fileSet>
@@ -566,10 +566,10 @@
<failOnError>false</failOnError>
<target>
<mkdir dir="${basedir}/target/site" />
- <copy file="${basedir}/target/ignite-${project.version}-src.zip" tofile="${basedir}/target/site/ignite-${project.version}-src.zip" failonerror="false" />
- <copy file="${basedir}/target/ignite-${project.version}-src.zip.asc" tofile="${basedir}/target/site/ignite-${project.version}-src.zip.asc" failonerror="false" />
- <copy file="${basedir}/target/ignite-${project.version}-src.zip.md5" tofile="${basedir}/target/site/ignite-${project.version}-src.zip.md5" failonerror="false" />
- <copy file="${basedir}/target/ignite-${project.version}-src.zip.sha1" tofile="${basedir}/target/site/ignite-${project.version}-src.zip.sha1" failonerror="false" />
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-src.zip" tofile="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip" failonerror="false" />
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-src.zip.asc" tofile="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.asc" failonerror="false" />
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-src.zip.md5" tofile="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.md5" failonerror="false" />
+ <copy file="${basedir}/target/${project.artifactId}-${project.version}-src.zip.sha1" tofile="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.sha1" failonerror="false" />
<copy todir="${basedir}/target/site">
<fileset dir="${basedir}/target/bin">
<include name="**/*" />
[16/18] incubator-ignite git commit: ignite-471-2: keep fixing tests
Posted by sb...@apache.org.
ignite-471-2: keep fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/806bf198
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/806bf198
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/806bf198
Branch: refs/heads/ignite-471-2
Commit: 806bf198e1e28323fb9d7ac7879715a3198ec856
Parents: 156ebb1
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu May 21 12:34:40 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu May 21 12:34:40 2015 +0300
----------------------------------------------------------------------
.../internal/GridFailFastNodeFailureDetectionSelfTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/806bf198/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
index 46512fe..563e960 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
@@ -63,7 +63,9 @@ public class GridFailFastNodeFailureDetectionSelfTest extends GridCommonAbstract
* @throws Exception If failed.
*/
public void testFailFast() throws Exception {
- startGridsMultiThreaded(5);
+ throw new IgniteCheckedException("https://issues.apache.org/jira/browse/IGNITE-933");
+
+ /*startGridsMultiThreaded(5);
final CountDownLatch failLatch = new CountDownLatch(4);
@@ -98,7 +100,7 @@ public class GridFailFastNodeFailureDetectionSelfTest extends GridCommonAbstract
failNode(ignite1);
- assert failLatch.await(500, TimeUnit.MILLISECONDS);
+ assert failLatch.await(500, TimeUnit.MILLISECONDS);*/
}
/**
[09/18] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-5' into ignite-sprint-5
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4b4158f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4b4158f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4b4158f7
Branch: refs/heads/ignite-471-2
Commit: 4b4158f752ee1565539ca4977464f8d7ee6de40b
Parents: c60ed9b 3cc3fbe
Author: avinogradov <av...@gridgain.com>
Authored: Wed May 20 19:23:04 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Wed May 20 19:23:04 2015 +0300
----------------------------------------------------------------------
dev-tools/build.gradle | 35 +-
dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 51017 bytes
.../gradle/wrapper/gradle-wrapper.properties | 6 +
dev-tools/gradlew | 164 ++++++++++
dev-tools/src/main/groovy/jiraslurp.groovy | 326 ++++++++++++++-----
parent/pom.xml | 4 +
6 files changed, 442 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b4158f7/parent/pom.xml
----------------------------------------------------------------------
[10/18] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-5' into ignite-471-2
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-471-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cf0222d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cf0222d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cf0222d7
Branch: refs/heads/ignite-471-2
Commit: cf0222d7f7bdd3579cd7a2664e9346498ce67f61
Parents: cb3bc8f 4b4158f
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu May 21 08:39:11 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu May 21 08:39:11 2015 +0300
----------------------------------------------------------------------
dev-tools/build.gradle | 35 +-
dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 51017 bytes
.../gradle/wrapper/gradle-wrapper.properties | 6 +
dev-tools/gradlew | 164 ++++++++++
dev-tools/src/main/groovy/jiraslurp.groovy | 326 ++++++++++++++-----
modules/core/src/main/java/META-INF/LICENSE | 238 ++++++++++++++
modules/core/src/main/java/META-INF/NOTICE | 12 +
.../core/src/main/resources/ignite.properties | 2 +-
parent/pom.xml | 5 +-
pom.xml | 41 ++-
10 files changed, 722 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
[15/18] incubator-ignite git commit: ignite-471-2: keep fixing tests
Posted by sb...@apache.org.
ignite-471-2: keep fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/156ebb17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/156ebb17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/156ebb17
Branch: refs/heads/ignite-471-2
Commit: 156ebb17d864ec1087526a2a37a9a6b79a356808
Parents: bdacb9a
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu May 21 12:23:04 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu May 21 12:23:04 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/GridDiscoveryEventSelfTest.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/156ebb17/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
index 59a4f5d..9d3a22d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
@@ -100,7 +100,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
@Override public boolean apply(Event evt) {
assert evt.type() == EVT_NODE_JOINED;
- evts.put(cnt.getAndIncrement(), ((DiscoveryEvent) evt).topologyNodes());
+ evts.put(cnt.getAndIncrement(), ((DiscoveryEvent)evt).topologyNodes());
latch.countDown();
@@ -147,7 +147,8 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testLeaveSequenceEvents() throws Exception {
- try {
+ throw new IgniteCheckedException("https://issues.apache.org/jira/browse/IGNITE-932");
+ /*try {
Ignite g0 = startGrid(0);
UUID id0 = g0.cluster().localNode().id();
@@ -208,14 +209,15 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
}
finally {
stopAllGrids();
- }
+ }*/
}
/**
* @throws Exception If failed.
*/
public void testMixedSequenceEvents() throws Exception {
- try {
+ throw new IgniteCheckedException("https://issues.apache.org/jira/browse/IGNITE-932");
+ /*try {
Ignite g0 = startGrid(0);
UUID id0 = g0.cluster().localNode().id();
@@ -326,7 +328,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
}
finally {
stopAllGrids();
- }
+ }*/
}
/**
[08/18] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-4' into ignite-sprint-5
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5
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/c60ed9b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c60ed9b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c60ed9b1
Branch: refs/heads/ignite-471-2
Commit: c60ed9b160adc5824dd72839fea24e523a71d512
Parents: c4d81fe cff73bf
Author: avinogradov <av...@gridgain.com>
Authored: Wed May 20 19:22:46 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Wed May 20 19:22:46 2015 +0300
----------------------------------------------------------------------
modules/core/src/main/java/META-INF/LICENSE | 238 +++++++++++++++++++++++
modules/core/src/main/java/META-INF/NOTICE | 12 ++
parent/pom.xml | 1 -
pom.xml | 37 +++-
4 files changed, 277 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c60ed9b1/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0c6d0ba,26f5456..537b8f9
--- a/pom.xml
+++ b/pom.xml
@@@ -36,8 -36,10 +36,8 @@@
<packaging>pom</packaging>
<properties>
- <ignite.site>scp://localhost:/home</ignite.site>
- <ignite.site.folder>${project.artifactId}-${project.version}</ignite.site.folder>
<!--fix <attachartifact>...< /> at apache-release profile if changed-->
- <ignite.zip.pattern>ignite-${ignite.edition}-${project.version}</ignite.zip.pattern>
+ <ignite.zip.pattern>${project.artifactId}-${ignite.edition}-${project.version}-bin</ignite.zip.pattern>
</properties>
<scm>
[17/18] incubator-ignite git commit: ignite-471-2: keep fixing tests
Posted by sb...@apache.org.
ignite-471-2: keep fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2f9f662
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2f9f662
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2f9f662
Branch: refs/heads/ignite-471-2
Commit: f2f9f662078c4c8994085588fdda9aa80db0ae6f
Parents: 806bf19
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu May 21 12:44:51 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu May 21 12:44:51 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f9f662/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java
index c71ccbb..849b271 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java
@@ -98,6 +98,8 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest
*/
@SuppressWarnings("unchecked")
public void testDeployment() throws Exception {
+ throw new IgniteCheckedException("https://issues.apache.org/jira/browse/IGNITE-934");
+ /*
Ignite ignite = startGrid(GRID_NAME);
Class cls = getExternalClassLoader().loadClass(TEST_TASK_1);
@@ -113,5 +115,6 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest
compute(ignite.cluster().forRemotes()).execute(cls, null);
stopGrid(GRID_NAME);
+ */
}
}
[11/18] incubator-ignite git commit: ignite-471-2: added portable
specific test for affinity tests
Posted by sb...@apache.org.
ignite-471-2: added portable specific test for affinity tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/713c0e65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/713c0e65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/713c0e65
Branch: refs/heads/ignite-471-2
Commit: 713c0e6532a0bdf666d122a15f5d4846055a7bc4
Parents: cf0222d
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu May 21 10:08:07 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu May 21 10:08:07 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAffinityRoutingSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/713c0e65/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
index 6c9e157..78ecf08 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
@@ -169,7 +169,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest {
/**
* Test key.
*/
- private static class AffinityTestKey {
+ protected static class AffinityTestKey {
/** Affinity key. */
@AffinityKeyMapped
private final int affKey;