From d8ea3ddcc80673f1a3543bc435d66ff3c0c06634 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 13 Jul 2017 07:21:30 +0300 Subject: [PATCH] Cleanup poms of projects migrated to gradle --- .../kotlin-gradle-subplugin-example/pom.xml | 107 --------- libraries/pom.xml | 7 - libraries/tools/kotlin-allopen/pom.xml | 148 ------------ .../tools/kotlin-gradle-plugin-api/pom.xml | 76 ------- .../pom.xml | 172 -------------- libraries/tools/kotlin-gradle-plugin/pom.xml | 214 ------------------ libraries/tools/kotlin-noarg/pom.xml | 148 ------------ .../tools/kotlin-sam-with-receiver/pom.xml | 148 ------------ libraries/tools/kotlin-stdlib-gen/pom.xml | 96 -------- 9 files changed, 1116 deletions(-) delete mode 100644 libraries/examples/kotlin-gradle-subplugin-example/pom.xml delete mode 100755 libraries/tools/kotlin-allopen/pom.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin-api/pom.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/pom.xml delete mode 100644 libraries/tools/kotlin-gradle-plugin/pom.xml delete mode 100755 libraries/tools/kotlin-noarg/pom.xml delete mode 100755 libraries/tools/kotlin-sam-with-receiver/pom.xml delete mode 100644 libraries/tools/kotlin-stdlib-gen/pom.xml diff --git a/libraries/examples/kotlin-gradle-subplugin-example/pom.xml b/libraries/examples/kotlin-gradle-subplugin-example/pom.xml deleted file mode 100644 index d28234e630e..00000000000 --- a/libraries/examples/kotlin-gradle-subplugin-example/pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - 4.0.0 - - 1.4.1 - 3.0.4 - - - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - - kotlin-gradle-subplugin-example - jar - - Sample Kotlin Gradle subplugin - - - - org.jetbrains.kotlin - kotlin-stdlib - ${project.version} - provided - - - org.jetbrains.kotlin - kotlin-gradle-plugin-api - ${project.version} - - - org.jetbrains.kotlin - gradle-api - 1.6 - provided - - - org.jetbrains.kotlin - kotlin-compiler-embeddable - ${project.version} - provided - - - org.jetbrains.kotlin - kotlin-test-junit - ${project.version} - - - - - src/main/kotlin - src/test/kotlin - - - - src/main/resources - true - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${project.version} - - - - compile - compile - compile - - - ${project.basedir}/src/main/kotlin - - - - - - test-compile - test-compile - test-compile - - - - - - maven-deploy-plugin - - true - - - - - - - - jetbrains-utils - http://repository.jetbrains.com/utils - - - diff --git a/libraries/pom.xml b/libraries/pom.xml index 22e9b9ed440..2601222d89f 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -110,13 +110,6 @@ examples/browser-example-with-library examples/kotlin-jsr223-local-example examples/kotlin-jsr223-daemon-local-eval-example - - - - - - - diff --git a/libraries/tools/kotlin-allopen/pom.xml b/libraries/tools/kotlin-allopen/pom.xml deleted file mode 100755 index 43ad70fe3bd..00000000000 --- a/libraries/tools/kotlin-allopen/pom.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - 4.0.0 - - 3.0.4 - ${basedir}/../../../plugins/allopen/allopen-cli/src - ${basedir}/src/main/kotlin - ${basedir}/src/main/resources - ${basedir}/target/src/main/kotlin - ${basedir}/target/resource - - - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - - kotlin-allopen - jar - - All-open plugin for Gradle - - - - jetbrains-utils - http://repository.jetbrains.com/utils - - - - - - org.jetbrains.kotlin - kotlin-stdlib - ${project.version} - - - org.jetbrains.kotlin - kotlin-compiler-embeddable - ${project.version} - provided - - - org.jetbrains.kotlin - kotlin-gradle-plugin-api - ${project.version} - provided - - - org.jetbrains.kotlin - gradle-api - 2.2 - provided - - - - - ${allopen.target-src} - - - ${allopen.target-resources} - - - - - - maven-resources-plugin - 3.0.0 - - - copy-sources - validate - - copy-resources - - - ${allopen.target-src} - - ${allopen.src} - ${allopen.gradle.plugin.src} - - - - - copy-resources - validate - - copy-resources - - - ${allopen.target-resources}/META-INF - - ${allopen.src}/META-INF - ${allopen.gradle.plugin.resources}/META-INF - - - - - - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - generate-sources - - replace - - - - - - ${allopen.target-src}/** - - - - (?<!\.)com\.intellij - org.jetbrains.kotlin.com.intellij - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${project.version} - - - - compile - compile - compile - - - ${allopen.target-src} - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-api/pom.xml b/libraries/tools/kotlin-gradle-plugin-api/pom.xml deleted file mode 100644 index bb9b0271b0d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-api/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - 4.0.0 - - 1.4.1 - 3.0.4 - - - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - - kotlin-gradle-plugin-api - jar - - Gradle plugin API for Kotlin - - - - jetbrains-utils - http://repository.jetbrains.com/utils - - - - - - org.jetbrains.kotlin - kotlin-stdlib - ${project.version} - - - org.jetbrains.kotlin - gradle-api - 1.6 - provided - - - com.android.tools.build - gradle - 0.4.2 - provided - - - - - ${project.basedir}/src/main/kotlin - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${project.version} - - - - compile - compile - compile - - - - test-compile - test-compile - test-compile - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/pom.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/pom.xml deleted file mode 100644 index c1dfa8d1b18..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/pom.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - - 4.0.0 - - 3.0.4 - - - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - - kotlin-gradle-plugin-integration-tests - jar - - - - org.jetbrains.kotlin - kotlin-gradle-plugin - ${project.version} - test - - - org.jetbrains.kotlin - annotation-processor-example - ${project.version} - test - - - org.jetbrains.kotlin - kotlin-android-extensions - ${project.version} - test - - - org.jetbrains.kotlin - kotlin-gradle-plugin - test-jar - ${project.version} - test - - - org.jetbrains.kotlin - kotlin-allopen - ${project.version} - test - - - org.jetbrains.kotlin - kotlin-gradle-subplugin-example - ${project.version} - test - - - org.jetbrains.kotlin - kotlin-build-common-test - ${project.version} - test - - - org.jetbrains.kotlin - gradle-api - 2.2 - provided - - - - - ${project.basedir}/src/test/kotlin - - - - ${project.basedir}/src/main/resources - true - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${project.version} - - - - test-compile - test-compile - test-compile - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - - src/test/resources/** - - - - - maven-failsafe-plugin - 2.6 - - - - integration-test - verify - - - - - - maven-deploy-plugin - - true - - - - - - - - true - skip-gradle-integration-tests - - - - org.apache.maven.plugins - maven-failsafe-plugin - - true - - - - - - - run-gradle-integration-tests - - - - org.apache.maven.plugins - maven-failsafe-plugin - - false - - - - - - - - - - jetbrains-utils - http://repository.jetbrains.com/utils - - - central - bintray - http://jcenter.bintray.com - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/pom.xml b/libraries/tools/kotlin-gradle-plugin/pom.xml deleted file mode 100644 index b91126cdb1e..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/pom.xml +++ /dev/null @@ -1,214 +0,0 @@ - - - - - 4.0.0 - - 3.0.4 - - - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - - kotlin-gradle-plugin - jar - - - - commons-io - commons-io - 2.4 - - - commons-lang - commons-lang - 2.6 - - - org.jetbrains.kotlin - kotlin-stdlib - ${project.version} - - - org.jetbrains.kotlin - kotlin-android-extensions - ${project.version} - - - org.jetbrains.kotlin - kotlin-gradle-plugin-api - ${project.version} - - - org.jetbrains.kotlin - kotlin-compiler-embeddable - ${project.version} - - - org.jetbrains.kotlin - kotlin-compiler-runner - ${project.version} - - - org.jetbrains.kotlin - kotlin-annotation-processing - ${project.version} - - - org.jetbrains.kotlin - kotlin-build-common-test - ${project.version} - test - - - org.jetbrains.kotlin - kotlin-test-junit - ${project.version} - test - - - com.android.tools.build - gradle - 2.0.0 - provided - - - org.jetbrains.kotlin - gradle-api - 2.2 - provided - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - - - - ${project.basedir}/src/main/resources - true - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - - test-jar - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${project.version} - - - - compile - compile - compile - - - ${project.basedir}/src/main/kotlin - - - - - - test-compile - test-compile - test-compile - - - - - org.codehaus.gmaven - gmaven-plugin - 1.5 - - 2.0 - - - - - process-sources - compile - - - - ${project.basedir}/src/main/groovy - - **/*.groovy - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - once - ${env.JDK_18}/bin/java - - - - org.jetbrains.dokka - dokka-maven-plugin - 0.9.9 - - - pre-site - - dokka - - - - - markdown - - - ${project.basedir}/Module.md - - - - - - - - - - jetbrains-utils - http://repository.jetbrains.com/utils - - - central - bintray - http://jcenter.bintray.com - - - - - - jcenter - JCenter - https://jcenter.bintray.com/ - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-noarg/pom.xml b/libraries/tools/kotlin-noarg/pom.xml deleted file mode 100755 index 3ff13e2cc20..00000000000 --- a/libraries/tools/kotlin-noarg/pom.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - 4.0.0 - - 3.0.4 - ${basedir}/../../../plugins/noarg/noarg-cli/src - ${basedir}/src/main/kotlin - ${basedir}/src/main/resources - ${basedir}/target/src/main/kotlin - ${basedir}/target/resource - - - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - - kotlin-noarg - jar - - All-open plugin for Gradle - - - - jetbrains-utils - http://repository.jetbrains.com/utils - - - - - - org.jetbrains.kotlin - kotlin-stdlib - ${project.version} - - - org.jetbrains.kotlin - kotlin-compiler-embeddable - ${project.version} - provided - - - org.jetbrains.kotlin - kotlin-gradle-plugin-api - ${project.version} - provided - - - org.jetbrains.kotlin - gradle-api - 1.6 - provided - - - - - ${noarg.target-src} - - - ${noarg.target-resources} - - - - - - maven-resources-plugin - 3.0.0 - - - copy-sources - validate - - copy-resources - - - ${noarg.target-src} - - ${noarg.src} - ${noarg.gradle.plugin.src} - - - - - copy-resources - validate - - copy-resources - - - ${noarg.target-resources}/META-INF - - ${noarg.src}/META-INF - ${noarg.gradle.plugin.resources}/META-INF - - - - - - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - generate-sources - - replace - - - - - - ${noarg.target-src}/** - - - - (?<!\.)com\.intellij - org.jetbrains.kotlin.com.intellij - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${project.version} - - - - compile - compile - compile - - - ${noarg.target-src} - - - - - - - - diff --git a/libraries/tools/kotlin-sam-with-receiver/pom.xml b/libraries/tools/kotlin-sam-with-receiver/pom.xml deleted file mode 100755 index 4a5e9f91213..00000000000 --- a/libraries/tools/kotlin-sam-with-receiver/pom.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - 4.0.0 - - 3.0.4 - ${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver-cli/src - ${basedir}/src/main/kotlin - ${basedir}/src/main/resources - ${basedir}/target/src/main/kotlin - ${basedir}/target/resource - - - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - - kotlin-sam-with-receiver - jar - - All-open plugin for Gradle - - - - jetbrains-utils - http://repository.jetbrains.com/utils - - - - - - org.jetbrains.kotlin - kotlin-stdlib - ${project.version} - - - org.jetbrains.kotlin - kotlin-compiler-embeddable - ${project.version} - provided - - - org.jetbrains.kotlin - kotlin-gradle-plugin-api - ${project.version} - provided - - - org.jetbrains.kotlin - gradle-api - 1.6 - provided - - - - - ${sam.target-src} - - - ${sam.target-resources} - - - - - - maven-resources-plugin - 3.0.0 - - - copy-sources - validate - - copy-resources - - - ${sam.target-src} - - ${sam.src} - ${sam.gradle.plugin.src} - - - - - copy-resources - validate - - copy-resources - - - ${sam.target-resources}/META-INF - - ${sam.src}/META-INF - ${sam.gradle.plugin.resources}/META-INF - - - - - - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - generate-sources - - replace - - - - - - ${sam.target-src}/** - - - - (?<!\.)com\.intellij - org.jetbrains.kotlin.com.intellij - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${project.version} - - - - compile - compile - compile - - - ${sam.target-src} - - - - - - - - diff --git a/libraries/tools/kotlin-stdlib-gen/pom.xml b/libraries/tools/kotlin-stdlib-gen/pom.xml deleted file mode 100644 index 59921ca6fd7..00000000000 --- a/libraries/tools/kotlin-stdlib-gen/pom.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - 4.0.0 - - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - - org.jetbrains.kotlin - kotlin-stdlib-gen - 1.1-SNAPSHOT - - 1.1-M03 - 1.1 - ${env.JAVA_HOME} - - - - - false - bintray-kotlin-kotlin-eap-1.1 - bintray - http://dl.bintray.com/kotlin/kotlin-eap-1.1 - - - - - false - bintray-kotlin-kotlin-eap-1.1 - bintray - http://dl.bintray.com/kotlin/kotlin-eap-1.1 - - - - - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - - - src - - - maven-deploy-plugin - - true - - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - - compile - compile - - compile - - - - - - org.codehaus.mojo - exec-maven-plugin - ${exec-maven-plugin.version} - - - - java - - - - - generators.GenerateStandardLibKt - compile - - ${project.parent.basedir}/.. - - - - - - - \ No newline at end of file