Repository: zeppelin Updated Branches: refs/heads/master 3be4b829a -> 5595bfb9d
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5595bfb9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2f7ac3c..ea5adf1 100644 --- a/pom.xml +++ b/pom.xml @@ -385,6 +385,11 @@ </executions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + </plugin> + <!--TODO(alex): make part of the build and reconcile conflicts <plugin> <groupId>com.ning.maven.plugins</groupId> @@ -422,11 +427,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>2.17</version> - <configuration combine.children="append"> + <configuration> <argLine>-Xmx2g -Xms1g -Dfile.encoding=UTF-8</argLine> - <encoding>UTF-8</encoding> - <inputEncoding>UTF-8</inputEncoding> - <outputEncoding>UTF-8</outputEncoding> </configuration> <!-- <excludes> <exclude>**/itest/**</exclude> </excludes> <executions> <execution> <id>surefire-itest</id> <phase>integration-test</phase> <goals> @@ -469,6 +471,33 @@ </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <version>1.0.1</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>validate</goal> + </goals> + </execution> + </executions> + <configuration> + <validationSets> + <validationSet> + <dir>${project.basedir}</dir> + <includes> + <include> + pom.xml + </include> + </includes> + <systemId>_tools/maven-4.0.0.xsd</systemId> + </validationSet> + </validationSets> + </configuration> + </plugin> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. --> <plugin> @@ -750,6 +779,7 @@ <exclude>**/null/**</exclude> <exclude>**/notebook/**</exclude> <exclude>_tools/site/css/*</exclude> + <exclude>_tools/maven-4.0.0.xsd</exclude> <exclude>**/README.md</exclude> <exclude>DEPENDENCIES</exclude> <exclude>DEPLOY.md</exclude> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5595bfb9/zeppelin-zengine/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml index 09a7bd6..ba84f24 100644 --- a/zeppelin-zengine/pom.xml +++ b/zeppelin-zengine/pom.xml @@ -250,7 +250,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>2.17</version> - <configuration combine.children="append"> + <configuration> <forkMode>always</forkMode> </configuration> </plugin>
