You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2016/07/06 01:46:18 UTC
[1/3] ignite git commit: IGNITE-2949 - Replaced JCache dependency
with Geronimo
Repository: ignite
Updated Branches:
refs/heads/master 2fdc32180 -> c44ee6392
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/2d40ae67
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2d40ae67
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2d40ae67
Branch: refs/heads/master
Commit: 2d40ae67248fbb626bda59073d9dc649d93e650a
Parents: df16a75
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Tue Jul 5 18:09:10 2016 -0700
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Tue Jul 5 18:33:01 2016 -0700
----------------------------------------------------------------------
assembly/LICENSE_FABRIC | 8 +-------
assembly/LICENSE_HADOOP | 6 ------
examples/pom-standalone-lgpl.xml | 6 +++---
examples/pom-standalone.xml | 6 +++---
examples/pom.xml | 6 +++---
examples/schema-import/pom-standalone.xml | 6 +++---
examples/schema-import/pom.xml | 6 +++---
modules/cassandra/pom.xml | 4 ++--
modules/core/pom.xml | 6 +++---
modules/flume/README.txt | 2 +-
parent/pom.xml | 1 -
11 files changed, 22 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d40ae67/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/2d40ae67/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/2d40ae67/examples/pom-standalone-lgpl.xml
----------------------------------------------------------------------
diff --git a/examples/pom-standalone-lgpl.xml b/examples/pom-standalone-lgpl.xml
index 7e7ccc2..951fab6 100644
--- a/examples/pom-standalone-lgpl.xml
+++ b/examples/pom-standalone-lgpl.xml
@@ -41,9 +41,9 @@
<dependencies>
<dependency>
- <groupId>javax.cache</groupId>
- <artifactId>cache-api</artifactId>
- <version>1.0.0</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcache_1.0_spec</artifactId>
+ <version>1.0-alpha-1</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d40ae67/examples/pom-standalone.xml
----------------------------------------------------------------------
diff --git a/examples/pom-standalone.xml b/examples/pom-standalone.xml
index 6247ced..20399ee 100644
--- a/examples/pom-standalone.xml
+++ b/examples/pom-standalone.xml
@@ -41,9 +41,9 @@
<dependencies>
<dependency>
- <groupId>javax.cache</groupId>
- <artifactId>cache-api</artifactId>
- <version>1.0.0</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcache_1.0_spec</artifactId>
+ <version>1.0-alpha-1</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d40ae67/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 979a46f..cba056d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -32,9 +32,9 @@
<dependencies>
<dependency>
- <groupId>javax.cache</groupId>
- <artifactId>cache-api</artifactId>
- <version>${javax.cache.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcache_1.0_spec</artifactId>
+ <version>1.0-alpha-1</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d40ae67/examples/schema-import/pom-standalone.xml
----------------------------------------------------------------------
diff --git a/examples/schema-import/pom-standalone.xml b/examples/schema-import/pom-standalone.xml
index e443728..43b76d8 100644
--- a/examples/schema-import/pom-standalone.xml
+++ b/examples/schema-import/pom-standalone.xml
@@ -36,9 +36,9 @@
<dependencies>
<dependency>
- <groupId>javax.cache</groupId>
- <artifactId>cache-api</artifactId>
- <version>1.0.0</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcache_1.0_spec</artifactId>
+ <version>1.0-alpha-1</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d40ae67/examples/schema-import/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml
index b6e36ef..f5ccac0 100644
--- a/examples/schema-import/pom.xml
+++ b/examples/schema-import/pom.xml
@@ -39,9 +39,9 @@
<dependencies>
<dependency>
- <groupId>javax.cache</groupId>
- <artifactId>cache-api</artifactId>
- <version>${javax.cache.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcache_1.0_spec</artifactId>
+ <version>1.0-alpha-1</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d40ae67/modules/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cassandra/pom.xml b/modules/cassandra/pom.xml
index e8e46b4..c9ff87d 100644
--- a/modules/cassandra/pom.xml
+++ b/modules/cassandra/pom.xml
@@ -236,7 +236,7 @@
org.apache.ignite,org.springframework,org.gridgain
</excludeGroupIds>
<excludeArtifactIds>
- commons-logging,slf4j-api,cache-api,slf4j-api,aopalliance
+ commons-logging,slf4j-api,geronimo-jcache_1.0_spec,slf4j-api,aopalliance
</excludeArtifactIds>
<includeScope>runtime</includeScope>
</configuration>
@@ -334,4 +334,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d40ae67/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 5e32caf..7529b0b 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -63,9 +63,9 @@
<dependencies>
<dependency>
- <groupId>javax.cache</groupId>
- <artifactId>cache-api</artifactId>
- <version>${javax.cache.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcache_1.0_spec</artifactId>
+ <version>1.0-alpha-1</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d40ae67/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/2d40ae67/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d78deac..9fbc78d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -76,7 +76,6 @@
<jackson.version>1.9.13</jackson.version>
<jackson2.version>2.7.5</jackson2.version>
<javax.cache.bundle.version>1.0.0_1</javax.cache.bundle.version>
- <javax.cache.version>1.0.0</javax.cache.version>
<jetty.version>9.2.11.v20150529</jetty.version>
<jms.spec.version>1.1.1</jms.spec.version>
<jsch.bundle.version>0.1.53_1</jsch.bundle.version>
[3/3] ignite git commit: Merge branch 'gridgain-7.6.2'
Posted by vk...@apache.org.
Merge branch 'gridgain-7.6.2'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c44ee639
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c44ee639
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c44ee639
Branch: refs/heads/master
Commit: c44ee639210301bf386af986396b120698df3133
Parents: 2fdc321 3b22e83
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Tue Jul 5 18:44:36 2016 -0700
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Tue Jul 5 18:44:36 2016 -0700
----------------------------------------------------------------------
assembly/LICENSE_FABRIC | 8 +-------
assembly/LICENSE_HADOOP | 6 ------
examples/pom-standalone-lgpl.xml | 6 +++---
examples/pom-standalone.xml | 6 +++---
examples/pom.xml | 6 +++---
examples/schema-import/pom-standalone.xml | 6 +++---
examples/schema-import/pom.xml | 6 +++---
modules/cassandra/pom.xml | 4 ++--
modules/core/pom.xml | 6 +++---
modules/flume/README.txt | 2 +-
modules/kafka/README.txt | 4 ++--
.../dotnet/Apache.Ignite.Core.Tests/DeploymentTest.cs | 4 ++--
parent/pom.xml | 1 -
13 files changed, 26 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
[2/3] ignite git commit: IGNITE-2949 - Replaced JCache dependency
with Geronimo
Posted by vk...@apache.org.
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/3b22e83f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3b22e83f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3b22e83f
Branch: refs/heads/master
Commit: 3b22e83fd7684d93bfa9c58059206c07820df506
Parents: 2d40ae6
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Tue Jul 5 18:41:38 2016 -0700
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Tue Jul 5 18:41:38 2016 -0700
----------------------------------------------------------------------
modules/kafka/README.txt | 4 ++--
.../platforms/dotnet/Apache.Ignite.Core.Tests/DeploymentTest.cs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3b22e83f/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/3b22e83f/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 cd23724..e890dc8 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/DeploymentTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/DeploymentTest.cs
@@ -45,7 +45,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();
@@ -87,7 +87,7 @@ namespace Apache.Ignite.Core.Tests
{
VerifyNodeStarted(exePath);
}
- finally
+ finally
{
proc.Kill();