This is an automated email from the ASF dual-hosted git repository.
blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 1aeb631 Remove mortbay Log (#861)
1aeb631 is described below
commit 1aeb6312a8593f04757bba2f293cafa250d65826
Author: Ryan Murray <[email protected]>
AuthorDate: Mon Mar 23 00:16:04 2020 +0100
Remove mortbay Log (#861)
---
build.gradle | 1 +
pig/src/main/java/org/apache/iceberg/pig/IcebergStorage.java | 3 +--
versions.lock | 9 +--------
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/build.gradle b/build.gradle
index fd41d6d..ed8a73d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -61,6 +61,7 @@ subprojects {
testCompile.extendsFrom compileOnly
all {
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+ exclude group: 'org.mortbay.jetty'
}
testArtifacts
diff --git a/pig/src/main/java/org/apache/iceberg/pig/IcebergStorage.java
b/pig/src/main/java/org/apache/iceberg/pig/IcebergStorage.java
index 2d77bdf..d27c576 100644
--- a/pig/src/main/java/org/apache/iceberg/pig/IcebergStorage.java
+++ b/pig/src/main/java/org/apache/iceberg/pig/IcebergStorage.java
@@ -61,7 +61,6 @@ import org.apache.pig.data.Tuple;
import org.apache.pig.impl.logicalLayer.FrontendException;
import org.apache.pig.impl.util.ObjectSerializer;
import org.apache.pig.impl.util.UDFContext;
-import org.mortbay.log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -292,7 +291,7 @@ public class IcebergStorage extends LoadFunc implements
LoadMetadata, LoadPredic
private Table load(String location, Job job) throws IOException {
if (iceberg == null) {
Class<?> tablesImpl =
job.getConfiguration().getClass(PIG_ICEBERG_TABLES_IMPL, HadoopTables.class);
- Log.info("Initializing iceberg tables implementation: " + tablesImpl);
+ LOG.info("Initializing iceberg tables implementation: {}", tablesImpl);
iceberg = (Tables) ReflectionUtils.newInstance(tablesImpl,
job.getConfiguration());
}
diff --git a/versions.lock b/versions.lock
index eadc7b4..3120ccd 100644
--- a/versions.lock
+++ b/versions.lock
@@ -1,5 +1,5 @@
# Run ./gradlew --write-locks to regenerate this file
-ant:ant:1.6.5 (2 constraints: 2d1539e1)
+ant:ant:1.6.5 (1 constraints: 730a54bc)
aopalliance:aopalliance:1.0 (1 constraints: 170a83ac)
asm:asm:3.1 (2 constraints: 4f19c3c6)
com.carrotsearch:hppc:0.7.2 (1 constraints: f70cda14)
@@ -189,7 +189,6 @@ org.datanucleus:datanucleus-api-jdo:4.2.4 (2 constraints:
591df91b)
org.datanucleus:datanucleus-core:4.1.17 (5 constraints: 584455e8)
org.datanucleus:datanucleus-rdbms:4.1.19 (2 constraints: 911dec32)
org.datanucleus:javax.jdo:3.2.0-m3 (1 constraints: 030ea249)
-org.eclipse.jdt:core:3.1.1 (1 constraints: b40a38d8)
org.fusesource.leveldbjni:leveldbjni-all:1.8 (9 constraints: 91a69ae7)
org.glassfish.hk2:hk2-api:2.4.0-b34 (5 constraints: 9d5608c7)
org.glassfish.hk2:hk2-locator:2.4.0-b34 (4 constraints: 3d490865)
@@ -213,12 +212,6 @@ org.json4s:json4s-core_2.11:3.5.3 (1 constraints: 4c0c5316)
org.json4s:json4s-jackson_2.11:3.5.3 (1 constraints: 1c0dd336)
org.json4s:json4s-scalap_2.11:3.5.3 (1 constraints: 0c0b9ae9)
org.lz4:lz4-java:1.4.0 (1 constraints: 160dc336)
-org.mortbay.jetty:jetty:6.1.26 (4 constraints: c8369437)
-org.mortbay.jetty:jetty-util:6.1.26 (7 constraints: 7e689dae)
-org.mortbay.jetty:jsp-2.1:6.1.14 (1 constraints: 9408a38d)
-org.mortbay.jetty:jsp-api-2.1:6.1.14 (2 constraints: 7e130c9d)
-org.mortbay.jetty:servlet-api:2.5-20081211 (1 constraints: 390cbd19)
-org.mortbay.jetty:servlet-api-2.5:6.1.14 (2 constraints: e51482f7)
org.objenesis:objenesis:2.5.1 (2 constraints: 19198bcb)
org.roaringbitmap:RoaringBitmap:0.7.45 (1 constraints: 510d1c44)
org.roaringbitmap:shims:0.7.45 (1 constraints: 260eb249)
