diff options
| -rw-r--r-- | pom.xml | 130 | ||||
| -rw-r--r-- | repl/pom.xml | 2 | ||||
| -rw-r--r-- | sql/core/pom.xml | 1 | ||||
| -rw-r--r-- | sql/hive/pom.xml | 1 | ||||
| -rw-r--r-- | tools/pom.xml | 4 |
5 files changed, 53 insertions, 85 deletions
@@ -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> diff --git a/repl/pom.xml b/repl/pom.xml index 70c9bd7c01..a5a0f1fc2c 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> diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 2c03fee9db..be0966641b 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> diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index a17546d706..b00f320318 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> diff --git a/tools/pom.xml b/tools/pom.xml index feffde4c85..298ee2348b 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> |