Repository: incubator-zeppelin Updated Branches: refs/heads/master 956e3f74a -> a49184cd3
[ZEPPELIN-73]: Fix various Maven warnings in the poms This commit adds a version (2.7) to the Cobertura plugin, for the `spark/pom.xml` joins the `maven-dependency-plugin` with the execution goals, and in the `zeppelin-server/pom.xml` adds a version for `org.scala-tools`. Author: Brennon York <[email protected]> Closes #64 from brennonyork/ZEPPELIN-73 and squashes the following commits: 81929ee [Brennon York] reverted license formatting changes e6f1cf1 [Brennon York] updated pom files with cobertura version Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/a49184cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/a49184cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/a49184cd Branch: refs/heads/master Commit: a49184cd3aba768f32b4c3e1cb44b21cd4e93cc6 Parents: 956e3f7 Author: Brennon York <[email protected]> Authored: Fri May 8 12:34:53 2015 -0700 Committer: Alexander Bezzubov <[email protected]> Committed: Sun May 10 17:22:53 2015 +0900 ---------------------------------------------------------------------- pom.xml | 1 + spark/pom.xml | 10 +--- zeppelin-server/pom.xml | 107 ++++++++++++++++++++++--------------------- 3 files changed, 57 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/a49184cd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 36ea1b9..c1b6b94 100644 --- a/pom.xml +++ b/pom.xml @@ -888,6 +888,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> + <version>2.7</version> <configuration> <formats> <format>html</format> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/a49184cd/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index 16a55f1..72f216d 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -379,7 +379,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.4</version> + <version>2.8</version> <executions> <execution> <id>copy-dependencies</id> @@ -395,13 +395,6 @@ <includeGroupIds>org.datanucleus</includeGroupIds> </configuration> </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> - <executions> <execution> <phase>package</phase> <goals> @@ -424,6 +417,7 @@ </execution> </executions> </plugin> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/a49184cd/zeppelin-server/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 04cac3a..0e68df2 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -67,13 +67,13 @@ <version>${cxf.version}</version> </dependency> - <dependency> - <groupId>org.java-websocket</groupId> - <artifactId>Java-WebSocket</artifactId> - <version>1.3.0</version> - </dependency> + <dependency> + <groupId>org.java-websocket</groupId> + <artifactId>Java-WebSocket</artifactId> + <version>1.3.0</version> + </dependency> -<!-- Swagger --> + <!-- Swagger --> <dependency> <groupId>com.wordnik</groupId> <artifactId>swagger-jersey-jaxrs_2.10</artifactId> @@ -177,7 +177,7 @@ <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>javax.servlet.jsp</artifactId> <version>2.2.0.v201112011158</version> - <exclusions> + <exclusions> <exclusion> <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>javax.servlet</artifactId> @@ -207,7 +207,7 @@ <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </exclusion> - </exclusions> + </exclusions> </dependency> <dependency> @@ -259,29 +259,29 @@ <exclusion> <groupId>com.sun.jersey</groupId> <artifactId>jersey-server</artifactId> - </exclusion> + </exclusion> <exclusion> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - </exclusion> + </exclusion> </exclusions> </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.0-m10</version> - </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>2.0-m10</version> + </dependency> <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> </dependency> <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.binary.version}</artifactId> - <scope>test</scope> + <groupId>org.scalatest</groupId> + <artifactId>scalatest_${scala.binary.version}</artifactId> + <scope>test</scope> </dependency> </dependencies> @@ -320,7 +320,7 @@ </goals> </execution> </executions> - <configuration> + <configuration> <argLine>-Xmx2048m</argLine> </configuration> </plugin> @@ -335,38 +335,39 @@ </plugin> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.scalatest</groupId> - <artifactId>scalatest-maven-plugin</artifactId> - <version>1.0</version> - <configuration> - <stderr/> - <systemProperties> - <spark.testing>1</spark.testing> - </systemProperties> - </configuration> - <executions> - <execution> - <id>test</id> - <goals> - <goal>test</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> + <groupId>org.scala-tools</groupId> + <artifactId>maven-scala-plugin</artifactId> + <version>2.15.2</version> + <executions> + <execution> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.scalatest</groupId> + <artifactId>scalatest-maven-plugin</artifactId> + <version>1.0</version> + <configuration> + <stderr/> + <systemProperties> + <spark.testing>1</spark.testing> + </systemProperties> + </configuration> + <executions> + <execution> + <id>test</id> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> <executions>
