diff --git a/bigquery/src/main/java/org/apache/zeppelin/bigquery/BigQueryInterpreter.java b/bigquery/src/main/java/org/apache/zeppelin/bigquery/BigQueryInterpreter.java index c23bd228e71..a7446e6035d 100644 --- a/bigquery/src/main/java/org/apache/zeppelin/bigquery/BigQueryInterpreter.java +++ b/bigquery/src/main/java/org/apache/zeppelin/bigquery/BigQueryInterpreter.java @@ -101,10 +101,10 @@ public class BigQueryInterpreter extends Interpreter { private static final Function sequenceToStringTransformer = new Function() { - public String apply(CharSequence seq) { - return seq.toString(); - } - }; + public String apply(CharSequence seq) { + return seq.toString(); + } + }; public BigQueryInterpreter(Properties property) { super(property); diff --git a/build-tools/src/main/resources/zeppelin/checkstyle.xml b/build-tools/src/main/resources/zeppelin/checkstyle.xml index aa53d3078ad..3a6897bd4e2 100644 --- a/build-tools/src/main/resources/zeppelin/checkstyle.xml +++ b/build-tools/src/main/resources/zeppelin/checkstyle.xml @@ -46,6 +46,13 @@ limitations under the License. value='All TODOs should be named. e.g. "TODO(johndoe): Refactor when v2 is released."'/> + + + + + + + @@ -69,14 +76,11 @@ limitations under the License. - - + - - - + @@ -166,21 +170,6 @@ limitations under the License. - - - - - - - - - - diff --git a/elasticsearch/src/test/java/org/apache/zeppelin/elasticsearch/ElasticsearchInterpreterTest.java b/elasticsearch/src/test/java/org/apache/zeppelin/elasticsearch/ElasticsearchInterpreterTest.java index 793c652e7db..aa91feb4b50 100644 --- a/elasticsearch/src/test/java/org/apache/zeppelin/elasticsearch/ElasticsearchInterpreterTest.java +++ b/elasticsearch/src/test/java/org/apache/zeppelin/elasticsearch/ElasticsearchInterpreterTest.java @@ -101,26 +101,24 @@ public static void populate() throws IOException { .field("headers", Arrays.asList("Accept: *.*", "Host: apache.org")) .endObject() .field("status", STATUS[RandomUtils.nextInt(0, STATUS.length)]) - .field("content_length", RandomUtils.nextInt(0, 2000)) - ) - .get(); + .field("content_length", RandomUtils.nextInt(0, 2000))) + .get(); } for (int i = 1; i < 3; i++) { elsClient.prepareIndex("logs", "http", "very/strange/id#" + i) .setRefresh(true) .setSource(jsonBuilder() - .startObject() - .field("date", new Date()) - .startObject("request") - .field("method", METHODS[RandomUtils.nextInt(0, METHODS.length)]) - .field("url", "/zeppelin/" + UUID.randomUUID().toString()) - .field("headers", Arrays.asList("Accept: *.*", "Host: apache.org")) - .endObject() - .field("status", STATUS[RandomUtils.nextInt(0, STATUS.length)]) - .field("content_length", RandomUtils.nextInt(0, 2000)) - ) - .get(); + .startObject() + .field("date", new Date()) + .startObject("request") + .field("method", METHODS[RandomUtils.nextInt(0, METHODS.length)]) + .field("url", "/zeppelin/" + UUID.randomUUID().toString()) + .field("headers", Arrays.asList("Accept: *.*", "Host: apache.org")) + .endObject() + .field("status", STATUS[RandomUtils.nextInt(0, STATUS.length)]) + .field("content_length", RandomUtils.nextInt(0, 2000))) + .get(); } final Properties props = new Properties(); diff --git a/java/src/main/java/org/apache/zeppelin/java/JavaInterpreter.java b/java/src/main/java/org/apache/zeppelin/java/JavaInterpreter.java index 7637c215812..7057a5196d7 100644 --- a/java/src/main/java/org/apache/zeppelin/java/JavaInterpreter.java +++ b/java/src/main/java/org/apache/zeppelin/java/JavaInterpreter.java @@ -52,7 +52,7 @@ public void close() { /* Clean up .class files created during the compilation process. */ Stream.of( new File(".").listFiles(f -> f.getAbsolutePath().endsWith(".class"))) - .forEach(f -> f.delete()); + .forEach(f -> f.delete()); } @Override diff --git a/pom.xml b/pom.xml index ad9b8cfa07b..188dfda800c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.apache apache - 28 + 33 @@ -161,27 +161,18 @@ 4.2.0 - 1.8 - 3.7.1 1.7.7 1.7 1.4 2.17 - 3.1.0 2.7 - 3.8.1 - 3.1.2 - 2.8.2 1.6.0 - 3.0.0-M3 1.6.0 4.0.0 - 1.6 3.2.0 3.2.0 1.0.0 3.11.4 - 0.13 3.1.0 1.4 4.8.0 @@ -189,7 +180,6 @@ 2.2.0 1.11.2 3.2.1 - 3.2.2 1.4.1.Final 1.19.0 @@ -621,22 +611,9 @@ ${plugin.git.commit.id.version} - - org.apache.maven.plugins - maven-enforcer-plugin - ${plugin.enforcer.version} - - - - org.apache.maven.plugins - maven-deploy-plugin - ${plugin.deploy.version} - - org.apache.maven.plugins maven-checkstyle-plugin - ${plugin.checkstyle.version} true ${basedir}/src/main/java,${basedir}/src/main/scala @@ -665,12 +642,6 @@ - - org.apache.maven.plugins - maven-clean-plugin - ${plugin.clean.version} - - net.alchim31.maven scala-maven-plugin @@ -688,7 +659,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${plugin.surefire.version} false false @@ -707,12 +677,6 @@ --> - - org.apache.maven.plugins - maven-assembly-plugin - ${plugin.assembly.version} - - org.codehaus.mojo exec-maven-plugin @@ -731,16 +695,9 @@ ${plugin.download.version} - - org.apache.maven.plugins - maven-antrun-plugin - ${plugin.antrun.version} - - org.apache.maven.plugins maven-dependency-plugin - ${plugin.dependency.version} copy-dependencies @@ -781,7 +738,6 @@ org.apache.maven.plugins maven-failsafe-plugin - ${plugin.surefire.version} false false @@ -830,17 +786,6 @@ ${plugin.javadoc.version} - - org.apache.maven.plugins - maven-gpg-plugin - ${plugin.gpg.version} - - - - org.apache.rat - apache-rat-plugin - ${plugin.rat.version} - @@ -1015,6 +960,7 @@ .git/ .github/ .gitignore + .gitattributes git.properties .repository/ .rat-excludes/