Revert IGNITE-2949 due to broken compatibility
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1b7428bd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1b7428bd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1b7428bd Branch: refs/heads/ignite-3414 Commit: 1b7428bde5bac38ac3eb2a8b015d3766f68f5a50 Parents: bebf3f0 Author: Valentin Kulichenko <[email protected]> Authored: Thu Jul 7 00:05:16 2016 -0700 Committer: Valentin Kulichenko <[email protected]> Committed: Thu Jul 7 00:05:16 2016 -0700 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 7 ++++++- assembly/LICENSE_HADOOP | 7 ++++++- 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 | 2 +- modules/core/pom.xml | 6 +++--- modules/flume/README.txt | 2 +- parent/pom.xml | 1 + 11 files changed, 33 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1b7428bd/assembly/LICENSE_FABRIC ---------------------------------------------------------------------- diff --git a/assembly/LICENSE_FABRIC b/assembly/LICENSE_FABRIC index 8cb5730..b9c75b2 100644 --- a/assembly/LICENSE_FABRIC +++ b/assembly/LICENSE_FABRIC @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -227,6 +226,12 @@ 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/1b7428bd/assembly/LICENSE_HADOOP ---------------------------------------------------------------------- diff --git a/assembly/LICENSE_HADOOP b/assembly/LICENSE_HADOOP index 0d05d52..0256b20 100644 --- a/assembly/LICENSE_HADOOP +++ b/assembly/LICENSE_HADOOP @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -227,6 +226,12 @@ 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/1b7428bd/examples/pom-standalone-lgpl.xml ---------------------------------------------------------------------- diff --git a/examples/pom-standalone-lgpl.xml b/examples/pom-standalone-lgpl.xml index 951fab6..7e7ccc2 100644 --- a/examples/pom-standalone-lgpl.xml +++ b/examples/pom-standalone-lgpl.xml @@ -41,9 +41,9 @@ <dependencies> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcache_1.0_spec</artifactId> - <version>1.0-alpha-1</version> + <groupId>javax.cache</groupId> + <artifactId>cache-api</artifactId> + <version>1.0.0</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/1b7428bd/examples/pom-standalone.xml ---------------------------------------------------------------------- diff --git a/examples/pom-standalone.xml b/examples/pom-standalone.xml index 20399ee..6247ced 100644 --- a/examples/pom-standalone.xml +++ b/examples/pom-standalone.xml @@ -41,9 +41,9 @@ <dependencies> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcache_1.0_spec</artifactId> - <version>1.0-alpha-1</version> + <groupId>javax.cache</groupId> + <artifactId>cache-api</artifactId> + <version>1.0.0</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/1b7428bd/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 1c03a24..d8a38d8 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -32,9 +32,9 @@ <dependencies> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcache_1.0_spec</artifactId> - <version>1.0-alpha-1</version> + <groupId>javax.cache</groupId> + <artifactId>cache-api</artifactId> + <version>${javax.cache.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/1b7428bd/examples/schema-import/pom-standalone.xml ---------------------------------------------------------------------- diff --git a/examples/schema-import/pom-standalone.xml b/examples/schema-import/pom-standalone.xml index 43b76d8..e443728 100644 --- a/examples/schema-import/pom-standalone.xml +++ b/examples/schema-import/pom-standalone.xml @@ -36,9 +36,9 @@ <dependencies> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcache_1.0_spec</artifactId> - <version>1.0-alpha-1</version> + <groupId>javax.cache</groupId> + <artifactId>cache-api</artifactId> + <version>1.0.0</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/1b7428bd/examples/schema-import/pom.xml ---------------------------------------------------------------------- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index eb1236d..62bb773 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -39,9 +39,9 @@ <dependencies> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcache_1.0_spec</artifactId> - <version>1.0-alpha-1</version> + <groupId>javax.cache</groupId> + <artifactId>cache-api</artifactId> + <version>${javax.cache.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/1b7428bd/modules/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/modules/cassandra/pom.xml b/modules/cassandra/pom.xml index 2eff19e..3eda256 100644 --- a/modules/cassandra/pom.xml +++ b/modules/cassandra/pom.xml @@ -237,7 +237,7 @@ org.apache.ignite,org.springframework,org.gridgain </excludeGroupIds> <excludeArtifactIds> - commons-logging,slf4j-api,geronimo-jcache_1.0_spec,slf4j-api,aopalliance + commons-logging,slf4j-api,cache-api,slf4j-api,aopalliance </excludeArtifactIds> <includeScope>runtime</includeScope> </configuration> http://git-wip-us.apache.org/repos/asf/ignite/blob/1b7428bd/modules/core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index fe3a477..b80a924 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -63,9 +63,9 @@ <dependencies> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcache_1.0_spec</artifactId> - <version>1.0-alpha-1</version> + <groupId>javax.cache</groupId> + <artifactId>cache-api</artifactId> + <version>${javax.cache.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/1b7428bd/modules/flume/README.txt ---------------------------------------------------------------------- diff --git a/modules/flume/README.txt b/modules/flume/README.txt index 97d8cac..bf7e0ff 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 - |-- geronimo-jcache_1.0_spec-1.0-alpha-1.jar + |-- cache-api-1.0.0.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/1b7428bd/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 6600542..1553612 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -75,6 +75,7 @@ <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>
