mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
### What is this PR for? **First of all, this PR doesn't affect on runtime application behaivor and existing build processes. Just adding validation and styling** The main goal of this PR is to keep consistency among multiple pom.xml files - added xml-maven-plugin to enforce valid maven conf and xml code style (included in maven verify phase) - while removing 2 invalid `combine.children` conf (they are invalid, useless. see commit messages) - apply 2 space indent according to [maven style guide](https://maven.apache.org/developers/conventions/code.html) For reviewers, most code modification is due to 4064057 (re-indent commit), **so skipping the commit will be helpful to review this**. ### What type of PR is it? [Improvement] ### Todos * [x] - Add maven xml plugin * [x] - Reindent according to maven style guide ### What is the Jira issue? [ZEPPELIN-1695](https://issues.apache.org/jira/browse/ZEPPELIN-1695) ### How should this be tested? CI will do that. Also you can type `mvn xml:validate` usually it takes 10+- seconds. ``` [INFO] Reactor Summary: [INFO] [INFO] Zeppelin ........................................... SUCCESS [ 2.444 s] [INFO] Zeppelin: Interpreter .............................. SUCCESS [ 0.048 s] [INFO] Zeppelin: Zengine .................................. SUCCESS [ 0.029 s] [INFO] Zeppelin: Display system apis ...................... SUCCESS [ 0.025 s] [INFO] Zeppelin: Spark dependencies ....................... SUCCESS [ 0.038 s] [INFO] Zeppelin: Spark .................................... SUCCESS [ 0.040 s] [INFO] Zeppelin: Markdown interpreter ..................... SUCCESS [ 0.022 s] [INFO] Zeppelin: Angular interpreter ...................... SUCCESS [ 0.013 s] [INFO] Zeppelin: Shell interpreter ........................ SUCCESS [ 0.019 s] [INFO] Zeppelin: Livy interpreter ......................... SUCCESS [ 0.018 s] [INFO] Zeppelin: HBase interpreter ........................ SUCCESS [ 0.014 s] [INFO] Zeppelin: Apache Pig Interpreter ................... SUCCESS [ 0.016 s] [INFO] Zeppelin: PostgreSQL interpreter ................... SUCCESS [ 0.012 s] [INFO] Zeppelin: JDBC interpreter ......................... SUCCESS [ 0.012 s] [INFO] Zeppelin: File System Interpreters ................. SUCCESS [ 0.025 s] [INFO] Zeppelin: Flink .................................... SUCCESS [ 0.048 s] [INFO] Zeppelin: Apache Ignite interpreter ................ SUCCESS [ 0.013 s] [INFO] Zeppelin: Kylin interpreter ........................ SUCCESS [ 0.010 s] [INFO] Zeppelin: Python interpreter ....................... SUCCESS [ 0.011 s] [INFO] Zeppelin: Lens interpreter ......................... SUCCESS [ 0.015 s] [INFO] Zeppelin: Apache Cassandra interpreter ............. SUCCESS [ 0.036 s] [INFO] Zeppelin: Elasticsearch interpreter ................ SUCCESS [ 0.014 s] [INFO] Zeppelin: BigQuery interpreter ..................... SUCCESS [ 0.012 s] [INFO] Zeppelin: Alluxio interpreter ...................... SUCCESS [ 0.011 s] [INFO] Zeppelin: Scio ..................................... SUCCESS [ 0.026 s] [INFO] Zeppelin: web Application .......................... SUCCESS [ 1.193 s] [INFO] Zeppelin: Server ................................... SUCCESS [ 0.015 s] [INFO] Zeppelin: Packaging distribution ................... SUCCESS [ 0.022 s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 4.678 s [INFO] Finished at: 2016-11-22T00:24:32+09:00 [INFO] Final Memory: 27M/703M [INFO] ------------------------------------------------------------------------ ``` ### Questions: * Does the licenses files need update? NO * Is there breaking changes for older versions? NO * Does this needs documentation? NO Author: 1ambda <1amb4a@gmail.com> Closes #1662 from 1ambda/feat/check-pom-file-is-well-formed and squashes the following commits:2d8d7d2[1ambda] fix: Remove useless combine.children=appendf858a16[1ambda] fix: Use _tools/maven-4.0.0.xsd1142b46[1ambda] fix: Remove useless encoding options03579e7[1ambda] fix: Remove useless combine.chdilren4418cad[1ambda] feat: Add xml-maven-plugin to validate pom.xml
259 lines
7.2 KiB
XML
259 lines
7.2 KiB
XML
<?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/xsd/maven-4.0.0.xsd">
|
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<parent>
|
|
<artifactId>zeppelin</artifactId>
|
|
<groupId>org.apache.zeppelin</groupId>
|
|
<version>0.7.0-SNAPSHOT</version>
|
|
<relativePath>..</relativePath>
|
|
</parent>
|
|
|
|
<groupId>org.apache.zeppelin</groupId>
|
|
<artifactId>zeppelin-zengine</artifactId>
|
|
<packaging>jar</packaging>
|
|
<version>0.7.0-SNAPSHOT</version>
|
|
<name>Zeppelin: Zengine</name>
|
|
<description>Zeppelin Zengine</description>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>${project.groupId}</groupId>
|
|
<artifactId>zeppelin-interpreter</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>com.amazonaws</groupId>
|
|
<artifactId>aws-java-sdk-s3</artifactId>
|
|
<version>1.10.62</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>com.microsoft.azure</groupId>
|
|
<artifactId>azure-storage</artifactId>
|
|
<version>4.0.0</version>
|
|
<exclusions>
|
|
<exclusion>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-core</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>slf4j-api</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<groupId>org.apache.commons</groupId>
|
|
<artifactId>commons-lang3</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>slf4j-api</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>slf4j-log4j12</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>commons-configuration</groupId>
|
|
<artifactId>commons-configuration</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>commons-io</groupId>
|
|
<artifactId>commons-io</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>commons-logging</groupId>
|
|
<artifactId>commons-logging</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.commons</groupId>
|
|
<artifactId>commons-vfs2</artifactId>
|
|
<version>2.0</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.jackrabbit</groupId>
|
|
<artifactId>jackrabbit-webdav</artifactId>
|
|
<version>1.5.2</version>
|
|
<exclusions>
|
|
<exclusion>
|
|
<groupId>org.apache.httpcomponents</groupId>
|
|
<artifactId>httpclient</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.httpcomponents</groupId>
|
|
<artifactId>httpclient</artifactId>
|
|
<version>4.3.6</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-client</artifactId>
|
|
<version>${jetty.version}</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty.websocket</groupId>
|
|
<artifactId>websocket-client</artifactId>
|
|
<version>${jetty.version}</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.quartz-scheduler</groupId>
|
|
<artifactId>quartz</artifactId>
|
|
<version>2.2.1</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>com.google.code.gson</groupId>
|
|
<artifactId>gson</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>com.google.guava</groupId>
|
|
<artifactId>guava</artifactId>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.lucene</groupId>
|
|
<artifactId>lucene-core</artifactId>
|
|
<version>5.3.1</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.lucene</groupId>
|
|
<artifactId>lucene-analyzers-common</artifactId>
|
|
<version>5.3.1</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.lucene</groupId>
|
|
<artifactId>lucene-queryparser</artifactId>
|
|
<version>5.3.1</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.apache.lucene</groupId>
|
|
<artifactId>lucene-highlighter</artifactId>
|
|
<version>5.3.1</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.reflections</groupId>
|
|
<artifactId>reflections</artifactId>
|
|
<version>0.9.8</version>
|
|
<exclusions>
|
|
<exclusion>
|
|
<groupId>com.google.guava</groupId>
|
|
<artifactId>guava</artifactId>
|
|
</exclusion>
|
|
<exclusion>
|
|
<groupId>xml-apis</groupId>
|
|
<artifactId>xml-apis</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
|
|
<dependency> <!-- because there are two of them above -->
|
|
<groupId>xml-apis</groupId>
|
|
<artifactId>xml-apis</artifactId>
|
|
<version>1.4.01</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.eclipse.jgit</groupId>
|
|
<artifactId>org.eclipse.jgit</artifactId>
|
|
<version>4.1.1.201511131810-r</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>junit</groupId>
|
|
<artifactId>junit</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.mockito</groupId>
|
|
<artifactId>mockito-all</artifactId>
|
|
<version>1.9.0</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>com.google.truth</groupId>
|
|
<artifactId>truth</artifactId>
|
|
<version>0.27</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-server</artifactId>
|
|
<version>${jetty.version}</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
<artifactId>jetty-servlet</artifactId>
|
|
<version>${jetty.version}</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>org.eclipse.jetty.websocket</groupId>
|
|
<artifactId>websocket-server</artifactId>
|
|
<version>${jetty.version}</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
</dependencies>
|
|
|
|
<build>
|
|
<resources>
|
|
<resource>
|
|
<directory>src/main/resources</directory>
|
|
<filtering>true</filtering>
|
|
</resource>
|
|
</resources>
|
|
<plugins>
|
|
<plugin>
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
<version>2.17</version>
|
|
<configuration>
|
|
<forkMode>always</forkMode>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
</project>
|