You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by cw...@apache.org on 2011/11/18 04:38:49 UTC
svn commit: r1203477 - in /hive/trunk: build-common.xml build-offline.xml
build.xml ivy/ivysettings.xml
Author: cws
Date: Fri Nov 18 03:38:48 2011
New Revision: 1203477
URL: http://svn.apache.org/viewvc?rev=1203477&view=rev
Log:
HIVE-2574. Ivy offline mode broken by changingPattern and checkmodified attributes (John Sichi via cws)
Added:
hive/trunk/build-offline.xml
Modified:
hive/trunk/build-common.xml
hive/trunk/build.xml
hive/trunk/ivy/ivysettings.xml
Modified: hive/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build-common.xml?rev=1203477&r1=1203476&r2=1203477&view=diff
==============================================================================
--- hive/trunk/build-common.xml (original)
+++ hive/trunk/build-common.xml Fri Nov 18 03:38:48 2011
@@ -77,15 +77,7 @@
<condition property="offline">
<istrue value="${is-offline}"/>
</condition>
- <condition property="ivy.cache.name" value="offline" else="online">
- <isset property="offline"/>
- </condition>
- <condition property="ivy.skip">
- <and>
- <isset property="offline"/>
- <available file="${build.dir.hadoop}/hadoop-${hadoop.version.ant-internal}.installed"/>
- </and>
- </condition>
+ <import file="build-offline.xml"/>
<!--this is the naming policy for artifacts we want pulled down-->
<property name="ivy.artifact.retrieve.pattern" value="[conf]/[artifact]-[revision](-[classifier]).[ext]"/>
Added: hive/trunk/build-offline.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build-offline.xml?rev=1203477&view=auto
==============================================================================
--- hive/trunk/build-offline.xml (added)
+++ hive/trunk/build-offline.xml Fri Nov 18 03:38:48 2011
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- common imports for ivy offline mode -->
+<project name="hiveoffline">
+ <condition property="ivy.cache.name" value="offline" else="online">
+ <isset property="offline"/>
+ </condition>
+ <condition property="ivy.checkmodified" value="false" else="true">
+ <isset property="offline"/>
+ </condition>
+ <condition property="ivy.changingPattern" value="" else=".*SNAPSHOT">
+ <isset property="offline"/>
+ </condition>
+ <condition property="ivy.skip">
+ <and>
+ <isset property="offline"/>
+ <available file="${build.dir.hadoop}/hadoop-${hadoop.version.ant-internal}.installed"/>
+ </and>
+ </condition>
+</project>
Modified: hive/trunk/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build.xml?rev=1203477&r1=1203476&r2=1203477&view=diff
==============================================================================
--- hive/trunk/build.xml (original)
+++ hive/trunk/build.xml Fri Nov 18 03:38:48 2011
@@ -61,16 +61,7 @@
<isset property="offline"/>
</condition>
- <condition property="ivy.cache.name" value="offline" else="online">
- <isset property="offline"/>
- </condition>
-
- <condition property="ivy.skip">
- <and>
- <isset property="offline"/>
- <available file="${build.dir.hadoop}/hadoop-${hadoop.version.ant-internal}.installed"/>
- </and>
- </condition>
+ <import file="build-offline.xml"/>
<condition property="staging">
<equals arg1="${mvn.publish.repo}" arg2="staging"/>
Modified: hive/trunk/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ivy/ivysettings.xml?rev=1203477&r1=1203476&r2=1203477&view=diff
==============================================================================
--- hive/trunk/ivy/ivysettings.xml (original)
+++ hive/trunk/ivy/ivysettings.xml Fri Nov 18 03:38:48 2011
@@ -49,7 +49,8 @@
<ibiblio name="maven2" root="${repo.maven.org}" pattern="${maven2.pattern.ext}" m2compatible="true"/>
<ibiblio name="apache-snapshot" root="${snapshot.apache.org}" m2compatible="true"
- checkmodified="true" changingPattern=".*SNAPSHOT"/>
+ checkmodified="${ivy.checkmodified}"
+ changingPattern="${ivy.changingPattern}"/>
<url name="datanucleus-repo" m2compatible="true">
<artifact pattern="${datanucleus.repo}/[organisation]/[module]/[revision]/[module]-[revision].[ext]"/>
@@ -60,7 +61,9 @@
<ivy pattern="${repo.dir}/org/apache/hadoop/[module]/[revision]/[module]-[revision].pom"/>
</filesystem>
- <chain name="default" dual="true" returnFirst="true" checkmodified="true" changingPattern=".*SNAPSHOT">
+ <chain name="default" dual="true" returnFirst="true"
+ checkmodified="${ivy.checkmodified}"
+ changingPattern="${ivy.changingPattern}">
<resolver ref="apache-snapshot"/>
<resolver ref="maven2"/>
<resolver ref="datanucleus-repo"/>
@@ -86,7 +89,8 @@
<module organisation="org.apache.hadoop" name="hadoop-*" resolver="${resolvers}"/>
</modules>
- <caches default="${ivy.cache.name}">
+ <caches default="${ivy.cache.name}"
+ resolutionCacheDir="${build.ivy.dir}/resolution-cache">
<cache name="online"/>
<!--
Set the defaultTTL to 1000 days. Ivy 2.1.0 allows you to