Repository: ignite Updated Branches: refs/heads/ignite-2949 6f9c483f7 -> ea0fdc9c9
IGNITE-2949 - Replaced JCache dependency with Geronimo Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea0fdc9c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea0fdc9c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea0fdc9c Branch: refs/heads/ignite-2949 Commit: ea0fdc9c947dc6164196f1f399ed61ddc07b7756 Parents: 6f9c483 Author: Valentin Kulichenko <[email protected]> Authored: Tue Apr 12 19:16:40 2016 -0700 Committer: Valentin Kulichenko <[email protected]> Committed: Tue Apr 12 19:16:40 2016 -0700 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 8 +------- assembly/LICENSE_HADOOP | 6 ------ modules/flume/README.txt | 2 +- modules/kafka/README.txt | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/DeploymentTest.cs | 4 ++-- 5 files changed, 6 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0fdc9c/assembly/LICENSE_FABRIC ---------------------------------------------------------------------- diff --git a/assembly/LICENSE_FABRIC b/assembly/LICENSE_FABRIC index 3f92502..8cb5730 100644 --- a/assembly/LICENSE_FABRIC +++ b/assembly/LICENSE_FABRIC @@ -227,12 +227,6 @@ For details, see CC0 1.0 Universal (1.0), Public Domain Dedication, http://creativecommons.org/publicdomain/zero/1.0/ ============================================================================== -For JSR107 API and SPI (https://github.com/jsr107/jsr107spec) javax.cache:cache-api:jar:1.0.0 -============================================================================== -This product bundles JSR107 API and SPI which is available under a: -JSR-000107 JCACHE 2.9 Public Review - Updated Specification License. For details, see https://raw.github.com/jsr107/jsr107spec/master/LICENSE.txt. - -============================================================================== For JSch (http://www.jcraft.com/jsch/) com.jcraft:jsch:jar:0.1.50 ============================================================================== This product bundles JSch which is available under a: @@ -303,4 +297,4 @@ Eclipse Public License - Version 1.0. For details, see http://www.eclipse.org/or For SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.6.4 ============================================================================== This product bundles SLF4J API Module which is available under a: -MIT License. For details, see http://www.opensource.org/licenses/mit-license.php. \ No newline at end of file +MIT License. For details, see http://www.opensource.org/licenses/mit-license.php. http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0fdc9c/assembly/LICENSE_HADOOP ---------------------------------------------------------------------- diff --git a/assembly/LICENSE_HADOOP b/assembly/LICENSE_HADOOP index 8d4cc62..0d05d52 100644 --- a/assembly/LICENSE_HADOOP +++ b/assembly/LICENSE_HADOOP @@ -227,12 +227,6 @@ For details, see CC0 1.0 Universal (1.0), Public Domain Dedication, http://creativecommons.org/publicdomain/zero/1.0/ ============================================================================== -For JSR107 API and SPI (https://github.com/jsr107/jsr107spec) javax.cache:cache-api:jar:1.0.0 -============================================================================== -This product bundles JSR107 API and SPI which is available under a: -JSR-000107 JCACHE 2.9 Public Review - Updated Specification License. For details, see https://raw.github.com/jsr107/jsr107spec/master/LICENSE.txt. - -============================================================================== For JSch (http://www.jcraft.com/jsch/) com.jcraft:jsch:jar:0.1.50 ============================================================================== This product bundles JSch which is available under a: http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0fdc9c/modules/flume/README.txt ---------------------------------------------------------------------- diff --git a/modules/flume/README.txt b/modules/flume/README.txt index bf7e0ff..97d8cac 100644 --- a/modules/flume/README.txt +++ b/modules/flume/README.txt @@ -20,7 +20,7 @@ plugins.d/ |-- lib | `-- ignite-flume-transformer-x.x.x.jar <-- your jar `-- libext - |-- cache-api-1.0.0.jar + |-- geronimo-jcache_1.0_spec-1.0-alpha-1.jar |-- ignite-core-x.x.x.jar |-- ignite-flume-x.x.x.jar <-- IgniteSink |-- ignite-spring-x.x.x.jar http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0fdc9c/modules/kafka/README.txt ---------------------------------------------------------------------- diff --git a/modules/kafka/README.txt b/modules/kafka/README.txt index 259a4f6..80103a6 100644 --- a/modules/kafka/README.txt +++ b/modules/kafka/README.txt @@ -47,7 +47,7 @@ as described in the following subsection. - ignite-kafka-connect-x.x.x-SNAPSHOT.jar - ignite-core-x.x.x-SNAPSHOT.jar - ignite-spring-x.x.x-SNAPSHOT.jar -- cache-api-1.0.0.jar +- geronimo-jcache_1.0_spec-1.0-alpha-1.jar - spring-aop-4.1.0.RELEASE.jar - spring-beans-4.1.0.RELEASE.jar - spring-context-4.1.0.RELEASE.jar @@ -140,7 +140,7 @@ as described in the following subsection. 1. Put the following jar files on Kafka's classpath - ignite-kafka-connect-x.x.x-SNAPSHOT.jar - ignite-core-x.x.x-SNAPSHOT.jar -- cache-api-1.0.0.jar +- geronimo-jcache_1.0_spec-1.0-alpha-1.jar - ignite-spring-x.x.x-SNAPSHOT.jar - spring-aop-4.1.0.RELEASE.jar - spring-beans-4.1.0.RELEASE.jar http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0fdc9c/modules/platforms/dotnet/Apache.Ignite.Core.Tests/DeploymentTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/DeploymentTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/DeploymentTest.cs index bc764c7..0e19112 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/DeploymentTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/DeploymentTest.cs @@ -46,7 +46,7 @@ namespace Apache.Ignite.Core.Tests // Copy jars var home = IgniteHome.Resolve(null); - var jarNames = new[] {@"\ignite-core-", @"\cache-api-1.0.0.jar", @"\modules\spring\" }; + var jarNames = new[] {@"\ignite-core-", @"\geronimo-jcache_1.0_spec-1.0-alpha-1.jar", @"\modules\spring\" }; var jars = Directory.GetFiles(home, "*.jar", SearchOption.AllDirectories) .Where(jarPath => jarNames.Any(jarPath.Contains)).ToArray(); @@ -88,7 +88,7 @@ namespace Apache.Ignite.Core.Tests { VerifyNodeStarted(exePath); } - finally + finally { proc.Kill();
