From e6f1cf1c6148606f70f7212b77fc2ba9571aec1c Mon Sep 17 00:00:00 2001 From: Brennon York Date: Fri, 8 May 2015 12:29:29 -0700 Subject: [PATCH 1/2] updated pom files with cobertura version --- pom.xml | 1 + spark/pom.xml | 40 +++++------- zeppelin-server/pom.xml | 137 ++++++++++++++++++++-------------------- 3 files changed, 87 insertions(+), 91 deletions(-) diff --git a/pom.xml b/pom.xml index 81fd00ecb40..796db7a7880 100644 --- a/pom.xml +++ b/pom.xml @@ -888,6 +888,7 @@ org.codehaus.mojo cobertura-maven-plugin + 2.7 html diff --git a/spark/pom.xml b/spark/pom.xml index f3143c088b7..ea4f5dfdebf 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -1,20 +1,20 @@ +~ 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. +--> 4.0.0 @@ -379,7 +379,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.4 + 2.8 copy-dependencies @@ -395,13 +395,6 @@ org.datanucleus - - - - - maven-dependency-plugin - 2.8 - package @@ -424,6 +417,7 @@ + diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 4b2b4d9264d..a90ca1615e0 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -1,20 +1,20 @@ +~ 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. +--> 4.0.0 @@ -67,13 +67,13 @@ ${cxf.version} - - org.java-websocket - Java-WebSocket - 1.3.0 - + + org.java-websocket + Java-WebSocket + 1.3.0 + - + com.wordnik swagger-jersey-jaxrs_2.10 @@ -177,7 +177,7 @@ org.eclipse.jetty.orbit javax.servlet.jsp 2.2.0.v201112011158 - + org.eclipse.jetty.orbit javax.servlet @@ -207,7 +207,7 @@ commons-codec commons-codec - + @@ -259,29 +259,29 @@ com.sun.jersey jersey-server - + javax.ws.rs javax.ws.rs-api - + - - javax.ws.rs - javax.ws.rs-api - 2.0-m10 - + + javax.ws.rs + javax.ws.rs-api + 2.0-m10 + - org.scala-lang - scala-library + org.scala-lang + scala-library - org.scalatest - scalatest_${scala.binary.version} - test + org.scalatest + scalatest_${scala.binary.version} + test @@ -320,7 +320,7 @@ - + -Xmx2048m @@ -335,38 +335,39 @@ - org.scala-tools - maven-scala-plugin - - - - testCompile - - - - - - - org.scalatest - scalatest-maven-plugin - 1.0 - - - - 1 - - - - - test - - test - - - - - - + org.scala-tools + maven-scala-plugin + 2.15.2 + + + + testCompile + + + + + + + org.scalatest + scalatest-maven-plugin + 1.0 + + + + 1 + + + + + test + + test + + + + + + maven-antrun-plugin 1.6 From 81929ee03ea42cf765e7c3e368b4725397475c24 Mon Sep 17 00:00:00 2001 From: Brennon York Date: Fri, 8 May 2015 12:34:53 -0700 Subject: [PATCH 2/2] reverted license formatting changes --- spark/pom.xml | 30 +++++++++++++++--------------- zeppelin-server/pom.xml | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/spark/pom.xml b/spark/pom.xml index ea4f5dfdebf..3b472b58cd5 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -1,20 +1,20 @@ + ~ 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. + --> 4.0.0 diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index a90ca1615e0..4dc09045b21 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -1,20 +1,20 @@ + ~ 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. + --> 4.0.0