You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2018/09/15 03:25:36 UTC
ignite git commit: IGNITE-9594 Fixed regression in release build for
ignite-zookeeper module introduced by IGNITE-9073. Apache Curator requies
Jackson 1.x at runtime.
Repository: ignite
Updated Branches:
refs/heads/master b263dc150 -> 838c41a70
IGNITE-9594 Fixed regression in release build for ignite-zookeeper module introduced by IGNITE-9073.
Apache Curator requies Jackson 1.x at runtime.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/838c41a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/838c41a7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/838c41a7
Branch: refs/heads/master
Commit: 838c41a707a67f8e19e5b236f0a01bfb732349c1
Parents: b263dc1
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Sat Sep 15 10:25:26 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Sat Sep 15 10:25:26 2018 +0700
----------------------------------------------------------------------
modules/zookeeper/pom.xml | 14 +++++++++++---
.../ipfinder/zk/TcpDiscoveryZookeeperIpFinder.java | 6 +++---
parent/pom.xml | 1 +
3 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/838c41a7/modules/zookeeper/pom.xml
----------------------------------------------------------------------
diff --git a/modules/zookeeper/pom.xml b/modules/zookeeper/pom.xml
index 9c42e47..8b338b2 100644
--- a/modules/zookeeper/pom.xml
+++ b/modules/zookeeper/pom.xml
@@ -71,10 +71,18 @@
<version>${guava16.version}</version>
</dependency>
+ <!-- Do not remove org.codehaus.jackson:jackson-core-asl it is required by Apache Curator at runtime -->
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson1.version}</version>
+ </dependency>
+
+ <!-- Do not remove org.codehaus.jackson:jackson-mapper-asl it is required by Apache Curator at runtime -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson1.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/838c41a7/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/TcpDiscoveryZookeeperIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/TcpDiscoveryZookeeperIpFinder.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/TcpDiscoveryZookeeperIpFinder.java
index 31d118b..93837a8 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/TcpDiscoveryZookeeperIpFinder.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/TcpDiscoveryZookeeperIpFinder.java
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
-import com.fasterxml.jackson.annotation.JsonRootName;
import com.google.common.collect.Sets;
import org.apache.curator.RetryPolicy;
import org.apache.curator.framework.CuratorFramework;
@@ -44,6 +43,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.resources.LoggerResource;
import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter;
+import org.codehaus.jackson.map.annotate.JsonRootName;
/**
* This TCP Discovery IP Finder uses Apache ZooKeeper (ZK) to locate peer nodes when bootstrapping in order to join
@@ -111,7 +111,7 @@ public class TcpDiscoveryZookeeperIpFinder extends TcpDiscoveryIpFinderAdapter {
private String serviceName = SERVICE_NAME;
/** Whether to allow or not duplicate registrations. See setter doc. */
- private boolean allowDuplicateRegistrations = false;
+ private boolean allowDuplicateRegistrations;
/** The Service Discovery recipe. */
private ServiceDiscovery<IgniteInstanceDetails> discovery;
@@ -131,7 +131,7 @@ public class TcpDiscoveryZookeeperIpFinder extends TcpDiscoveryIpFinderAdapter {
String sysPropZkConnString = System.getProperty(PROP_ZK_CONNECTION_STRING);
- if (sysPropZkConnString != null && sysPropZkConnString.trim().length() > 0)
+ if (sysPropZkConnString != null && !sysPropZkConnString.trim().isEmpty())
zkConnectionString = sysPropZkConnString;
if (log.isInfoEnabled())
http://git-wip-us.apache.org/repos/asf/ignite/blob/838c41a7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d91bb86..db6d234 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -75,6 +75,7 @@
<httpclient.version>4.5.1</httpclient.version>
<httpcore.version>4.4.3</httpcore.version>
<jackson.version>2.9.6</jackson.version>
+ <jackson1.version>1.9.13</jackson1.version>
<javassist.version>3.20.0-GA</javassist.version>
<javax.cache.bundle.version>1.0.0_1</javax.cache.bundle.version>
<javax.cache.tck.version>1.0.1</javax.cache.tck.version>