Author: rding
Date: Mon Sep 13 17:49:33 2010
New Revision: 996615
URL: http://svn.apache.org/viewvc?rev=996615&view=rev
Log:
PIG-1562: Fix the version for the dependent packages for the maven
Added:
hadoop/pig/trunk/ivy/pig-template.xml
Modified:
hadoop/pig/trunk/CHANGES.txt
hadoop/pig/trunk/build.xml
hadoop/pig/trunk/ivy/libraries.properties
hadoop/pig/trunk/ivy/pig.pom
Modified: hadoop/pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=996615&r1=996614&r2=996615&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Mon Sep 13 17:49:33 2010
@@ -197,6 +197,9 @@ PIG-1309: Map-side Cogroup (ashutoshc)
BUG FIXES
+PIG-1562: Fix the version for the dependent packages for the maven (nrai via
+rding)
+
PIG-1604: 'relation as scalar' does not work with complex types (thejas)
PIG-1601: Make scalar work for secure hadoop (daijy)
Modified: hadoop/pig/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/build.xml?rev=996615&r1=996614&r2=996615&view=diff
==============================================================================
--- hadoop/pig/trunk/build.xml (original)
+++ hadoop/pig/trunk/build.xml Mon Sep 13 17:49:33 2010
@@ -799,7 +799,7 @@
uri="urn:maven-artifact-ant"
classpathref="mvn-ant-task.classpath"/>
</target>
- <target name="mvn-install" depends="mvn-taskdef,jar, source-jar"
+ <target name="mvn-install" depends="mvn-taskdef,jar, set-version,
source-jar"
description="To install pig to local filesystem's m2 cache">
<artifact:pom file="${pig.pom}" id="pig"/>
<artifact:install file="${pig-core.jar}">
@@ -807,13 +807,13 @@
<attach file="${output.jarfile.sources}" classifier="sources" />
</artifact:install>
</target>
- <target name="mvn-deploy" depends="mvn-taskdef,jar,source-jar,
signanddeploy, simpledeploy"
+ <target name="mvn-deploy" depends="mvn-taskdef,jar,source-jar,
set-version, signanddeploy, simpledeploy"
description="To deploy pig jar to apache snapshot's repository">
</target>
<target name="signanddeploy" if="staging" depends="sign">
<artifact:pom file="${pig.pom}" id="pig"/>
- <artifact:install-provider artifactId="wagon-http"
version="1.0-beta-2"/>
+ <artifact:install-provider artifactId="wagon-http"
version="${wagon-http.version}"/>
<artifact:deploy file="${pig-core.jar}">
<remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
<pom refid="pig"/>
@@ -826,7 +826,7 @@
<target name="simpledeploy" unless="staging">
<artifact:pom file="${pig.pom}" id="pig"/>
- <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/>
+ <artifact:install-provider artifactId="wagon-http"
version="${wagon-http.version}"/>
<artifact:deploy file="${pig-core.jar}">
<remoteRepository id="apache.snapshots.https"
url="${asfsnapshotrepo}"/>
<pom refid="pig"/>
@@ -868,7 +868,18 @@
<fileset dir="." includes="**/**/*.asc"/>
</delete>
</target>
-
+ <target name="set-version">
+ <delete file="${basedir}/ivy/pig.pom"/>
+ <copy file="${basedir}/ivy/pig-template.xml"
tofile="${basedir}/ivy/pig.pom"/>
+ <replaceregexp byline="true">
+ <regexp pattern="@version"/>
+ <substitution expression="${version}"/>
+ <fileset dir="${basedir}/ivy">
+ <include name="pig.pom"/>
+ </fileset>
+ </replaceregexp>
+ </target>
+
<!-- ================================================================== -->
<!-- Perform audit activities for the release -->
<!-- ================================================================== -->
Modified: hadoop/pig/trunk/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/ivy/libraries.properties?rev=996615&r1=996614&r2=996615&view=diff
==============================================================================
--- hadoop/pig/trunk/ivy/libraries.properties (original)
+++ hadoop/pig/trunk/ivy/libraries.properties Mon Sep 13 17:49:33 2010
@@ -24,14 +24,12 @@ commons-el.version=1.0
commons-logging.version=1.1.1
commons-lang.version=2.4
checkstyle.version=4.2
-
ivy.version=2.2.0-rc1
guava.version=r06
hadoop-core.version=0.20.2
hadoop-test.version=0.20.2
hbase.version=0.20.6
hsqldb.version=1.8.0.10
-
jackson.version=1.0.1
javacc.version=4.2
jdiff.version=1.0.9
@@ -41,13 +39,9 @@ joda-time.version=1.6
jsch.version=0.1.38
junit.version=4.5
jython.version=2.5.0
-
log4j.version=1.2.14
-
rats-lib.version=0.5.1
-
slf4j-api.version=1.4.3
slf4j-log4j12.version=1.4.3
-
xerces.version=1.4.4
-
+wagon-http.version=1.0-beta-2
Added: hadoop/pig/trunk/ivy/pig-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/ivy/pig-template.xml?rev=996615&view=auto
==============================================================================
--- hadoop/pig/trunk/ivy/pig-template.xml (added)
+++ hadoop/pig/trunk/ivy/pig-template.xml Mon Sep 13 17:49:33 2010
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<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>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>pig</artifactId>
+ <packaging>jar</packaging>
+ <version>@version</version>
+ <dependencies>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlenc</groupId>
+ <artifactId>xmlenc</artifactId>
+ <version>0.52</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ <version>0.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.kosmosfs</groupId>
+ <artifactId>kfs</artifactId>
+ <version>0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.10</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>avro</artifactId>
+ <version>1.3.2</version>
+ <exclusions>
+ <exclusion>
+ <!-- Don't pull in Avro's (later) version of Jetty.-->
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- Exclude Avro's version of ant since it conflicts with
Jetty's.-->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+</project>
Modified: hadoop/pig/trunk/ivy/pig.pom
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/ivy/pig.pom?rev=996615&r1=996614&r2=996615&view=diff
==============================================================================
--- hadoop/pig/trunk/ivy/pig.pom (original)
+++ hadoop/pig/trunk/ivy/pig.pom Mon Sep 13 17:49:33 2010
@@ -1,8 +1,5 @@
-<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";>
-
- <!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
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.
@@ -17,94 +14,146 @@
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.
- -->
-
+-->
+<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>
<groupId>org.apache.hadoop</groupId>
<artifactId>pig</artifactId>
<packaging>jar</packaging>
<version>0.8.0-SNAPSHOT</version>
- <description>
- Pig is a platform for analyzing large data sets that consists of a
high-level
- language for expressing data analysis programs, coupled with
infrastructure
- for evaluating these programs
- </description>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
<dependencies>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>${jsch.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.jcraft</groupId>
- <artifactId>zlib</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>${jline.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javacc</groupId>
- <artifactId>javacc</artifactId>
- <version>${javacc.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- </dependency>
-
- <dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlenc</groupId>
+ <artifactId>xmlenc</artifactId>
+ <version>0.52</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-test</artifactId>
- <version>${hbase.version}</version>
- </dependency>
-
- <dependency>
+ <version>0.20.6</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
-
- <dependency>
- <groupId>jackson</groupId>
- <artifactId>jackson</artifactId>
- <version>${jackson.version}</version>
- </dependency>
-
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>${joda-time.version}</version>
- </dependency>
-
- <dependency>
+ <version>4.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>org.python</groupId>
<artifactId>jython</artifactId>
- <version>${jython.version}</version>
- </dependency>
- <dependency>
+ <version>2.5.0</version>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
+ <version>r06</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ <version>0.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.kosmosfs</groupId>
+ <artifactId>kfs</artifactId>
+ <version>0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.10</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>avro</artifactId>
+ <version>1.3.2</version>
+ <exclusions>
+ <exclusion>
+ <!-- Don't pull in Avro's (later) version of Jetty.-->
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- Exclude Avro's version of ant since it conflicts with
Jetty's.-->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</project>
