Bläddra i källkod

HADOOP-16588. Update commons-beanutils version to 1.9.4 in branch-2. Contributed by Wei-Chiu Chuang and Jonathan Hung.

Signed-off-by: Masatake Iwasaki <iwasakims@apache.org>
Jonathan Hung 5 år sedan
förälder
incheckning
842b306b76
2 ändrade filer med 38 tillägg och 0 borttagningar
  1. 26 0
      hadoop-common-project/hadoop-common/pom.xml
  2. 12 0
      hadoop-project/pom.xml

+ 26 - 0
hadoop-common-project/hadoop-common/pom.xml

@@ -161,6 +161,32 @@
       <groupId>commons-configuration</groupId>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
       <artifactId>commons-configuration</artifactId>
       <scope>compile</scope>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-beanutils</groupId>
+          <artifactId>commons-beanutils-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-digester</groupId>
+          <artifactId>commons-digester</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-beanutils</groupId>
+          <artifactId>commons-beanutils</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <scope>compile</scope>
     </dependency>
     </dependency>
     <dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <groupId>org.apache.commons</groupId>

+ 12 - 0
hadoop-project/pom.xml

@@ -837,6 +837,18 @@
         <artifactId>commons-configuration</artifactId>
         <artifactId>commons-configuration</artifactId>
         <version>1.6</version>
         <version>1.6</version>
       </dependency>
       </dependency>
+      <dependency>
+        <groupId>commons-digester</groupId>
+        <artifactId>commons-digester</artifactId>
+        <version>1.8</version>
+      </dependency>
+      <!-- Override the version of commons-beanutils dependent by
+      commons-digester from 1.7.0 to 1.9.4 -->
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>1.9.4</version>
+      </dependency>
       <dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
         <artifactId>commons-lang3</artifactId>