Repository: spark
Updated Branches:
  refs/heads/master e12b5b61c -> ad16da1bc


[HOTFIX]: Minor clean up regarding skipped artifacts in build files.

There are two relevant 'skip' configurations in the build, the first
is for "mvn install" and the second is for "mvn deploy". As of 1.2,
we actually use "mvn install" to generate our deployed artifcts,
because we have some customization of the nexus upload due to having
to cross compile for Scala 2.10 and 2.11.

There is no reason to have differents settings for these values,
this patch simply cleans this up for the repl/ and yarn/
projects.

Author: Patrick Wendell <[email protected]>

Closes #4080 from pwendell/master and squashes the following commits:

e21b78b [Patrick Wendell] [HOTFIX]: Minor clean up regarding skipped artifacts 
in build files.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ad16da1b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ad16da1b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ad16da1b

Branch: refs/heads/master
Commit: ad16da1bcc500d0fe594853cd00470dc34b007fa
Parents: e12b5b6
Author: Patrick Wendell <[email protected]>
Authored: Sat Jan 17 23:15:12 2015 -0800
Committer: Patrick Wendell <[email protected]>
Committed: Sat Jan 17 23:15:12 2015 -0800

----------------------------------------------------------------------
 repl/pom.xml |  7 -------
 yarn/pom.xml | 10 ----------
 2 files changed, 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/ad16da1b/repl/pom.xml
----------------------------------------------------------------------
diff --git a/repl/pom.xml b/repl/pom.xml
index 0bc8bcc..ae7c31a 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -92,13 +92,6 @@
     
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
     
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
       <!-- Include a source dir depending on the Scala version -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

http://git-wip-us.apache.org/repos/asf/spark/blob/ad16da1b/yarn/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/pom.xml b/yarn/pom.xml
index b86857d..7595549 100644
--- a/yarn/pom.xml
+++ b/yarn/pom.xml
@@ -123,16 +123,6 @@
   </profiles>
 
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-
     
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
     
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
   </build>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to