From d1246abbf1e38b234944612e085484136c3de6af Mon Sep 17 00:00:00 2001
From: Leonid Shalupov <shalupov@diverse.org.ru>
Date: Thu, 12 Apr 2012 09:33:48 +0400
Subject: [PATCH] maven: get rid of intermediate poms: examples, docs, tools
 (artifacts garbage)

---
 libraries/docs/apidoc/pom.xml                 |  5 ++--
 libraries/docs/jsdoc/pom.xml                  |  5 ++--
 libraries/docs/pom.xml                        | 26 -----------------
 libraries/docs/website/pom.xml                |  5 ++--
 libraries/examples/js-example/pom.xml         |  5 ++--
 .../examples/kotlin-java-example/pom.xml      |  5 ++--
 libraries/examples/pom.xml                    | 26 -----------------
 libraries/pom.xml                             | 17 +++++++----
 libraries/tools/kdoc-maven-plugin/pom.xml     |  3 +-
 libraries/tools/kdoc/pom.xml                  |  3 +-
 libraries/tools/kotlin-install/pom.xml        |  3 +-
 libraries/tools/kotlin-maven-plugin/pom.xml   |  3 +-
 libraries/tools/pom.xml                       | 29 -------------------
 libraries/tools/runtime/pom.xml               |  3 +-
 14 files changed, 37 insertions(+), 101 deletions(-)
 delete mode 100644 libraries/docs/pom.xml
 delete mode 100644 libraries/examples/pom.xml
 delete mode 100644 libraries/tools/pom.xml

diff --git a/libraries/docs/apidoc/pom.xml b/libraries/docs/apidoc/pom.xml
index eca5247cef2..269063c2ff2 100644
--- a/libraries/docs/apidoc/pom.xml
+++ b/libraries/docs/apidoc/pom.xml
@@ -6,9 +6,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.jetbrains.kotlin.docs</groupId>
-        <artifactId>docs</artifactId>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-project</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>apidoc</artifactId>
diff --git a/libraries/docs/jsdoc/pom.xml b/libraries/docs/jsdoc/pom.xml
index cb1045ec071..74f3151a64f 100644
--- a/libraries/docs/jsdoc/pom.xml
+++ b/libraries/docs/jsdoc/pom.xml
@@ -6,9 +6,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.jetbrains.kotlin.docs</groupId>
-        <artifactId>docs</artifactId>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-project</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>jsdoc</artifactId>
diff --git a/libraries/docs/pom.xml b/libraries/docs/pom.xml
deleted file mode 100644
index 29b32d07690..00000000000
--- a/libraries/docs/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.jetbrains.kotlin.docs</groupId>
-    <artifactId>docs</artifactId>
-    <packaging>pom</packaging>
-
-    <properties>
-        <project-root>${project.basedir}/../..</project-root>
-    </properties>
-
-    <modules>
-        <module>apidoc</module>
-        <module>website</module>
-    </modules>
-</project>
diff --git a/libraries/docs/website/pom.xml b/libraries/docs/website/pom.xml
index 684617428a3..1d1592ef4cb 100644
--- a/libraries/docs/website/pom.xml
+++ b/libraries/docs/website/pom.xml
@@ -6,9 +6,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.jetbrains.kotlin.docs</groupId>
-        <artifactId>docs</artifactId>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-project</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>website</artifactId>
diff --git a/libraries/examples/js-example/pom.xml b/libraries/examples/js-example/pom.xml
index e17de4fcc66..94d05c1e09e 100644
--- a/libraries/examples/js-example/pom.xml
+++ b/libraries/examples/js-example/pom.xml
@@ -6,9 +6,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.jetbrains.kotlin.examples</groupId>
-        <artifactId>examples</artifactId>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-project</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>js-example</artifactId>
diff --git a/libraries/examples/kotlin-java-example/pom.xml b/libraries/examples/kotlin-java-example/pom.xml
index 18256b922dd..ac9b4e44532 100644
--- a/libraries/examples/kotlin-java-example/pom.xml
+++ b/libraries/examples/kotlin-java-example/pom.xml
@@ -6,9 +6,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.jetbrains.kotlin.examples</groupId>
-            <artifactId>examples</artifactId>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-project</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>kotlin-java-example</artifactId>
diff --git a/libraries/examples/pom.xml b/libraries/examples/pom.xml
deleted file mode 100644
index 352e59b82d7..00000000000
--- a/libraries/examples/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.jetbrains.kotlin.examples</groupId>
-    <artifactId>examples</artifactId>
-    <packaging>pom</packaging>
-
-    <properties>
-        <project-root>${project.basedir}/../..</project-root>
-    </properties>
-
-    <modules>
-        <module>kotlin-java-example</module>
-        <module>js-example</module>
-    </modules>
-</project>
diff --git a/libraries/pom.xml b/libraries/pom.xml
index c41935b0f95..9748c572417 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -12,14 +12,14 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project-root>${project.basedir}/..</project-root>
+        <project-root>${project.parent.basedir}/..</project-root>
 
         <asm.version>3.3.1</asm.version>
         <dart.name>dart-r3300</dart.name>
         <guava.version>11.0.2</guava.version>
         <junit-version>4.10</junit-version>
         <kotlin-maven-plugin.version>0.2.3.8</kotlin-maven-plugin.version>
-        <kotlin-sdk>${project-root}/../dist/kotlinc</kotlin-sdk>
+        <kotlin-sdk>${project-root}/dist/kotlinc</kotlin-sdk>
         <maven.compiler.source>1.6</maven.compiler.source>
         <maven.compiler.target>1.6</maven.compiler.target>
         <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
@@ -46,15 +46,22 @@
     </distributionManagement>
 
     <modules>
-        <module>tools</module>
+        <module>tools/kotlin-install</module>
+        <module>tools/runtime</module>
+        <module>tools/kotlin-maven-plugin</module>
+        <module>tools/kdoc</module>
+        <module>tools/kdoc-maven-plugin</module>
 
         <module>stdlib</module>
         <module>kunit</module>
         <module>kotlin-jdbc</module>
         <module>kotlin-swing</module>
 
-        <module>docs</module>
-        <module>examples</module>
+        <module>docs/apidoc</module>
+        <module>docs/website</module>
+
+        <module>examples/kotlin-java-example</module>
+        <module>examples/js-example</module>
     </modules>
 
     <dependencies>
diff --git a/libraries/tools/kdoc-maven-plugin/pom.xml b/libraries/tools/kdoc-maven-plugin/pom.xml
index 9d14a87f3d3..35d68ef43ce 100644
--- a/libraries/tools/kdoc-maven-plugin/pom.xml
+++ b/libraries/tools/kdoc-maven-plugin/pom.xml
@@ -11,8 +11,9 @@
 
     <parent>
         <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>tools</artifactId>
+        <artifactId>kotlin-project</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>kdoc-maven-plugin</artifactId>
diff --git a/libraries/tools/kdoc/pom.xml b/libraries/tools/kdoc/pom.xml
index b51fb59988c..4122bf9b973 100644
--- a/libraries/tools/kdoc/pom.xml
+++ b/libraries/tools/kdoc/pom.xml
@@ -7,8 +7,9 @@
 
     <parent>
         <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>tools</artifactId>
+        <artifactId>kotlin-project</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>kdoc</artifactId>
diff --git a/libraries/tools/kotlin-install/pom.xml b/libraries/tools/kotlin-install/pom.xml
index bdf436c311a..70f741662a1 100644
--- a/libraries/tools/kotlin-install/pom.xml
+++ b/libraries/tools/kotlin-install/pom.xml
@@ -11,8 +11,9 @@
 
     <parent>
         <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>tools</artifactId>
+        <artifactId>kotlin-project</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>kotlin-install</artifactId>
diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml
index d55b6d69258..f048372f336 100644
--- a/libraries/tools/kotlin-maven-plugin/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin/pom.xml
@@ -11,8 +11,9 @@
 
     <parent>
         <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>tools</artifactId>
+        <artifactId>kotlin-project</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>kotlin-maven-plugin</artifactId>
diff --git a/libraries/tools/pom.xml b/libraries/tools/pom.xml
deleted file mode 100644
index 8820fa9f78c..00000000000
--- a/libraries/tools/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.jetbrains.kotlin</groupId>
-    <artifactId>tools</artifactId>
-    <packaging>pom</packaging>
-
-    <properties>
-        <project-root>${project.basedir}/../..</project-root>
-    </properties>
-
-    <modules>
-        <module>kotlin-install</module>
-        <module>runtime</module>
-        <module>kotlin-maven-plugin</module>
-        <module>kdoc</module>
-        <module>kdoc-maven-plugin</module>
-    </modules>
-</project>
diff --git a/libraries/tools/runtime/pom.xml b/libraries/tools/runtime/pom.xml
index 6430b3021c7..a1c3e17e1bd 100644
--- a/libraries/tools/runtime/pom.xml
+++ b/libraries/tools/runtime/pom.xml
@@ -7,8 +7,9 @@
 
     <parent>
         <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>tools</artifactId>
+        <artifactId>kotlin-project</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>kotlin-runtime</artifactId>