IGNITE-9073 Use jackson2 dependency instead of jackson1 and remove unused dependencies - Fixes #4444.
Signed-off-by: Dmitriy Pavlov <dpav...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/24bd54a7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24bd54a7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24bd54a7 Branch: refs/heads/ignite-8446 Commit: 24bd54a7c38a0f1e73dbfc32bf33914c76c19d9e Parents: 10b5914 Author: zzzadruga <zzzadr...@gmail.com> Authored: Thu Aug 2 18:20:02 2018 +0300 Committer: Dmitriy Pavlov <dpav...@apache.org> Committed: Thu Aug 2 18:20:02 2018 +0300 ---------------------------------------------------------------------- .../src/test/config/aop/aspectj/META-INF/aop.xml | 4 ++-- modules/aws/pom.xml | 18 ------------------ modules/gce/pom.xml | 2 +- modules/kubernetes/pom.xml | 8 ++++---- .../TcpDiscoveryKubernetesIpFinder.java | 4 ++-- .../osgi-karaf/src/main/resources/features.xml | 10 +++++----- modules/rest-http/pom.xml | 6 +++--- modules/spark/pom.xml | 6 ------ modules/web-console/web-agent/pom.xml | 2 +- modules/zookeeper/pom.xml | 10 ++-------- .../zk/TcpDiscoveryZookeeperIpFinder.java | 2 +- parent/pom.xml | 3 +-- 12 files changed, 22 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml b/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml index 79417da..8741bd1 100644 --- a/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml +++ b/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml @@ -139,7 +139,7 @@ <exclude within="com.google..*"/> <!-- Jackson libs. --> - <exclude within="org.codehaus.jackson..*"/> + <exclude within="com.fasterxml.jackson.core..*"/> <!-- JLine libs. --> <exclude within="org.fusesource..*"/> @@ -285,7 +285,7 @@ <exclude within="com.google..*"/> <!-- Jackson libs. --> - <exclude within="org.codehaus.jackson..*"/> + <exclude within="com.fasterxml.jackson.core..*"/> <!-- JLine libs. --> <exclude within="org.fusesource..*"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/aws/pom.xml ---------------------------------------------------------------------- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index 914d864..e50b6df 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -72,24 +72,6 @@ </dependency> <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>${jackson2.version}</version> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${jackson2.version}</version> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson2.version}</version> - </dependency> - - <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> <version>2.8.1</version> http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/gce/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml index a8b9e4d..7b66c2a 100644 --- a/modules/gce/pom.xml +++ b/modules/gce/pom.xml @@ -62,7 +62,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>${jackson2.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/kubernetes/pom.xml ---------------------------------------------------------------------- diff --git a/modules/kubernetes/pom.xml b/modules/kubernetes/pom.xml index f23c479..83fafd0 100644 --- a/modules/kubernetes/pom.xml +++ b/modules/kubernetes/pom.xml @@ -42,14 +42,14 @@ </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> <version>${jackson.version}</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> <version>${jackson.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java index 53b6df6..51b68df 100644 --- a/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java +++ b/modules/kubernetes/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/kubernetes/TcpDiscoveryKubernetesIpFinder.java @@ -30,6 +30,8 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.ObjectMapper; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; @@ -43,8 +45,6 @@ import org.apache.ignite.resources.LoggerResource; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.ObjectMapper; /** * IP finder for automatic lookup of Ignite nodes running in Kubernetes environment. All Ignite nodes have to deployed http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/osgi-karaf/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/modules/osgi-karaf/src/main/resources/features.xml b/modules/osgi-karaf/src/main/resources/features.xml index b4c5299..3e3989e 100644 --- a/modules/osgi-karaf/src/main/resources/features.xml +++ b/modules/osgi-karaf/src/main/resources/features.xml @@ -208,9 +208,9 @@ install -s mvn:xom/xom/1.2.5]]> </details> <feature dependency="true">http</feature> - <bundle start="true" dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson2.version}</bundle> - <bundle start="true" dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2.version}</bundle> - <bundle start="true" dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2.version}</bundle> + <bundle start="true" dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle> + <bundle start="true" dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle> + <bundle start="true" dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle> <bundle start="true" dependency="true">mvn:commons-lang/commons-lang/${commons.lang.version}</bundle> <bundle start="true" dependency="true">mvn:commons-collections/commons-collections/${commons.collections.version}</bundle> <bundle start="true">mvn:org.apache.ignite/ignite-rest-http/${project.version}</bundle> @@ -324,8 +324,8 @@ </details> <bundle start="true" dependency="true">mvn:org.apache.zookeeper/zookeeper/${zookeeper.version}</bundle> <bundle start="true" dependency="true">mvn:com.google.guava/guava/${guava16.version}</bundle> - <bundle start="true" dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle> - <bundle start="true" dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle> + <bundle start="true" dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle> + <bundle start="true" dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle> <bundle start="true" dependency="true">mvn:org.apache.curator/curator-client/${curator.version}</bundle> <bundle start="true" dependency="true">mvn:org.apache.curator/curator-framework/${curator.version}</bundle> <bundle start="true" dependency="true">mvn:org.apache.curator/curator-recipes/${curator.version}</bundle> http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/rest-http/pom.xml ---------------------------------------------------------------------- diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml index 3772f8f..8cc31da 100644 --- a/modules/rest-http/pom.xml +++ b/modules/rest-http/pom.xml @@ -99,19 +99,19 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>${jackson2.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>${jackson2.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson2.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/spark/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml index ff4db47..e8d4c2f 100644 --- a/modules/spark/pom.xml +++ b/modules/spark/pom.xml @@ -124,12 +124,6 @@ </dependency> <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${jackson2.version}</version> - </dependency> - - <dependency> <groupId>org.json4s</groupId> <artifactId>json4s-core_2.11</artifactId> <version>3.5.0</version> http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/web-console/web-agent/pom.xml ---------------------------------------------------------------------- diff --git a/modules/web-console/web-agent/pom.xml b/modules/web-console/web-agent/pom.xml index 10f7965..06778c3 100644 --- a/modules/web-console/web-agent/pom.xml +++ b/modules/web-console/web-agent/pom.xml @@ -49,7 +49,7 @@ <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-json-org</artifactId> - <version>${jackson2.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/modules/zookeeper/pom.xml ---------------------------------------------------------------------- diff --git a/modules/zookeeper/pom.xml b/modules/zookeeper/pom.xml index 0fb5ddd..9c42e47 100644 --- a/modules/zookeeper/pom.xml +++ b/modules/zookeeper/pom.xml @@ -72,14 +72,8 @@ </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>${jackson.version}</version> - </dependency> - - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> <version>${jackson.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/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 f96a762..31d118b 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,6 +25,7 @@ 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; @@ -43,7 +44,6 @@ 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 http://git-wip-us.apache.org/repos/asf/ignite/blob/24bd54a7/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 78c16a9..48083b8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -74,8 +74,7 @@ <hamcrest.version>1.2</hamcrest.version> <httpclient.version>4.5.1</httpclient.version> <httpcore.version>4.4.3</httpcore.version> - <jackson.version>1.9.13</jackson.version> - <jackson2.version>2.9.6</jackson2.version> + <jackson.version>2.9.6</jackson.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>
