diff --git a/libraries/pom.xml b/libraries/pom.xml index 0a550a15e20..b4cfa54905e 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -84,28 +84,28 @@ tools/kotlin-build-common-test tools/kotlin-maven-plugin - tools/runtime - tools/script-runtime - kotlin.test - stdlib/common - stdlib - stdlib/jre7 - stdlib/jre8 - stdlib/samples - tools/kotlin-reflect + + + + + + + + + tools/kotlin-osgi-bundle tools/maven-archetypes - tools/binary-compatibility-validator + tools/idl2k - tools/kotlin-js-library - tools/kotlin-js-tests - tools/kotlin-js-tests-junit + + + tools/kotlin-annotation-processing tools/kotlin-annotation-processing-maven tools/kotlin-allopen diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index 8adc99308c0..ebbf1fbbff8 100644 --- a/libraries/tools/kotlin-maven-plugin-test/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml @@ -125,6 +125,7 @@ org.jetbrains.kotlin:kotlin-maven-plugin:${project.version} org.jetbrains.kotlin:kotlin-maven-allopen:${project.version} org.jetbrains.kotlin:kotlin-maven-noarg:${project.version} + org.jetbrains.kotlin:kotlin-runtime:${project.version} org.jetbrains.kotlin:kotlin-script-runtime:${project.version} org.jetbrains.kotlin:kotlin-stdlib:${project.version} org.jetbrains.kotlin:kotlin-stdlib-common:${project.version} @@ -132,7 +133,6 @@ org.jetbrains.kotlin:kotlin-stdlib-jre7:${project.version} org.jetbrains.kotlin:kotlin-stdlib-jre8:${project.version} org.jetbrains.kotlin:kotlin-reflect:${project.version} - org.jetbrains.kotlin:kotlin-test-parent:${project.version}:pom org.jetbrains.kotlin:kotlin-test-common:${project.version} org.jetbrains.kotlin:kotlin-test:${project.version} org.jetbrains.kotlin:kotlin-test-js:${project.version} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt index 8ab265c7ab0..018cb44c386 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-kotlin-version-in-manifest/src/main/kotlin/test.kt @@ -4,15 +4,14 @@ import java.net.URL import java.util.jar.Attributes import java.util.jar.Manifest -// "Kotlin Reflect" and "Kotlin Script Runtime" are different because unlike other libraries which are built with Maven, they're copied from dist val LIBRARIES = listOf( "kotlin-runtime", "kotlin-stdlib", "kotlin-stdlib-common", "kotlin-stdlib-jre7", "kotlin-stdlib-jre8", - "Kotlin Reflect", - "Kotlin Script Runtime" + "kotlin-reflect", + "kotlin-script-runtime" ) const val KOTLIN_VERSION = "Kotlin-Version"