From a07879dbc643f362ed86fe764f6386f160d75aaa Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Mon, 8 Jul 2013 18:45:46 -0700
Subject: scaladoc needs xml and parser-combinators

Concretely, update scala-compiler's pom
to list scala-xml and scala-parser-combinators
on behalf of scaladoc.

NOTE: when spinning off scaladoc, move dependencies to its own pom
---
 src/build/maven/scala-compiler-pom.xml | 56 ++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 23 deletions(-)

(limited to 'src/build/maven')

diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml
index 4b90997da4..6e7f1a0f2c 100644
--- a/src/build/maven/scala-compiler-pom.xml
+++ b/src/build/maven/scala-compiler-pom.xml
@@ -1,13 +1,13 @@
 <project
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.scala-lang</groupId>
 	<artifactId>scala-compiler</artifactId>
 	<packaging>jar</packaging>
 	<version>@VERSION@</version>
-  <name>Scala Compiler</name>
-  <description>Compiler for the Scala Programming Language</description>
+	<name>Scala Compiler</name>
+	<description>Compiler for the Scala Programming Language</description>
 	<url>http://www.scala-lang.org/</url>
 	<inceptionYear>2002</inceptionYear>
 	<organization>
@@ -23,12 +23,12 @@
 		</license>
 	</licenses>
 	<scm>
-                <connection>scm:git:git://github.com/scala/scala.git</connection>
-                <url>https://github.com/scala/scala.git</url>
+		<connection>scm:git:git://github.com/scala/scala.git</connection>
+		<url>https://github.com/scala/scala.git</url>
 	</scm>
 	<issueManagement>
-                <system>JIRA</system>
-                <url>https://issues.scala-lang.org/</url>
+		<system>JIRA</system>
+		<url>https://issues.scala-lang.org/</url>
 	</issueManagement>
 
 	<dependencies>
@@ -37,17 +37,27 @@
 			<artifactId>scala-library</artifactId>
 			<version>@VERSION@</version>
 		</dependency>
+		<dependency> <!-- for scaladoc -->
+			<groupId>org.scala-lang</groupId>
+			<artifactId>scala-xml</artifactId>
+			<version>@VERSION@</version>
+		</dependency>
+		<dependency> <!-- for scaladoc -->
+			<groupId>org.scala-lang</groupId>
+			<artifactId>scala-parser-combinators</artifactId>
+			<version>@VERSION@</version>
+		</dependency>
 		<dependency>
 			<groupId>org.scala-lang</groupId>
 			<artifactId>scala-reflect</artifactId>
 			<version>@VERSION@</version>
 		</dependency>
-    <dependency>
-      <groupId>jline</groupId>
-      <artifactId>jline</artifactId>
-      <version>@JLINE_VERSION@</version>
-      <optional>true</optional>
-    </dependency>
+		<dependency>
+			<groupId>jline</groupId>
+			<artifactId>jline</artifactId>
+			<version>@JLINE_VERSION@</version>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 	<distributionManagement>
 		<repository>
@@ -60,14 +70,14 @@
 			<uniqueVersion>false</uniqueVersion>
 		</snapshotRepository>
 	</distributionManagement>
-  <developers>
-    <developer>
-      <id>lamp</id>
-      <name>EPFL LAMP</name>
-    </developer>
-    <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
-    </developer>
-  </developers>
+	<developers>
+		<developer>
+			<id>lamp</id>
+			<name>EPFL LAMP</name>
+		</developer>
+		<developer>
+			<id>Typesafe</id>
+			<name>Typesafe, Inc.</name>
+		</developer>
+	</developers>
 </project>
-- 
cgit v1.2.3