From 8fda6a8892a3446e65664ed6e0dec3b4ccd82fa0 Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Tue, 6 Mar 2012 20:15:17 +0000
Subject: [PATCH] got a basic mvn build working (without testing stdlib yet)

---
 libraries/kdoc/pom.xml                        |  12 ++
 libraries/kdoc/src/main/resources/ivyconf.xml |  18 ---
 libraries/pom.xml                             | 109 +++++++++---------
 3 files changed, 68 insertions(+), 71 deletions(-)
 delete mode 100644 libraries/kdoc/src/main/resources/ivyconf.xml

diff --git a/libraries/kdoc/pom.xml b/libraries/kdoc/pom.xml
index 3ac7460cb70..86f21488e1d 100644
--- a/libraries/kdoc/pom.xml
+++ b/libraries/kdoc/pom.xml
@@ -21,4 +21,16 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.goldin.plugins</groupId>
+                <artifactId>ivy-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.goldin.plugins</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/libraries/kdoc/src/main/resources/ivyconf.xml b/libraries/kdoc/src/main/resources/ivyconf.xml
deleted file mode 100644
index 4624a541b24..00000000000
--- a/libraries/kdoc/src/main/resources/ivyconf.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<ivysettings>
-    <property name='ivy.checksums' value=''/>
-    <caches defaultCache="${user.home}/.ivy/cache"/>
-    <settings defaultResolver="jetbrains-repo"/>
-    <statuses>
-        <status name='integration' integration='true'/>
-    </statuses>
-    <resolvers>
-        <url name='jetbrains-repo'   alwaysCheckExactRevision='yes' checkmodified='true'>
-            <ivy      pattern='http://teamcity.jetbrains.com/guestAuth/repository/download/[module]/[revision]/teamcity-ivy.xml'/>
-            <artifact pattern='http://teamcity.jetbrains.com/guestAuth/repository/download/[module]/[revision]/[artifact](.[ext])'/>
-        </url>
-    </resolvers>
-    <modules>
-        <module organisation='org' name='bt343' matcher='regexp' resolver='jetbrains-repo'/>
-        <module organisation='org' name='bt344' matcher='regexp' resolver='jetbrains-repo'/>
-    </modules>
-</ivysettings>
\ No newline at end of file
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 103b0243b3a..546b5480f3b 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -14,7 +14,8 @@
         <junit-version>4.8.1</junit-version>
         <kotlin-compiler.version>0.2.3.8</kotlin-compiler.version>
         <kotlin-maven-plugin.version>0.2.3.8-beta-6</kotlin-maven-plugin.version>
-        <kotlin-sdk>${project.basedir}/../dist/kotlinc</kotlin-sdk>
+        <kotlin-sdk>${project.basedir}/../../dist/kotlinc</kotlin-sdk>
+        <project-root>${project.basedir}/..</project-root>
     </properties>
 
     <repositories>
@@ -50,64 +51,66 @@
     </dependencies>
 
     <modules>
-      <module>stdlib</module>
-      <module>kdoc</module>
+        <module>stdlib</module>
+        <module>kdoc</module>
     </modules>
-      
+
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
 
-        <plugins>
-            <plugin>
-                <groupId>com.goldin.plugins</groupId>
-                <artifactId>ivy-maven-plugin</artifactId>
-                <version>${kotlin-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>add-ivy-dependencies</id>
-                        <goals>
-                            <goal>ivy</goal>
-                        </goals>
-                        <phase>initialize</phase>
-                        <configuration>
-                            <ivyconf>${project.basedir}/src/main/resources/ivyconf.xml</ivyconf>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>ivy.org</groupId>
-                                    <artifactId>bt343</artifactId>
-                                    <version>latest.lastSuccessful</version>
-                                    <classifier>core/intellij-core</classifier>
-                                </dependency>
-                                <dependency>
-                                    <groupId>ivy.org</groupId>
-                                    <artifactId>bt344</artifactId>
-                                    <version>latest.lastSuccessful</version>
-                                    <classifier>kotlin-runtime</classifier>
-                                </dependency>
-                            </dependencies>
-                            <scope>compile</scope>
-                            <verbose>true</verbose>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.goldin.plugins</groupId>
+                    <artifactId>ivy-maven-plugin</artifactId>
+                    <version>${kotlin-maven-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>add-ivy-dependencies</id>
+                            <goals>
+                                <goal>ivy</goal>
+                            </goals>
+                            <phase>initialize</phase>
+                            <configuration>
+                                <ivyconf>${project-root}/etc/ivyconf.xml</ivyconf>
+                                <dependencies>
+                                    <dependency>
+                                        <groupId>ivy.org</groupId>
+                                        <artifactId>bt343</artifactId>
+                                        <version>latest.lastSuccessful</version>
+                                        <classifier>core/intellij-core</classifier>
+                                    </dependency>
+                                    <dependency>
+                                        <groupId>ivy.org</groupId>
+                                        <artifactId>bt344</artifactId>
+                                        <version>latest.lastSuccessful</version>
+                                        <classifier>kotlin-runtime</classifier>
+                                    </dependency>
+                                </dependencies>
+                                <scope>compile</scope>
+                                <verbose>true</verbose>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
 
-            <plugin>
-                <groupId>com.goldin.plugins</groupId>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlin-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>compile-kotlin-sources</id>
-                        <goals>
-                            <goal>compile</goal>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
+                <plugin>
+                    <groupId>com.goldin.plugins</groupId>
+                    <artifactId>kotlin-maven-plugin</artifactId>
+                    <version>${kotlin-maven-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>compile-kotlin-sources</id>
+                            <goals>
+                                <goal>compile</goal>
+                                <goal>testCompile</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
 </project>