Bläddra i källkod

CLOUDERABUILD CDH6.x Version Bump (Automated)

See http://github.mtv.cloudera.com/CDH/cdh/blob/ca8b38b2767e6bd2e12543a9b1c2afa63cebf122/tools/./tools/rebase-cdh6.x-onto-cdh5.sh.

(cherry picked from commit 32e56a52518e391d47aece2bf724e4a5913b023a)

Conflicts:
	Makefile.vars
	desktop/core/src/desktop/tests.py
	desktop/libs/hadoop/java/pom.xml
	desktop/libs/librdbms/java/pom.xml
	docs/release-notes/release-notes-3.8.0.txt
	maven/pom.xml

Conflicts:
	desktop/libs/hadoop/java/pom.xml
	desktop/libs/librdbms/java/pom.xml
	maven/pom.xml
Philip Zeyliger 9 år sedan
förälder
incheckning
209192ddf5
3 ändrade filer med 11 tillägg och 5 borttagningar
  1. 3 3
      desktop/core/src/desktop/tests.py
  2. 1 1
      desktop/libs/librdbms/java/pom.xml
  3. 7 1
      maven/pom.xml

+ 3 - 3
desktop/core/src/desktop/tests.py

@@ -246,13 +246,13 @@ def hue_version():
   HUE_VERSION_BAK = HUE_VERSION
 
   try:
-    assert_equal('3.9.0-cdh5.9.0-SNAPSHOT', _version_from_properties(StringIO.StringIO("""# Autogenerated build properties
-version=3.9.0-cdh5.9.0-SNAPSHOT
+    assert_equal('3.9.0-cdh6.x-SNAPSHOT', _version_from_properties(StringIO.StringIO("""# Autogenerated build properties
+version=3.9.0-cdh6.x-SNAPSHOT
 git.hash=f5fbe90b6a1d0c186b0ddc6e65ce5fc8d24725c8
 cloudera.hash=f5fbe90b6a1d0c186b0ddc6e65ce5fc8d24725c8aaaaa""")))
 
     assert_equal(HUE_DESKTOP_VERSION, _version_from_properties(StringIO.StringIO("""# Autogenerated build properties
-version=3.9.0-cdh5.9.0-SNAPSHOT git.hash=f5fbe90b6a1d0c186b0ddc6e65ce5fc8d24725c8 cloudera.hash=f5fbe90b6a1d0c186b0ddc6e65ce5fc8d24725c8aaaaa""")))
+version=3.9.0-cdh6.x-SNAPSHOT git.hash=f5fbe90b6a1d0c186b0ddc6e65ce5fc8d24725c8 cloudera.hash=f5fbe90b6a1d0c186b0ddc6e65ce5fc8d24725c8aaaaa""")))
 
     assert_equal(HUE_DESKTOP_VERSION, _version_from_properties(StringIO.StringIO('')))
   finally:

+ 1 - 1
desktop/libs/librdbms/java/pom.xml

@@ -26,7 +26,7 @@
       <groupId>com.cloudera.hue</groupId>
       <artifactId>hue-parent</artifactId>
       <relativePath>../../../../maven/pom.xml</relativePath>
-      <version>4.2.0-SNAPSHOT</version>
+      <version>4.2.0-cdh6.x-SNAPSHOT</version>
     </parent>
 
     <groupId>com.cloudera.hue</groupId>

+ 7 - 1
maven/pom.xml

@@ -20,9 +20,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+    <groupId>com.cloudera.cdh</groupId>
+    <artifactId>cdh-root</artifactId>
+    <version>6.x-SNAPSHOT</version>
+  </parent>
+
   <groupId>com.cloudera.hue</groupId>
   <artifactId>hue-parent</artifactId>
-  <version>4.2.0-SNAPSHOT</version>
+  <version>4.2.0-cdh6.x-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Hue Maven Parent POM</name>