You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/14 15:13:41 UTC
[24/50] [abbrv] ignite git commit: IGNITE-4387 Removed json-lib and
jackson2 updated to latest version.
IGNITE-4387 Removed json-lib and jackson2 updated to latest version.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b6462442
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6462442
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6462442
Branch: refs/heads/ignite-4587
Commit: b64624422c05c1ef8bf24e551e2ea46edda88a21
Parents: bec4a3e
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Apr 14 15:29:32 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Apr 14 15:29:32 2017 +0700
----------------------------------------------------------------------
modules/aws/pom.xml | 6 +++---
modules/osgi-karaf/src/main/resources/features.xml | 9 ++++-----
parent/pom.xml | 2 +-
3 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b6462442/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index d005d94..a9cfcca 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -62,19 +62,19 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.5.3</version>
+ <version>${jackson2.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.5.3</version>
+ <version>${jackson2.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.5.3</version>
+ <version>${jackson2.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/b6462442/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 0f761f1..f6bdf2b 100644
--- a/modules/osgi-karaf/src/main/resources/features.xml
+++ b/modules/osgi-karaf/src/main/resources/features.xml
@@ -201,10 +201,9 @@
install -s mvn:xom/xom/1.2.5]]>
</details>
<feature dependency="true">http</feature>
- <bundle start="true" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons.beanutils.bundle.version}</bundle>
- <bundle start="true" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
- <bundle start="true" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ezmorph/${ezmorph.bundle.version}</bundle>
- <bundle start="true" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json-lib/${jsonlib.bundle.version}</bundle>
+ <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: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>
@@ -327,4 +326,4 @@
<bundle start="true">mvn:org.apache.ignite/ignite-zookeeper/${project.version}</bundle>
</feature>
-</features>
\ No newline at end of file
+</features>
http://git-wip-us.apache.org/repos/asf/ignite/blob/b6462442/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8d10713..adb7995 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -75,7 +75,7 @@
<httpclient.version>4.5.1</httpclient.version>
<httpcore.version>4.4.3</httpcore.version>
<jackson.version>1.9.13</jackson.version>
- <jackson2.version>2.7.5</jackson2.version>
+ <jackson2.version>2.8.8</jackson2.version>
<javax.cache.bundle.version>1.0.0_1</javax.cache.bundle.version>
<javax.cache.version>1.0.0</javax.cache.version>
<jetbrains.annotations.version>13.0</jetbrains.annotations.version>