You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ga...@apache.org on 2011/01/18 22:06:47 UTC
svn commit: r1060579 - in /pig/trunk: CHANGES.txt build.xml ivy/pig.pom
ivy/pigsmoke-template.xml ivy/pigunit-template.xml
Author: gates
Date: Tue Jan 18 21:06:47 2011
New Revision: 1060579
URL: http://svn.apache.org/viewvc?rev=1060579&view=rev
Log:
PIG-1799 Provide deployable maven artifacts for pigunit and pig smoke tests.
Added:
pig/trunk/ivy/pigsmoke-template.xml
pig/trunk/ivy/pigunit-template.xml
Modified:
pig/trunk/CHANGES.txt
pig/trunk/build.xml
pig/trunk/ivy/pig.pom
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1060579&r1=1060578&r2=1060579&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Jan 18 21:06:47 2011
@@ -24,6 +24,9 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-1799: Provide deployable maven artifacts for pigunit and pig smoke tests
+(cos via gates)
+
PIG-1728: turing complete docs (chandec via olgan)
PIG-1675: allow PigServer to register pig script from InputStream (zjffdu via dvryaboy)
Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1060579&r1=1060578&r2=1060579&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Tue Jan 18 21:06:47 2011
@@ -28,6 +28,8 @@
<property name="Name" value="Pig" />
<property name="ant-task.version" value="2.0.10" />
<property name="pig.pom" value="${basedir}/ivy/pig.pom" />
+ <property name="pigsmoke.pom" value="${basedir}/ivy/pigsmoke.pom" />
+ <property name="pigunit.pom" value="${basedir}/ivy/pigunit.pom" />
<property name="version" value="0.9.0-SNAPSHOT" />
<property name="final.name" value="${name}-${version}" />
@@ -86,6 +88,7 @@
<property name="test.smoke.file" value="${test.src.dir}/smoke-tests"/>
<property name="test.all.file" value="${test.src.dir}/all-tests"/>
<property name="pigunit.jarfile" value="pigunit.jar" />
+ <property name="smoke.tests.jarfile" value="${build.dir}/${final.name}-smoketests.jar" />
<property name="test.pigunit.src.dir" value="${test.src.dir}/org/apache/pig/test/pigunit" />
<property name="commons-lang.jarfile" value="commons-lang-2.4.jar" />
<property name="test.pigunit.file" value="${test.src.dir}/pigunit-tests"/>
@@ -502,7 +505,7 @@
<!-- ================================================================== -->
<!-- Make pig.jar -->
<!-- ================================================================== -->
- <!-- TODO we should also exculte test here... -->
+ <!-- TODO we should also exclude test here... -->
<!-- ================================================================== -->
<target name="jar" depends="compile" description="Create pig jar">
<antcall target="jarWithSvn" inheritRefs="true" inheritall="true"/>
@@ -565,6 +568,23 @@
<copy file="${output.jarfile}" tofile="${output.jarfile.backcompat}"/>
</target>
+ <target name="smoketests-jar" description="Creating jar file for smoke tests">
+ <echo> *** Creating smoke tests jar for pigunit ***</echo>
+ <jar jarfile="${smoke.tests.jarfile}" basedir="${test.build.classes}"
+ includes="org/apache/pig/test/pigunit/**/*">
+ <fileset dir="${basedir}" includes="test/data/pigunit/**/*"/>
+ <manifest>
+ <section name="org/apache/pig/test/pigunit">
+ <attribute name="Implementation-Vendor" value="Apache" />
+ <attribute name="Implementation-Title" value="Pig" />
+ <attribute name="Implementation-Version" value="${version}" />
+ <attribute name="Build-TimeStamp" value="${timestamp}" />
+ <attribute name="Svn-Revision" value="${svnString}" />
+ </section>
+ </manifest>
+ </jar>
+
+ </target>
<!-- ================================================================== -->
<!-- Make pig-withouthadoop.jar -->
<!-- ================================================================== -->
@@ -872,7 +892,8 @@
uri="urn:maven-artifact-ant"
classpathref="mvn-ant-task.classpath"/>
</target>
- <target name="mvn-install" depends="mvn-taskdef,jar, set-version, source-jar, javadoc-jar"
+ <target name="mvn-install" depends="mvn-taskdef,jar, set-version, source-jar,
+ javadoc-jar, pigunit-jar, smoketests-jar"
description="To install pig to local filesystem's m2 cache">
<artifact:pom file="${pig.pom}" id="pig"/>
<artifact:install file="${pig-core.jar}">
@@ -880,7 +901,16 @@
<attach file="${output.jarfile.sources}" classifier="sources" />
<attach file="${output.jarfile.javadoc}" classifier="javadoc" />
</artifact:install>
+ <artifact:pom file="${pigunit.pom}" id="pigunit"/>
+ <artifact:install file="${pigunit.jarfile}">
+ <pom refid="pigunit"/>
+ </artifact:install>
+ <artifact:pom file="${pigsmoke.pom}" id="pigsmoke"/>
+ <artifact:install file="${smoke.tests.jarfile}">
+ <pom refid="pigsmoke"/>
+ </artifact:install>
</target>
+
<target name="mvn-deploy" depends="mvn-taskdef,jar,source-jar, javadoc-jar, set-version, signanddeploy, simpledeploy"
description="To deploy pig jar to apache snapshot's repository">
</target>
@@ -909,6 +939,16 @@
<attach file="${pig-sources.jar}" classifier="sources" />
<attach file="${pig-javadoc.jar}" classifier="javadoc" />
</artifact:deploy>
+ <artifact:pom file="${pigunit.pom}" id="pigunit"/>
+ <artifact:deploy file="${pigunit.jarfile}">
+ <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
+ <pom refid="pigunit"/>
+ </artifact:deploy>
+ <artifact:pom file="${pigsmoke.pom}" id="pigsmoke"/>
+ <artifact:deploy file="${smoke.tests.jarfile}">
+ <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
+ <pom refid="pigsmoke"/>
+ </artifact:deploy>
</target>
<target name="sign" depends="clean-sign" if="staging">
@@ -950,11 +990,15 @@
<target name="set-version">
<delete file="${basedir}/ivy/pig.pom"/>
<copy file="${basedir}/ivy/pig-template.xml" tofile="${basedir}/ivy/pig.pom"/>
+ <copy file="${basedir}/ivy/pigunit-template.xml" tofile="${basedir}/ivy/pigunit.pom"/>
+ <copy file="${basedir}/ivy/pigsmoke-template.xml" tofile="${basedir}/ivy/pigsmoke.pom"/>
<replaceregexp byline="true">
<regexp pattern="@version"/>
<substitution expression="${version}"/>
<fileset dir="${basedir}/ivy">
<include name="pig.pom"/>
+ <include name="pigunit.pom"/>
+ <include name="pigsmoke.pom"/>
</fileset>
</replaceregexp>
</target>
Modified: pig/trunk/ivy/pig.pom
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/pig.pom?rev=1060579&r1=1060578&r2=1060579&view=diff
==============================================================================
--- pig/trunk/ivy/pig.pom (original)
+++ pig/trunk/ivy/pig.pom Tue Jan 18 21:06:47 2011
@@ -27,118 +27,98 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>xmlenc</groupId>
<artifactId>xmlenc</artifactId>
<version>0.52</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.4</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>1.4.1</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.14</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>6.1.14</version>
- </dependency>
- <dependency>
+ </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>0.20.6</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
<version>5.5.12</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
<version>6.1.14</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1</artifactId>
<version>6.1.14</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
<version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.python</groupId>
- <artifactId>jython</artifactId>
- <version>2.5.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>r06</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.7.1</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>1.4.1</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
<version>6.1.14</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>net.sf.kosmosfs</groupId>
<artifactId>kfs</artifactId>
<version>0.3</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.10</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>avro</artifactId>
<version>1.3.2</version>
@@ -154,6 +134,6 @@
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
- </dependency>
- </dependencies>
+ </dependency>
+ </dependencies>
</project>
Added: pig/trunk/ivy/pigsmoke-template.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/pigsmoke-template.xml?rev=1060579&view=auto
==============================================================================
--- pig/trunk/ivy/pigsmoke-template.xml (added)
+++ pig/trunk/ivy/pigsmoke-template.xml Tue Jan 18 21:06:47 2011
@@ -0,0 +1,42 @@
+<?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.pig</groupId>
+ <artifactId>pigsmoke</artifactId>
+ <packaging>jar</packaging>
+ <version>@version</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pigunit</artifactId>
+ <version>@version</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>@version</version>
+ </dependency>
+ </dependencies>
+</project>
Added: pig/trunk/ivy/pigunit-template.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/pigunit-template.xml?rev=1060579&view=auto
==============================================================================
--- pig/trunk/ivy/pigunit-template.xml (added)
+++ pig/trunk/ivy/pigunit-template.xml Tue Jan 18 21:06:47 2011
@@ -0,0 +1,57 @@
+<?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.pig</groupId>
+ <artifactId>pigunit</artifactId>
+ <packaging>jar</packaging>
+ <version>@version</version>
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r06</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>@version</version>
+ </dependency>
+ </dependencies>
+</project>