azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

maven: get rid of intermediate poms: examples, docs, tools (artifacts garbage)

Browse Source
This commit is contained in:
Leonid Shalupov
2012-04-12 09:33:48 +04:00
parent 5b6d6a742c
commit d1246abbf1
14 changed files with 37 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/docs/apidoc/pom.xml
+3 -2
View File
@@ -6,9 +6,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.jetbrains.kotlin.docs</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>docs</artifactId> <artifactId>kotlin-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>apidoc</artifactId> <artifactId>apidoc</artifactId>
libraries/docs/jsdoc/pom.xml
+3 -2
View File
@@ -6,9 +6,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.jetbrains.kotlin.docs</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>docs</artifactId> <artifactId>kotlin-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>jsdoc</artifactId> <artifactId>jsdoc</artifactId>
libraries/docs/pom.xml
-26
View File
@@ -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>
libraries/docs/website/pom.xml
+3 -2
View File
@@ -6,9 +6,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.jetbrains.kotlin.docs</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>docs</artifactId> <artifactId>kotlin-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>website</artifactId> <artifactId>website</artifactId>
libraries/examples/js-example/pom.xml
+3 -2
View File
@@ -6,9 +6,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.jetbrains.kotlin.examples</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>examples</artifactId> <artifactId>kotlin-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>js-example</artifactId> <artifactId>js-example</artifactId>
libraries/examples/kotlin-java-example/pom.xml
+3 -2
View File
@@ -6,9 +6,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.jetbrains.kotlin.examples</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>examples</artifactId> <artifactId>kotlin-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>kotlin-java-example</artifactId> <artifactId>kotlin-java-example</artifactId>
libraries/examples/pom.xml
-26
View File
@@ -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>
libraries/pom.xml
+12 -5
View File
@@ -12,14 +12,14 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <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> <asm.version>3.3.1</asm.version>
<dart.name>dart-r3300</dart.name> <dart.name>dart-r3300</dart.name>
<guava.version>11.0.2</guava.version> <guava.version>11.0.2</guava.version>
<junit-version>4.10</junit-version> <junit-version>4.10</junit-version>
<kotlin-maven-plugin.version>0.2.3.8</kotlin-maven-plugin.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.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target> <maven.compiler.target>1.6</maven.compiler.target>
<maven-jar-plugin.version>2.4</maven-jar-plugin.version> <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
@@ -46,15 +46,22 @@
</distributionManagement> </distributionManagement>
<modules> <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>stdlib</module>
<module>kunit</module> <module>kunit</module>
<module>kotlin-jdbc</module> <module>kotlin-jdbc</module>
<module>kotlin-swing</module> <module>kotlin-swing</module>
<module>docs</module> <module>docs/apidoc</module>
<module>examples</module> <module>docs/website</module>
<module>examples/kotlin-java-example</module>
<module>examples/js-example</module>
</modules> </modules>
<dependencies> <dependencies>
libraries/tools/kdoc-maven-plugin/pom.xml
+2 -1
View File
@@ -11,8 +11,9 @@
<parent> <parent>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>tools</artifactId> <artifactId>kotlin-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>kdoc-maven-plugin</artifactId> <artifactId>kdoc-maven-plugin</artifactId>
libraries/tools/kdoc/pom.xml
+2 -1
View File
@@ -7,8 +7,9 @@
<parent> <parent>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>tools</artifactId> <artifactId>kotlin-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>kdoc</artifactId> <artifactId>kdoc</artifactId>
libraries/tools/kotlin-install/pom.xml
+2 -1
View File
@@ -11,8 +11,9 @@
<parent> <parent>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>tools</artifactId> <artifactId>kotlin-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>kotlin-install</artifactId> <artifactId>kotlin-install</artifactId>
libraries/tools/kotlin-maven-plugin/pom.xml
+2 -1
View File
@@ -11,8 +11,9 @@
<parent> <parent>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>tools</artifactId> <artifactId>kotlin-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
libraries/tools/pom.xml
-29
View File
@@ -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>
libraries/tools/runtime/pom.xml
+2 -1
View File
@@ -7,8 +7,9 @@
<parent> <parent>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>tools</artifactId> <artifactId>kotlin-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>kotlin-runtime</artifactId> <artifactId>kotlin-runtime</artifactId>