kotlin-maven-plugin "0.2.3.8-beta-9": no need to use "ivy-maven-plugin" or <systemPath>.

This commit is contained in:
Evgeny Goldin
2012-03-08 15:30:13 +01:00
parent 34a0d266d0
commit 1036c9df17
2 changed files with 12 additions and 112 deletions
+12 -76
View File
@@ -13,16 +13,11 @@
<properties>
<junit-version>4.9</junit-version>
<kotlin-compiler.version>0.2.3.8</kotlin-compiler.version>
<kotlin-maven-plugin.version>0.2.3.8-beta-8</kotlin-maven-plugin.version>
<kotlin-maven-plugin.version>0.2.3.8-beta-9</kotlin-maven-plugin.version>
<project-root>${project.basedir}/..</project-root>
<kotlin-sdk>${project-root}/../dist/kotlinc</kotlin-sdk>
<pegdown.version>1.1.0</pegdown.version>
<surefire-version>2.5</surefire-version>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Not to be used manually! Set to "true" by identically named profile, see below. -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<localKotlin>false</localKotlin>
</properties>
<repositories>
@@ -52,47 +47,6 @@
<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>
<runIf>{{ ! Boolean.valueOf( localKotlin ) }}</runIf>
<ivyconf>${project-root}/etc/ivyconf.xml</ivyconf>
<dependencies>
<dependency>
<groupId>ivy.org</groupId>
<artifactId>bt344</artifactId>
<version>latest.lastSuccessful</version>
<classifier>kotlin-compiler</classifier>
</dependency>
<dependency>
<groupId>ivy.org</groupId>
<artifactId>bt344</artifactId>
<version>latest.lastSuccessful</version>
<classifier>kotlin-runtime</classifier>
</dependency>
<dependency>
<groupId>ivy.org</groupId>
<artifactId>bt343</artifactId>
<version>latest.lastSuccessful</version>
<classifier>core/intellij-core</classifier>
</dependency>
</dependencies>
<scope>compile</scope>
<verbose>true</verbose>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.goldin.plugins</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
@@ -106,6 +60,9 @@
</goals>
</execution>
</executions>
<configuration>
<verbose>false</verbose>
</configuration>
</plugin>
</plugins>
</pluginManagement>
@@ -129,14 +86,14 @@
</plugins>
</build>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Run "mvn clean install -PlocalKotlin" to use locally built Kotlin jars in ${kotlin-sdk}/lib -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<profiles>
<profile>
<id>localKotlin</id>
<properties>
<localKotlin>true</localKotlin>
</properties>
<build>
<pluginManagement>
<plugins>
@@ -152,36 +109,15 @@
<jar>${kotlin-sdk}/lib/intellij-core.jar</jar>
<jar>${kotlin-sdk}/lib/picocontainer.jar</jar>
<jar>${kotlin-sdk}/lib/trove4j.jar</jar>
<jar>${kotlin-sdk}/lib/guava-11.0.1.jar</jar>
<jar>${kotlin-sdk}/lib/asm-commons.jar</jar>
<jar>${kotlin-sdk}/lib/asm.jar</jar>
</kotlinJars>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-compiler</artifactId>
<version>${kotlin-compiler.version}</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/kotlin-compiler.jar</systemPath>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>${kotlin-compiler.version}</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/kotlin-runtime.jar</systemPath>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>intellij-core</artifactId>
<version>${kotlin-compiler.version}</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/intellij-core.jar</systemPath>
</dependency>
</dependencies>
</profile>
</profiles>
-36
View File
@@ -24,7 +24,6 @@
<artifactId>pegdown</artifactId>
<version>${pegdown.version}</version>
</dependency>
<!-- add the kdoc dependency for generating kdoc -->
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
@@ -32,41 +31,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>picocontainer</groupId>
<artifactId>picocontainer</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/picocontainer.jar</systemPath>
</dependency>
<dependency>
<groupId>trove4j</groupId>
<artifactId>trove4j</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/trove4j.jar</systemPath>
</dependency>
<dependency>
<groupId>guava</groupId>
<artifactId>guava</artifactId>
<version>11.0.1</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/guava-11.0.1.jar</systemPath>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/asm-commons.jar</systemPath>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/asm.jar</systemPath>
</dependency>
</dependencies>
<build>