You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2018/10/09 06:02:03 UTC
ignite git commit: IGNITE-9728: Java 11: fix IGNITE_HOME setup for
tests,
added required dependencies to Hibernate module (for the moment - tests only).
This closes #4901.
Repository: ignite
Updated Branches:
refs/heads/master fe85345f3 -> d6400c69f
IGNITE-9728: Java 11: fix IGNITE_HOME setup for tests, added required dependencies to Hibernate module (for the moment - tests only). This closes #4901.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6400c69
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6400c69
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6400c69
Branch: refs/heads/master
Commit: d6400c69f5c0f0635dd1e474d771430ed338513b
Parents: fe85345
Author: devozerov <pp...@gmail.com>
Authored: Tue Oct 9 09:01:58 2018 +0300
Committer: devozerov <pp...@gmail.com>
Committed: Tue Oct 9 09:01:58 2018 +0300
----------------------------------------------------------------------
.../config/GridTestProperties.java | 10 ++-----
modules/hibernate-4.2/pom.xml | 17 +++++++++++
modules/hibernate-5.1/pom.xml | 30 ++++++++++++++++++++
3 files changed, 49 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6400c69/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
index e2594ca..9f6feab 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
@@ -30,6 +30,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.ignite.binary.BinaryBasicNameMapper;
import org.apache.ignite.binary.BinaryTypeConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.log4j.xml.DOMConfigurator;
import org.jetbrains.annotations.Nullable;
@@ -95,14 +96,7 @@ public final class GridTestProperties {
/** */
static {
// Initialize IGNITE_HOME system property.
- String igniteHome = System.getProperty("IGNITE_HOME");
-
- if (igniteHome == null || igniteHome.isEmpty()) {
- igniteHome = System.getenv("IGNITE_HOME");
-
- if (igniteHome != null && !igniteHome.isEmpty())
- System.setProperty("IGNITE_HOME", igniteHome);
- }
+ U.getIgniteHome();
// Load default properties.
File cfgFile = getTestConfigurationFile(null, TESTS_PROP_FILE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6400c69/modules/hibernate-4.2/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate-4.2/pom.xml b/modules/hibernate-4.2/pom.xml
index 41ac917..5a13c87 100644
--- a/modules/hibernate-4.2/pom.xml
+++ b/modules/hibernate-4.2/pom.xml
@@ -130,6 +130,23 @@
<version>1.4.8</version>
<scope>test</scope>
</dependency>
+
+ <!-- JDK9+ -->
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ <version>1.0.6.Final</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6400c69/modules/hibernate-5.1/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate-5.1/pom.xml b/modules/hibernate-5.1/pom.xml
index ad30124..6528f7b 100644
--- a/modules/hibernate-5.1/pom.xml
+++ b/modules/hibernate-5.1/pom.xml
@@ -130,6 +130,36 @@
<version>1.4.8</version>
<scope>test</scope>
</dependency>
+
+ <!-- JDK9+ -->
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ <version>1.0.6.Final</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.1.14</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.14</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>