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

Specify kotlin snapshot version in maven plugin integration tests only once.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-05-18 17:30:23 +03:00
parent f81192d48f
commit 7f5b586e3f
30 changed files with 90 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-maven-plugin-test/pom.xml
+4 -1
View File
@@ -44,13 +44,16 @@
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.5</version>
<version>1.9</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<properties>
<kotlin.version>${project.version}</kotlin.version>
</properties>
<!--This could speed up test by providing local repo as remote repo for test but might be tricky on different OS-->
<!--<settingsFile>src/it/settings.xml</settingsFile>-->
<localRepositoryPath>local-repo</localRepositoryPath>
libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/pom.xml
+4 -9
View File
@@ -4,14 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-accessToInternal</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -22,7 +17,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -51,7 +46,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/verify.bsh
+1 -1
View File
@@ -1,6 +1,6 @@
import java.io.*;
File file = new File(basedir, "target/test-accessToInternal-1.1-SNAPSHOT.jar");
File file = new File(basedir, "target/test-accessToInternal-1.0-SNAPSHOT.jar");
if (!file.exists() || !file.isFile()) {
throw new FileNotFoundException("Could not find generated JAR: " + file);
}
libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/pom.xml
+4 -9
View File
@@ -4,14 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-classpath</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -22,7 +17,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -51,7 +46,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/verify.bsh
+1 -1
View File
@@ -1,6 +1,6 @@
import java.io.*;
File file = new File(basedir, "target/test-classpath-1.1-SNAPSHOT.jar");
File file = new File(basedir, "target/test-classpath-1.0-SNAPSHOT.jar");
if (!file.exists() || !file.isFile()) {
throw new FileNotFoundException("Could not find generated JAR: " + file);
}
libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml
+4 -9
View File
@@ -4,20 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-executeKotlinScriptBuildAccess</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -27,7 +22,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>execute-kotlin-script</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptCompileError/pom.xml
+4 -9
View File
@@ -4,20 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-executeKotlinScriptCompileError</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -27,7 +22,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>execute-kotlin-script</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptFile/pom.xml
+4 -9
View File
@@ -4,20 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-executeKotlinScriptFile</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -27,7 +22,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>execute-kotlin-script</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptInline/pom.xml
+4 -9
View File
@@ -4,20 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-executeKotlinScriptInline</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -27,7 +22,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>execute-kotlin-script</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptScriptException/pom.xml
+4 -9
View File
@@ -4,20 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-executeKotlinScriptScriptException</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -27,7 +22,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>execute-kotlin-script</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/pom.xml
+4 -9
View File
@@ -4,14 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-extraArguments</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -22,7 +17,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -51,7 +46,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/verify.bsh
+1 -1
View File
@@ -1,6 +1,6 @@
import java.io.*;
File file = new File(basedir, "target/test-extraArguments-1.1-SNAPSHOT.jar");
File file = new File(basedir, "target/test-extraArguments-1.0-SNAPSHOT.jar");
if (!file.exists() || !file.isFile()) {
throw new FileNotFoundException("Could not find generated JAR: " + file);
}
libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/pom.xml
+4 -9
View File
@@ -4,14 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-helloworld</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -22,7 +17,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -51,7 +46,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/verify.bsh
+1 -1
View File
@@ -1,6 +1,6 @@
import java.io.*;
File file = new File(basedir, "target/test-helloworld-1.1-SNAPSHOT.jar");
File file = new File(basedir, "target/test-helloworld-1.0-SNAPSHOT.jar");
if (!file.exists() || !file.isFile()) {
throw new FileNotFoundException("Could not find generated JAR: " + file);
}
libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml
+4 -9
View File
@@ -4,20 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-js-extraArguments</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -27,7 +22,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml
+4 -9
View File
@@ -4,20 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-js-suppressWarningsAndVersion</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -27,7 +22,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/pom.xml
+4 -9
View File
@@ -4,14 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-moduleName</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -22,7 +17,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -51,7 +46,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<configuration>
<moduleName>customName</moduleName>
</configuration>
libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/verify.bsh
+1 -1
View File
@@ -1,6 +1,6 @@
import java.io.*;
File file = new File(basedir, "target/test-moduleName-1.1-SNAPSHOT.jar");
File file = new File(basedir, "target/test-moduleName-1.0-SNAPSHOT.jar");
if (!file.exists() || !file.isFile()) {
throw new FileNotFoundException("Could not find generated JAR: " + file);
}
libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/pom.xml
+4 -9
View File
@@ -4,14 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-moduleNameDefault</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -22,7 +17,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -51,7 +46,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/verify.bsh
+1 -1
View File
@@ -1,6 +1,6 @@
import java.io.*;
File file = new File(basedir, "target/test-moduleNameDefault-1.1-SNAPSHOT.jar");
File file = new File(basedir, "target/test-moduleNameDefault-1.0-SNAPSHOT.jar");
if (!file.exists() || !file.isFile()) {
throw new FileNotFoundException("Could not find generated JAR: " + file);
}
libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir-absolute/pom.xml
+4 -9
View File
@@ -4,21 +4,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-multimodule-root</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -32,7 +27,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir-absolute/sub/pom.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-multimodule-root</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,7 +18,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir/pom.xml
+4 -9
View File
@@ -4,21 +4,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-multimodule-root</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -32,7 +27,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule-srcdir/sub/pom.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-multimodule-root</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,7 +18,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule/pom.xml
+4 -9
View File
@@ -4,21 +4,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-multimodule-root</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -32,7 +27,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-multimodule/sub/pom.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-multimodule-root</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -19,7 +19,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/pom.xml
+4 -9
View File
@@ -4,14 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-reflection</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -22,7 +17,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -51,7 +46,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/verify.bsh
+1 -1
View File
@@ -1,7 +1,7 @@
import java.io.*;
import java.net.*;
File file = new File(basedir, "target/test-reflection-1.1-SNAPSHOT.jar");
File file = new File(basedir, "target/test-reflection-1.0-SNAPSHOT.jar");
if (!file.exists() || !file.isFile()) {
throw new FileNotFoundException("Could not find generated JAR: " + file);
}
libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/pom.xml
+4 -9
View File
@@ -4,14 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>test-helloworld</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -22,7 +17,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
@@ -51,7 +46,7 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/verify.bsh
+1 -1
View File
@@ -1,6 +1,6 @@
import java.io.*;
File file = new File(basedir, "target/test-helloworld-1.1-SNAPSHOT.jar");
File file = new File(basedir, "target/test-helloworld-1.0-SNAPSHOT.jar");
if (!file.exists() || !file.isFile()) {
throw new FileNotFoundException("Could not find generated JAR: " + file);
}