소스 검색

HDFS-2214. Generated POMs hardcode dependency on hadoop-common version 0.22.0-SNAPSHOT. Contributed by Joep Rottinghuis.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1160361 13f79535-47bb-0310-9956-ffa450edef68
Konstantin Shvachko 14 년 전
부모
커밋
b4be20225f
3개의 변경된 파일10개의 추가작업 그리고 2개의 파일을 삭제
  1. 8 0
      hdfs/build.xml
  2. 1 1
      hdfs/ivy/hadoop-hdfs-instrumented-template.xml
  3. 1 1
      hdfs/ivy/hadoop-hdfs-template.xml

+ 8 - 0
hdfs/build.xml

@@ -1724,6 +1724,14 @@
         <include name="hadoop-hdfs-${herriot.suffix}-test.xml"/>
       </fileset>
     </replaceregexp>
+    <replaceregexp byline="true">
+      <regexp pattern="@hadoop-common.version"/>
+      <substitution expression="${hadoop-common.version}"/>
+      <fileset dir="${basedir}/ivy">
+        <include name="hadoop-hdfs.xml"/>
+        <include name="hadoop-hdfs-${herriot.suffix}.xml"/>
+      </fileset>
+    </replaceregexp>
   </target>
 
   <!--

+ 1 - 1
hdfs/ivy/hadoop-hdfs-instrumented-template.xml

@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common-instrumented</artifactId>
-      <version>0.22.0-SNAPSHOT</version>
+      <version>@hadoop-common.version</version>
     </dependency>
   </dependencies>
 </project>

+ 1 - 1
hdfs/ivy/hadoop-hdfs-template.xml

@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>0.22.0-SNAPSHOT</version>
+      <version>@hadoop-common.version</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>