diff --git a/libraries/pom.xml b/libraries/pom.xml index 9f19a65f825..d5789265bdc 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -85,6 +85,8 @@ tools/kotlin-maven-sam-with-receiver tools/kotlin-maven-serialization + tools/kotlin-bom + tools/kotlin-maven-plugin-test examples/kotlin-java-example diff --git a/libraries/tools/kotlin-bom/pom.xml b/libraries/tools/kotlin-bom/pom.xml new file mode 100644 index 00000000000..e614c4b02b3 --- /dev/null +++ b/libraries/tools/kotlin-bom/pom.xml @@ -0,0 +1,135 @@ + + + + 4.0.0 + + org.jetbrains.kotlin + kotlin-bom + 1.3-SNAPSHOT + pom + + + + Kotlin Libraries bill-of-materials + Kotlin is a statically typed programming language that compiles to JVM byte codes and JavaScript + http://kotlinlang.org/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + + + https://github.com/JetBrains/kotlin + scm:git:https://github.com/JetBrains/kotlin.git + scm:git:https://github.com/JetBrains/kotlin.git + + + + + JetBrains + JetBrains Team + JetBrains + http://www.jetbrains.com + + + + + + + ${project.version} + + + + + + + ${project.groupId} + kotlin-stdlib + ${kotlin.version} + + + ${project.groupId} + kotlin-stdlib-jdk7 + ${kotlin.version} + + + ${project.groupId} + kotlin-stdlib-jdk8 + ${kotlin.version} + + + ${project.groupId} + kotlin-stdlib-js + ${kotlin.version} + + + ${project.groupId} + kotlin-stdlib-common + ${kotlin.version} + + + + ${project.groupId} + kotlin-reflect + ${kotlin.version} + + + + ${project.groupId} + kotlin-osgi-bundle + ${kotlin.version} + + + + ${project.groupId} + kotlin-test + ${kotlin.version} + + + ${project.groupId} + kotlin-test-junit + ${kotlin.version} + + + ${project.groupId} + kotlin-test-junit5 + ${kotlin.version} + + + ${project.groupId} + kotlin-test-testng + ${kotlin.version} + + + ${project.groupId} + kotlin-test-js + ${kotlin.version} + + + ${project.groupId} + kotlin-test-common + ${kotlin.version} + + + ${project.groupId} + kotlin-test-annotations-common + ${kotlin.version} + + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index 44e79fac1af..2df1c39f552 100644 --- a/libraries/tools/kotlin-maven-plugin-test/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml @@ -132,9 +132,14 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:${project.version} org.jetbrains.kotlin:kotlin-reflect:${project.version} org.jetbrains.kotlin:kotlin-test-common:${project.version} + org.jetbrains.kotlin:kotlin-test-annotations-common:${project.version} org.jetbrains.kotlin:kotlin-test:${project.version} + org.jetbrains.kotlin:kotlin-test-junit:${project.version} + org.jetbrains.kotlin:kotlin-test-junit5:${project.version} + org.jetbrains.kotlin:kotlin-test-testng:${project.version} org.jetbrains.kotlin:kotlin-test-js:${project.version} org.jetbrains.kotlin:kotlin-script-util:${project.version} + org.jetbrains.kotlin:kotlin-bom:${project.version}:pom true verify diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-bom/invoker.properties b/libraries/tools/kotlin-maven-plugin-test/src/it/test-bom/invoker.properties new file mode 100644 index 00000000000..5b6d48d97db --- /dev/null +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-bom/invoker.properties @@ -0,0 +1 @@ +invoker.goals=dependency:tree package \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-bom/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-bom/pom.xml new file mode 100644 index 00000000000..d026a5dc354 --- /dev/null +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-bom/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + + org.jetbrains.kotlin + test-kotlin-bom + 1.0-SNAPSHOT + + + + + org.jetbrains.kotlin + kotlin-bom + ${kotlin.version} + pom + import + + + + + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-stdlib-js + runtime + + + org.jetbrains.kotlin + kotlin-stdlib-common + runtime + + + + + + com.fasterxml.jackson.module + jackson-module-kotlin + 2.9.0 + + + + + + ${project.basedir}/src/main/kotlin + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.version} + + + compile + process-sources + + compile + + + + test-compile + process-test-sources + + test-compile + + + + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-bom/verify.groovy b/libraries/tools/kotlin-maven-plugin-test/src/it/test-bom/verify.groovy new file mode 100644 index 00000000000..e1ee6587f8b --- /dev/null +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-bom/verify.groovy @@ -0,0 +1,18 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +import java.io.*; + +File file = new File(basedir, "target/test-kotlin-bom-1.0-SNAPSHOT.jar") +if (!file.exists() || !file.isFile()) { + throw new FileNotFoundException("Could not find generated JAR: " + file) +} + +String expectedDependency = "org.jetbrains.kotlin:kotlin-reflect:jar:$kotlinVersion:compile" +List lines = new File(basedir, "build.log").readLines() + +if (!lines.any { it.contains(expectedDependency) }) { + throw new Exception("Expected to find dependency '$expectedDependency' in dependency tree") +} \ No newline at end of file