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

Added "kotlin-maven-plugin" module, extracted <junit> to the parent POM scope "compile".

Browse Source
This commit is contained in:
Evgeny Goldin
2012-03-19 23:19:23 +01:00
parent 1a34a9976e
commit 178d822c89
8 changed files with 32 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/kdoc/pom.xml
-6
View File
@@ -19,12 +19,6 @@
<artifactId>pegdown</artifactId> <artifactId>pegdown</artifactId>
<version>${pegdown.version}</version> <version>${pegdown.version}</version>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
libraries/kotlin-java/pom.xml
-7
View File
@@ -19,13 +19,6 @@
<artifactId>stdlib</artifactId> <artifactId>stdlib</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
libraries/kotlin-jdbc/pom.xml
-7
View File
@@ -19,19 +19,12 @@
<artifactId>stdlib</artifactId> <artifactId>stdlib</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>1.3.164</version> <version>1.3.164</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
libraries/kotlin-maven-plugin/pom.xml
+13 -1
View File
@@ -30,18 +30,30 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>com.github.goldin</groupId> <groupId>com.github.goldin</groupId>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
</plugin> </plugin>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- AnnoMojo: http://wiki.jfrog.org/confluence/display/OSS/Maven+Anno+Mojo -->
<!-- http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-plugin-plugin/ -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId> <artifactId>maven-plugin-plugin</artifactId>
<version>2.6</version> <version>2.9</version>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
<version>2.9</version>
</dependency>
<dependency> <dependency>
<groupId>org.jfrog.maven.annomojo</groupId> <groupId>org.jfrog.maven.annomojo</groupId>
<artifactId>maven-plugin-tools-anno</artifactId> <artifactId>maven-plugin-tools-anno</artifactId>
libraries/kunit/pom.xml
-8
View File
@@ -13,14 +13,6 @@
<artifactId>kunit</artifactId> <artifactId>kunit</artifactId>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
</dependency>
</dependencies>
<build> <build>
<sourceDirectory>${project.basedir}/src</sourceDirectory> <sourceDirectory>${project.basedir}/src</sourceDirectory>
<testSourceDirectory>${project.basedir}/test</testSourceDirectory> <testSourceDirectory>${project.basedir}/test</testSourceDirectory>
libraries/pom.xml
+19 -4
View File
@@ -12,7 +12,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit-version>4.9</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>
<project-root>${project.basedir}/..</project-root> <project-root>${project.basedir}/..</project-root>
<kotlin-sdk>${project-root}/../dist/kotlinc</kotlin-sdk> <kotlin-sdk>${project-root}/../dist/kotlinc</kotlin-sdk>
@@ -23,29 +23,44 @@
<maven-jar-plugin.version>2.4</maven-jar-plugin.version> <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
</properties> </properties>
<repositories> <repositories>
<repository> <repository>
<id>evgenyg.artifactoryonline.com</id> <id>evgenyg.artifactoryonline.com</id>
<url>http://evgenyg.artifactoryonline.com/evgenyg/repo</url> <url>http://evgenyg.artifactoryonline.com/evgenyg/repo/</url>
</repository> </repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>evgenyg.artifactoryonline.com</id> <id>evgenyg.artifactoryonline.com</id>
<url>http://evgenyg.artifactoryonline.com/evgenyg/repo</url> <url>http://evgenyg.artifactoryonline.com/evgenyg/repo/</url>
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
<modules> <modules>
<module>stdlib</module>
<module>kunit</module> <module>kunit</module>
<module>stdlib</module>
<module>kdoc</module> <module>kdoc</module>
<module>kotlin-jdbc</module> <module>kotlin-jdbc</module>
<module>website</module> <module>website</module>
<module>kotlin-java</module> <module>kotlin-java</module>
<module>kotlin-maven-plugin</module>
</modules> </modules>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build> <build>
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory> <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory> <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
libraries/stdlib/pom.xml
-6
View File
@@ -20,12 +20,6 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
libraries/website/pom.xml
-6
View File
@@ -44,12 +44,6 @@
<version>3.3</version> <version>3.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>