Repository: ignite Updated Branches: refs/heads/master 0cc2deeb6 -> 7c6d5a456
IGNITE-8471 Dependencies upgraded Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c6d5a45 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c6d5a45 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c6d5a45 Branch: refs/heads/master Commit: 7c6d5a456a32daa2511ce0bedf0f00cfd7015114 Parents: 0cc2dee Author: Andrey Gura <[email protected]> Authored: Fri May 11 20:41:30 2018 +0300 Committer: Andrey Gura <[email protected]> Committed: Mon May 14 14:24:01 2018 +0300 ---------------------------------------------------------------------- modules/cassandra/store/pom.xml | 6 +++++- modules/flink/pom.xml | 12 ++++++++++++ modules/flume/pom.xml | 6 ++++++ modules/gce/pom.xml | 6 ++++++ modules/hadoop/pom.xml | 32 ++++++++++++++++++++++++++++++++ modules/spark-2.10/pom.xml | 10 ++++++++++ modules/spark/pom.xml | 20 ++++++++++++++++++++ modules/yarn/pom.xml | 20 ++++++++++++++++++++ parent/pom.xml | 6 +++--- 9 files changed, 114 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7c6d5a45/modules/cassandra/store/pom.xml ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/pom.xml b/modules/cassandra/store/pom.xml index b62050b..e236b52 100644 --- a/modules/cassandra/store/pom.xml +++ b/modules/cassandra/store/pom.xml @@ -35,7 +35,7 @@ <url>http://ignite.apache.org</url> <properties> - <commons-beanutils.version>1.8.3</commons-beanutils.version> + <commons-beanutils.version>1.9.2</commons-beanutils.version> <cassandra-driver.version>3.0.0</cassandra-driver.version> <cassandra-all.version>3.3</cassandra-all.version> <netty.version>4.0.33.Final</netty.version> @@ -130,6 +130,10 @@ <artifactId>log4j-over-slf4j</artifactId> <groupId>org.slf4j</groupId> </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/7c6d5a45/modules/flink/pom.xml ---------------------------------------------------------------------- diff --git a/modules/flink/pom.xml b/modules/flink/pom.xml index 1013e4c..48a4e4c 100644 --- a/modules/flink/pom.xml +++ b/modules/flink/pom.xml @@ -74,6 +74,18 @@ <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> </exclusion> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils-bean-collections</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/7c6d5a45/modules/flume/pom.xml ---------------------------------------------------------------------- diff --git a/modules/flume/pom.xml b/modules/flume/pom.xml index dcee0db..12da725 100644 --- a/modules/flume/pom.xml +++ b/modules/flume/pom.xml @@ -45,6 +45,12 @@ <groupId>org.apache.flume</groupId> <artifactId>flume-ng-core</artifactId> <version>${flume.ng.version}</version> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/7c6d5a45/modules/gce/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml index ba6d484..d81fea5 100644 --- a/modules/gce/pom.xml +++ b/modules/gce/pom.xml @@ -45,6 +45,12 @@ <groupId>com.google.api-client</groupId> <artifactId>google-api-client</artifactId> <version>1.22.0</version> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/7c6d5a45/modules/hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml index 5ed3278..a7b4a98 100644 --- a/modules/hadoop/pom.xml +++ b/modules/hadoop/pom.xml @@ -70,24 +70,56 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils-core</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-common</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/7c6d5a45/modules/spark-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spark-2.10/pom.xml b/modules/spark-2.10/pom.xml index 1f40f0f..c670661 100644 --- a/modules/spark-2.10/pom.xml +++ b/modules/spark-2.10/pom.xml @@ -95,6 +95,16 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${spark.hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/7c6d5a45/modules/spark/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml index e338c88..fb3bcc7 100644 --- a/modules/spark/pom.xml +++ b/modules/spark/pom.xml @@ -71,6 +71,12 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-catalyst_2.11</artifactId> <version>${spark.version}</version> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -101,6 +107,20 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${spark.hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils-core</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/7c6d5a45/modules/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/modules/yarn/pom.xml b/modules/yarn/pom.xml index ce7217b..c76d3c9 100644 --- a/modules/yarn/pom.xml +++ b/modules/yarn/pom.xml @@ -43,12 +43,32 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-client</artifactId> <version>${hadoop-yarn.version}</version> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop-yarn.version}</version> + <exclusions> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils-core</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/7c6d5a45/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 3426342..929e43c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -54,9 +54,9 @@ <aws.sdk.bundle.version>1.10.12_1</aws.sdk.bundle.version> <aws.sdk.version>1.11.75</aws.sdk.version> <camel.version>2.16.0</camel.version> - <commons.beanutils.bundle.version>1.8.3_1</commons.beanutils.bundle.version> - <commons.beanutils.version>1.8.3</commons.beanutils.version> - <commons.codec.version>1.6</commons.codec.version> + <commons.beanutils.bundle.version>1.9.2_1</commons.beanutils.bundle.version> + <commons.beanutils.version>1.9.2</commons.beanutils.version> + <commons.codec.version>1.11</commons.codec.version> <commons.collections.version>3.2.2</commons.collections.version> <commons.lang.version>2.6</commons.lang.version> <cron4j.version>2.2.5</cron4j.version>
