Repository: spark Updated Branches: refs/heads/master 293672c49 -> 222fa47f0
Revert "[SPARK-3812] [BUILD] Adapt maven build to publish effective pom." This reverts commit c5882c663e054adcd3ecd9f11e91a1929dbc14a3. I am reverting this becuase it appears to cause the maven tests to hang. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/222fa47f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/222fa47f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/222fa47f Branch: refs/heads/master Commit: 222fa47f0dfd6c53aac513655a519521d9396e72 Parents: 293672c Author: Patrick Wendell <[email protected]> Authored: Thu Oct 23 16:01:38 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Thu Oct 23 16:01:38 2014 -0700 ---------------------------------------------------------------------- pom.xml | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/222fa47f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 687cc63..288bbf1 100644 --- a/pom.xml +++ b/pom.xml @@ -248,17 +248,7 @@ </snapshots> </pluginRepository> </pluginRepositories> - <!-- - This is a dummy dependency that is used along with the shading plug-in - to create effective poms on publishing (see SPARK-3812). - --> - <dependencies> - <dependency> - <groupId>org.spark-project.spark</groupId> - <artifactId>unused</artifactId> - <version>1.0.0</version> - </dependency> - </dependencies> + <dependencyManagement> <dependencies> <dependency> @@ -1002,27 +992,6 @@ </pluginManagement> <plugins> - <!-- The shade plug-in is used here to create effective pom's (see SPARK-3812). --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <shadedArtifactAttached>false</shadedArtifactAttached> - <artifactSet> - <includes> - <include>org.spark-project.spark:unused</include> - </includes> - </artifactSet> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
