PIG-5112: Cleanup pig-template.xml
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1780298 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 9313fa7..c0418f8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -187,6 +187,8 @@
BUG FIXES
+PIG-5112: Cleanup pig-template.xml (daijy)
+
PIG-5046: Skewed join with auto parallelism hangs when right input also has autoparallelism (rohini)
PIG-5108: AvroStorage on Tez with exception on nested records (daijy)
diff --git a/ivy/pig-template.xml b/ivy/pig-template.xml
index 8f5fd6d..fb3a510 100644
--- a/ivy/pig-template.xml
+++ b/ivy/pig-template.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>1.4.1</version>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -59,16 +59,6 @@
<version>6.1.26</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>
@@ -86,27 +76,17 @@
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
- <version>0.7.1</version>
+ <version>0.9.0</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>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>4.11</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
@@ -114,11 +94,6 @@
<version>1.8.0.10</version>
</dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- </dependency>
- <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>1.0</version>
@@ -146,22 +121,22 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.8.8</version>
+ <version>1.9.13</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.8.8</version>
+ <version>1.9.13</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.1</version>
+ <version>2.9.3</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.7.4</version>
+ <version>1.7.5</version>
<exclusions>
<exclusion>
<!-- Don't pull in Avro's (later) version of Jetty.-->
@@ -183,7 +158,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.8.6</version>
+ <version>2.4.5</version>
</dependency>
</dependencies>
</project>
diff --git a/ivy/piggybank-template.xml b/ivy/piggybank-template.xml
index 2fedbfd..ebf0536 100644
--- a/ivy/piggybank-template.xml
+++ b/ivy/piggybank-template.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.1</version>
+ <version>2.9.3</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.7.4</version>
+ <version>1.7.5</version>
<exclusions>
<exclusion>
<!-- Don't pull in Avro's (later) version of Jetty.-->
@@ -78,7 +78,7 @@
<dependency>
<groupId>nl.basjes.parse.httpdlog</groupId>
<artifactId>httpdlog-pigloader</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.pig</groupId>
diff --git a/ivy/pigsmoke-template.xml b/ivy/pigsmoke-template.xml
index 086e7d1..3b85b42 100644
--- a/ivy/pigsmoke-template.xml
+++ b/ivy/pigsmoke-template.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>4.11</version>
</dependency>
<dependency>
<groupId>org.apache.pig</groupId>
diff --git a/ivy/pigunit-template.xml b/ivy/pigunit-template.xml
index 6440223..400d025 100644
--- a/ivy/pigunit-template.xml
+++ b/ivy/pigunit-template.xml
@@ -26,12 +26,12 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <version>1.2.16</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>4.11</version>
</dependency>
<dependency>
<groupId>org.apache.pig</groupId>
