hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sp...@apache.org
Subject [06/50] [abbrv] hive git commit: HIVE-10548: Remove dependency to s3 repository in root pom (chengxiang reviewed by szehon)
Date Wed, 20 May 2015 16:01:25 GMT
HIVE-10548: Remove dependency to s3 repository in root pom (chengxiang reviewed by szehon)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c13ce55b
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c13ce55b
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c13ce55b

Branch: refs/heads/parquet
Commit: c13ce55b293f6ff0bbc1a1bc7ef3777dc07b557f
Parents: 5af6e92
Author: chengxiang <chengxiang@apache.com>
Authored: Wed May 13 13:40:07 2015 +0800
Committer: chengxiang <chengxiang@apache.com>
Committed: Wed May 13 13:40:07 2015 +0800

----------------------------------------------------------------------
 itests/hive-unit/pom.xml | 88 +++++++++++++++++++++++--------------------
 pom.xml                  | 12 +-----
 2 files changed, 48 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/c13ce55b/itests/hive-unit/pom.xml
----------------------------------------------------------------------
diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml
index 58e3e93..dbc9136 100644
--- a/itests/hive-unit/pom.xml
+++ b/itests/hive-unit/pom.xml
@@ -110,7 +110,7 @@
       <classifier>tests</classifier>
     </dependency>
     <!-- test inter-project -->
-   <dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>${junit.version}</version>
@@ -126,6 +126,52 @@
 
   <profiles>
     <profile>
+      <id>spark-test</id>
+      <activation>
+        <property>
+          <name>!skipSparkTests</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.spark</groupId>
+          <artifactId>spark-core_${scala.binary.version}</artifactId>
+          <version>${spark.version}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>com.esotericsoftware.kryo</groupId>
+              <artifactId>kryo</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>download-spark</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <exec executable="bash" dir="${basedir}" failonerror="true">
+                      <arg line="../target/download.sh"/>
+                    </exec>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
       <id>hadoop-1</id>
       <dependencies>
         <dependency>
@@ -317,46 +363,6 @@
         </dependency>
       </dependencies>
     </profile>
-    <profile>
-      <id>spark-test</id>
-      <activation>
-	<property>
-          <name>!skipSparkTests</name>
-	</property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.spark</groupId>
-          <artifactId>spark-core_${scala.binary.version}</artifactId>
-          <version>${spark.version}</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>download-spark</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <target>
-                    <exec executable="bash" dir="${basedir}" failonerror="true">
-                      <arg line="../target/download.sh"/>
-                    </exec>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
   <build>

http://git-wip-us.apache.org/repos/asf/hive/blob/c13ce55b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1921b06..2e4ca36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@
     <ST4.version>4.0.4</ST4.version>
     <tez.version>0.5.2</tez.version>
     <super-csv.version>2.2.0</super-csv.version>
-    <spark.version>1.3.0</spark.version>
+    <spark.version>1.3.1</spark.version>
     <scala.binary.version>2.10</scala.binary.version>
     <scala.version>2.10.4</scala.version>
     <tempus-fugit.version>1.1</tempus-fugit.version>
@@ -216,16 +216,6 @@
          <enabled>false</enabled>
        </snapshots>
     </repository>
-     <repository>
-       <id>spark-1.3</id>
-       <url>https://s3-us-west-1.amazonaws.com/hive-spark/maven2/spark_2.10-1.3-rc1/</url>
-       <releases>
-         <enabled>true</enabled>
-       </releases>
-       <snapshots>
-         <enabled>false</enabled>
-       </snapshots>
-    </repository>
   </repositories>
 
   <!-- Hadoop dependency management is done at the bottom under profiles -->


Mime
View raw message