pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sz...@apache.org
Subject svn commit: r1809162 - in /pig/trunk: CHANGES.txt contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestAllLoader.java ivy.xml ivy/libraries.properties ivy/pig-template.xml ivy/piggybank-template.xml
Date Thu, 21 Sep 2017 13:40:47 GMT
Author: szita
Date: Thu Sep 21 13:40:47 2017
New Revision: 1809162

URL: http://svn.apache.org/viewvc?rev=1809162&view=rev
Log:
PIG-5298: Verify if org.mortbay.jetty is removable (nkollar via szita)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestAllLoader.java
    pig/trunk/ivy.xml
    pig/trunk/ivy/libraries.properties
    pig/trunk/ivy/pig-template.xml
    pig/trunk/ivy/piggybank-template.xml

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1809162&r1=1809161&r2=1809162&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Sep 21 13:40:47 2017
@@ -26,6 +26,8 @@ PIG-5282: Upgade to Java 8 (satishsaley
  
 IMPROVEMENTS
 
+PIG-5298: Verify if org.mortbay.jetty is removable (nkollar via szita)
+
 PIG-5268: Review of org.apache.pig.backend.hadoop.datastorage.HDataStorage (belugabehr via
daijy)
 
 PIG-5288: Improve performance of PigTextRawBytesComparator (rohini)

Modified: pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestAllLoader.java
URL: http://svn.apache.org/viewvc/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestAllLoader.java?rev=1809162&r1=1809161&r2=1809162&view=diff
==============================================================================
--- pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestAllLoader.java
(original)
+++ pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestAllLoader.java
Thu Sep 21 13:40:47 2017
@@ -56,9 +56,11 @@ import org.apache.pig.test.Util;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.mortbay.log.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestAllLoader extends TestCase {
+    private static final Logger LOG = LoggerFactory.getLogger(TestAllLoader.class);
 
     enum TYPE {
         HIVERC(".rc", new HiveRCFileTestWriter()), GZIP_PLAIN(".gz",
@@ -424,7 +426,7 @@ public class TestAllLoader extends TestC
             count++;
         }
 
-        Log.info("Validating expected: " + totalRowCount + " against " + count);
+        LOG.info("Validating expected: " + totalRowCount + " against " + count);
         assertEquals(totalRowCount, count);
     }
 

Modified: pig/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1809162&r1=1809161&r2=1809162&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Thu Sep 21 13:40:47 2017
@@ -109,9 +109,7 @@
       conf="hadoop2->master"/>
     <dependency org="aopalliance" name="aopalliance" rev="${aopalliance.version}"
       conf="hadoop2->master"/>
-    <dependency org="org.mortbay.jetty" name="jsp-2.1" rev="${jasper.version}"
-      conf="hadoop2->master"/>
-    <dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="${jasper.version}"
+    <dependency org="org.glassfish" name="javax.el" rev="${glassfish.el.version}"
       conf="hadoop2->master"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}"
       conf="compile->master"/>
@@ -168,12 +166,6 @@
       rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/>
     <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-hs" 
       rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/>
-    <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}"
-      conf="compile->master">
-      <artifact name="jetty" ext="jar" />
-    </dependency>
-    <dependency org="org.mortbay.jetty" name="jetty-util" rev="${jetty.version}"
-      conf="compile->master"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
       conf="compile->master;checkstyle->master"/>
     <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"

Modified: pig/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1809162&r1=1809161&r2=1809162&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Thu Sep 21 13:40:47 2017
@@ -36,7 +36,6 @@ xmlenc.version=0.52
 jersey.version=1.8
 checkstyle.version=4.2
 ivy.version=2.2.0
-jasper.version=6.1.14
 groovy.version=2.4.5
 guava.version=11.0
 hadoop-common.version=2.7.3
@@ -55,7 +54,6 @@ jaxb-impl.version=2.2.3-1
 jdeb.version=0.8
 jdiff.version=1.0.9
 jettison.version=1.3.4
-jetty.version=6.1.26
 jline.version=2.11
 joda-time.version=2.9.9
 jopt.version=4.1
@@ -99,3 +97,4 @@ curator.version=2.6.0
 htrace.version=3.1.0-incubating
 commons-lang3.version=3.1
 scala-xml.version=1.0.5
+glassfish.el.version=3.0.1-b08
\ No newline at end of file

Modified: pig/trunk/ivy/pig-template.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/pig-template.xml?rev=1809162&r1=1809161&r2=1809162&view=diff
==============================================================================
--- pig/trunk/ivy/pig-template.xml (original)
+++ pig/trunk/ivy/pig-template.xml Thu Sep 21 13:40:47 2017
@@ -49,26 +49,6 @@
       <version>3.1</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.26</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>6.1.26</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>
@@ -134,16 +114,16 @@
       <version>2.9.9</version>
     </dependency>
     <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>javax.el</artifactId>
+      <version>3.0.1-b08</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
       <version>1.7.5</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>

Modified: pig/trunk/ivy/piggybank-template.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/piggybank-template.xml?rev=1809162&r1=1809161&r2=1809162&view=diff
==============================================================================
--- pig/trunk/ivy/piggybank-template.xml (original)
+++ pig/trunk/ivy/piggybank-template.xml Thu Sep 21 13:40:47 2017
@@ -59,16 +59,16 @@
       <version>1.1</version>
     </dependency>
     <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>javax.el</artifactId>
+      <version>3.0.1-b08</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
       <version>1.7.5</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>
@@ -97,11 +97,5 @@
       <version>1.8.0.10</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>6.1.26</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>



Mime
View raw message