You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/07/16 19:42:34 UTC
spark git commit: [SPARK-9015] [BUILD] Clean project import in scala
ide
Repository: spark
Updated Branches:
refs/heads/master 4ea6480a3 -> b536d5dc6
[SPARK-9015] [BUILD] Clean project import in scala ide
Cleanup maven for a clean import in scala-ide / eclipse.
* remove groovy plugin which is really not needed at all
* add-source from build-helper-maven-plugin is not needed as recent version of scala-maven-plugin do it automatically
* add lifecycle-mapping plugin to hide a few useless warnings from ide
Author: Jan Prach <je...@gmail.com>
Closes #7375 from jendap/clean-project-import-in-scala-ide and squashes the following commits:
c4b4c0f [Jan Prach] fix whitespaces
5a83e07 [Jan Prach] Revert "remove java compiler warnings from java tests"
312007e [Jan Prach] scala-maven-plugin itself add scala sources by default
f47d856 [Jan Prach] remove spark-1.4-staging repository
c8a54db [Jan Prach] remove java compiler warnings from java tests
999a068 [Jan Prach] remove some maven warnings in scala ide
80fbdc5 [Jan Prach] remove groovy and gmavenplus plugin
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b536d5dc
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b536d5dc
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b536d5dc
Branch: refs/heads/master
Commit: b536d5dc6c2c712270b8130ddd9945dff19a27d9
Parents: 4ea6480
Author: Jan Prach <je...@gmail.com>
Authored: Thu Jul 16 18:42:41 2015 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Thu Jul 16 18:42:41 2015 +0100
----------------------------------------------------------------------
pom.xml | 130 ++++++++++++++++++++------------------------------
repl/pom.xml | 2 -
sql/core/pom.xml | 1 -
sql/hive/pom.xml | 1 -
tools/pom.xml | 4 --
5 files changed, 53 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/b536d5dc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aa49e2a..c5c6558 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,6 @@
<aws.kinesis.client.version>1.2.1</aws.kinesis.client.version>
<commons.httpclient.version>4.3.2</commons.httpclient.version>
<commons.math3.version>3.4.1</commons.math3.version>
- <test_classpath_file>${project.build.directory}/spark-test-classpath.txt</test_classpath_file>
<scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version>
<jline.version>${scala.version}</jline.version>
@@ -283,18 +282,6 @@
<enabled>false</enabled>
</snapshots>
</repository>
- <!-- TODO: This can be deleted after Spark 1.4 is posted -->
- <repository>
- <id>spark-1.4-staging</id>
- <name>Spark 1.4 RC4 Staging Repository</name>
- <url>https://repository.apache.org/content/repositories/orgapachespark-1112</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -319,17 +306,6 @@
<version>1.0.0</version>
</dependency>
<!--
- This depndency has been added to provided scope as it is needed for executing build
- specific groovy scripts using gmaven+ and not required for downstream project building
- with spark.
- -->
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>2.3.7</version>
- <scope>provided</scope>
- </dependency>
- <!--
This is needed by the scalatest plugin, and so is declared here to be available in
all child modules, just as scalatest is run in all children
-->
@@ -1412,6 +1388,58 @@
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
+ <!-- This plugin's configuration is used to store Eclipse m2e settings only. -->
+ <!-- It has no influence on the Maven build itself. -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.8,)</versionRange>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <versionRange>[2.6,)</versionRange>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.8,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
@@ -1429,34 +1457,12 @@
</goals>
<configuration>
<includeScope>test</includeScope>
- <outputFile>${test_classpath_file}</outputFile>
+ <outputProperty>test_classpath</outputProperty>
</configuration>
</execution>
</executions>
</plugin>
- <!-- This plugin reads a file into maven property. And it lets us write groovy !! -->
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <phase>process-test-classes</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <scripts>
- <script><![CDATA[
- def file = new File(project.properties.test_classpath_file)
- project.properties.test_classpath = file.getText().split().join(":")
- ]]></script>
- </scripts>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!--
The shade plug-in is used here to create effective pom's (see SPARK-3812), and also
remove references from the shaded libraries from artifacts published by Spark.
@@ -1524,36 +1530,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-scala-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/main/scala</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-scala-test-sources</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/test/scala</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
http://git-wip-us.apache.org/repos/asf/spark/blob/b536d5dc/repl/pom.xml
----------------------------------------------------------------------
diff --git a/repl/pom.xml b/repl/pom.xml
index 70c9bd7..a5a0f1f 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -133,7 +133,6 @@
</goals>
<configuration>
<sources>
- <source>src/main/scala</source>
<source>${extra.source.dir}</source>
</sources>
</configuration>
@@ -146,7 +145,6 @@
</goals>
<configuration>
<sources>
- <source>src/test/scala</source>
<source>${extra.testsource.dir}</source>
</sources>
</configuration>
http://git-wip-us.apache.org/repos/asf/spark/blob/b536d5dc/sql/core/pom.xml
----------------------------------------------------------------------
diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index 2c03fee..be09666 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -123,7 +123,6 @@
</goals>
<configuration>
<sources>
- <source>src/test/scala</source>
<source>src/test/gen-java</source>
</sources>
</configuration>
http://git-wip-us.apache.org/repos/asf/spark/blob/b536d5dc/sql/hive/pom.xml
----------------------------------------------------------------------
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index a17546d..b00f320 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -133,7 +133,6 @@
</goals>
<configuration>
<sources>
- <source>src/test/scala</source>
<source>compatibility/src/test/scala</source>
</sources>
</configuration>
http://git-wip-us.apache.org/repos/asf/spark/blob/b536d5dc/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index feffde4..298ee23 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -76,10 +76,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org