ignite-454 jdk8 compatibility fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/796ff52e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/796ff52e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/796ff52e Branch: refs/heads/ignite-454 Commit: 796ff52e9f6de8a8cb1ae300e38fb3dad650f984 Parents: 591b365 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Mar 18 19:44:43 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Mar 18 19:44:43 2015 +0300 ---------------------------------------------------------------------- ...cheAbstractFullApiMultithreadedSelfTest.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 4 +- modules/schema-import/pom.xml | 44 ++++++++++++++------ 3 files changed, 34 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/796ff52e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java index 3a105cc..15be61e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiMultithreadedSelfTest.java @@ -188,7 +188,7 @@ public abstract class GridCacheAbstractFullApiMultithreadedSelfTest extends Grid cacheAsync.get("key" + rnd); - assert cacheAsync.future().get() == rnd; + assert (Integer)cacheAsync.future().get() == rnd; cache.get("wrongKey"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/796ff52e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 181d3e2..57d3560 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -2031,7 +2031,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cacheAsync.getAndReplace("key", 2); - assert cacheAsync.future().get() == 1; + assert (Integer)cacheAsync.future().get() == 1; assert cache.get("key") == 2; @@ -2264,7 +2264,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cacheAsync.getAndRemove("key2"); - assert cacheAsync.future().get() == 2; + assert (Integer)cacheAsync.future().get() == 2; assert cache.get("key2") == null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/796ff52e/modules/schema-import/pom.xml ---------------------------------------------------------------------- diff --git a/modules/schema-import/pom.xml b/modules/schema-import/pom.xml index 802fc4c..fff562d 100644 --- a/modules/schema-import/pom.xml +++ b/modules/schema-import/pom.xml @@ -82,20 +82,38 @@ <profile> <id>jfxrt.jar</id> <activation> - <property> - <name>java.vendor</name> - <value>Oracle Corporation</value> - </property> + <activeByDefault>false</activeByDefault> + <jdk> + [1.7,1.8) + </jdk> </activation> - <!--<dependencies>--> - <!--<dependency>--> - <!--<groupId>javafx</groupId>--> - <!--<artifactId>jfxrt</artifactId>--> - <!--<version>${java.version}</version>--> - <!--<scope>system</scope>--> - <!--<systemPath>${java.home}/lib/jfxrt.jar</systemPath>--> - <!--</dependency>--> - <!--</dependencies>--> + <dependencies> + <dependency> + <groupId>javafx</groupId> + <artifactId>jfxrt</artifactId> + <version>${java.version}</version> + <scope>system</scope> + <systemPath>${java.home}/lib/jfxrt.jar</systemPath> + </dependency> + </dependencies> + </profile> + <profile> + <id>jfxrt8.jar</id> + <activation> + <activeByDefault>false</activeByDefault> + <jdk> + [1.8,) + </jdk> + </activation> + <dependencies> + <dependency> + <groupId>javafx</groupId> + <artifactId>jfxrt</artifactId> + <version>${java.version}</version> + <scope>system</scope> + <systemPath>${java.home}/lib/ext/jfxrt.jar</systemPath> + </dependency> + </dependencies> </profile> </profiles> </project>
