diff --git a/libraries/tools/kotlin-annotation-processing-maven/pom.xml b/libraries/tools/kotlin-annotation-processing-maven/pom.xml
index a098e6dd654..121c6cc321c 100755
--- a/libraries/tools/kotlin-annotation-processing-maven/pom.xml
+++ b/libraries/tools/kotlin-annotation-processing-maven/pom.xml
@@ -3,169 +3,141 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- 4.0.0
-
- 3.0.4
- ${basedir}/../../../plugins/kapt3/kapt3-compiler/src
- ${basedir}/../../../plugins/kapt3/kapt3-cli/src
- ${basedir}/../../../plugins/kapt3/kapt3-base/src
- ${basedir}/../../../plugins/kapt3/kapt3-runtime/src
- ${basedir}/target/src/main/kotlin
- ${basedir}/target/src/test/kotlin
- ${basedir}/target/resource
-
+ 4.0.0
+
+ 3.0.4
+ ${basedir}/../../../plugins/kapt3/kapt3-compiler/src
+ ${basedir}/../../../plugins/kapt3/kapt3-cli/src
+ ${basedir}/../../../plugins/kapt3/kapt3-compiler/resources
+ ${basedir}/../../../plugins/kapt3/kapt3-base/src
+ ${basedir}/../../../plugins/kapt3/kapt3-runtime/src
+
-
+
+ org.jetbrains.kotlin
+ kotlin-project
+ 1.3-SNAPSHOT
+ ../../pom.xml
+
+
+ kotlin-annotation-processing-maven
+ jar
+
+ Annotation Processor wrapper for Kotlin Maven plugin
+
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+ ${project.version}
+
+
+ org.jetbrains.kotlin
+ kotlin-compiler
+ ${project.version}
+ provided
+
+
+ com.android.tools.build
+ gradle
+ 1.1.0
+ provided
+
+
+
+
+
+ ${annotation-processing.resources}
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ generate-sources
+ add-source
+
+
+ ${annotation-processing.src}
+ ${annotation-processing.cli.src}
+ ${annotation-processing.base.src}
+ ${annotation-processing.runtime.src}
+
+
+
+
+
+
+
+ kotlin-maven-plugin
org.jetbrains.kotlin
- kotlin-project
- 1.3-SNAPSHOT
- ../../pom.xml
-
+ ${project.version}
+
+ ${env.JDK_18}
+
+ ${basedir}/kotlinAnnotation
+
+
- kotlin-annotation-processing-maven
- jar
+
+
+ compile
+ compile
+ compile
+
+
+ test-compile
+ test-compile
+ test-compile
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 1.6
+ 1.6
+
+
+
+ maven-failsafe-plugin
+ 2.6
+
+
+
+ integration-test
+ verify
+
+
+
+
+
+
- Annotation Processor wrapper for Kotlin Maven plugin
-
-
+
+
+ tools_jar_profile
+
+ false
+
+ kotlin-annotation-processing-maven-build.txt
+
+
+
+ ${env.JDK_18}/lib/tools.jar
+
+
- org.jetbrains.kotlin
- kotlin-stdlib
- ${project.version}
+ com.sun
+ tools
+ 1.8.0
+ system
+ ${toolsjar}
-
- org.jetbrains.kotlin
- kotlin-compiler
- ${project.version}
- provided
-
-
- com.android.tools.build
- gradle
- 1.1.0
- provided
-
-
-
-
- ${annotation-processing.target-src}
- ${annotation-processing.target-src-test}
-
-
- ${annotation-processing.target-resource}
-
-
-
-
-
- maven-resources-plugin
- 3.0.0
-
-
- copy-sources
- validate
-
- copy-resources
-
-
- ${annotation-processing.target-src}
-
- ${annotation-processing.src}
- ${annotation-processing.cli.src}
- ${annotation-processing.base.src}
- ${annotation-processing.runtime.src}
-
-
-
-
- copy-resources
- validate
-
- copy-resources
-
-
- ${annotation-processing.target-resource}/META-INF
-
- ${annotation-processing.src}/META-INF
-
-
-
-
-
-
- kotlin-maven-plugin
- org.jetbrains.kotlin
- ${project.version}
-
- ${env.JDK_18}
-
- ${basedir}/kotlinAnnotation
-
-
-
-
-
- compile
- compile
- compile
-
-
- ${annotation-processing.target-src}
-
-
-
-
-
- test-compile
- test-compile
- test-compile
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- 1.6
- 1.6
-
-
-
- maven-failsafe-plugin
- 2.6
-
-
-
- integration-test
- verify
-
-
-
-
-
-
-
-
-
- tools_jar_profile
-
- false
-
- kotlin-annotation-processing-maven-build.txt
-
-
-
- ${env.JDK_18}/lib/tools.jar
-
-
-
- com.sun
- tools
- 1.8.0
- system
- ${toolsjar}
-
-
-
-
+
+
+
diff --git a/libraries/tools/kotlin-maven-allopen/pom.xml b/libraries/tools/kotlin-maven-allopen/pom.xml
index 06b6b16f3b6..b810baf494e 100755
--- a/libraries/tools/kotlin-maven-allopen/pom.xml
+++ b/libraries/tools/kotlin-maven-allopen/pom.xml
@@ -7,10 +7,8 @@
3.0.5
${basedir}/../../../plugins/allopen/allopen-cli/src
+ ${basedir}/../../../plugins/allopen/allopen-cli/resources
${basedir}/src/main/kotlin
- ${basedir}/src/main/resources
- ${basedir}/target/src/main/kotlin
- ${basedir}/target/resource
@@ -40,44 +38,23 @@
- ${allopen.target-src}
-
- ${allopen.target-resources}
-
+ ${allopen.resources}
- maven-resources-plugin
- 3.0.0
+ org.codehaus.mojo
+ build-helper-maven-plugin
- copy-sources
- validate
-
- copy-resources
-
+ generate-sources
+ add-source
- ${allopen.target-src}
-
- ${allopen.src}
- ${allopen.maven.plugin.src}
-
-
-
-
- copy-resources
- validate
-
- copy-resources
-
-
- ${allopen.target-resources}/META-INF
-
- ${allopen.src}/META-INF
- ${allopen.maven.plugin.resources}/META-INF
-
+
+ ${allopen.src}
+ ${allopen.maven.plugin.src}
+
@@ -92,11 +69,6 @@
compile
compile
compile
-
-
- ${allopen.target-src}
-
-
diff --git a/libraries/tools/kotlin-maven-noarg/pom.xml b/libraries/tools/kotlin-maven-noarg/pom.xml
index 2b59c9e5549..3b269959969 100755
--- a/libraries/tools/kotlin-maven-noarg/pom.xml
+++ b/libraries/tools/kotlin-maven-noarg/pom.xml
@@ -7,10 +7,8 @@
3.0.5
${basedir}/../../../plugins/noarg/noarg-cli/src
+ ${basedir}/../../../plugins/noarg/noarg-cli/resources
${basedir}/src/main/kotlin
- ${basedir}/src/main/resources
- ${basedir}/target/src/main/kotlin
- ${basedir}/target/resource
@@ -40,48 +38,28 @@
- ${noarg.target-src}
-
- ${noarg.target-resources}
-
+ ${noarg.resources}
- maven-resources-plugin
- 3.0.0
+ org.codehaus.mojo
+ build-helper-maven-plugin
- copy-sources
- validate
-
- copy-resources
-
+ generate-sources
+ add-source
- ${noarg.target-src}
-
- ${noarg.src}
- ${noarg.maven.plugin.src}
-
-
-
-
- copy-resources
- validate
-
- copy-resources
-
-
- ${noarg.target-resources}/META-INF
-
- ${noarg.src}/META-INF
- ${noarg.maven.plugin.resources}/META-INF
-
+
+ ${noarg.maven.plugin.src}
+ ${noarg.src}
+
+
kotlin-maven-plugin
org.jetbrains.kotlin
@@ -92,11 +70,6 @@
compile
compile
compile
-
-
- ${noarg.target-src}
-
-
diff --git a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
index cd737340558..4035dde8ca6 100755
--- a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
+++ b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
@@ -7,10 +7,8 @@
3.0.5
${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver-cli/src
+ ${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver-cli/resources
${basedir}/src/main/kotlin
- ${basedir}/src/main/resources
- ${basedir}/target/src/main/kotlin
- ${basedir}/target/resource
@@ -40,48 +38,28 @@
- ${sam.target-src}
-
- ${sam.target-resources}
-
+ ${sam.resources}
- maven-resources-plugin
- 3.0.0
+ org.codehaus.mojo
+ build-helper-maven-plugin
- copy-sources
- validate
-
- copy-resources
-
+ generate-sources
+ add-source
- ${sam.target-src}
-
- ${sam.src}
- ${sam.maven.plugin.src}
-
-
-
-
- copy-resources
- validate
-
- copy-resources
-
-
- ${sam.target-resources}/META-INF
-
- ${sam.src}/META-INF
- ${sam.maven.plugin.resources}/META-INF
-
+
+ ${sam.src}
+ ${sam.maven.plugin.src}
+
+
kotlin-maven-plugin
org.jetbrains.kotlin
@@ -92,11 +70,6 @@
compile
compile
compile
-
-
- ${sam.target-src}
-
-
diff --git a/libraries/tools/kotlin-maven-serialization/pom.xml b/libraries/tools/kotlin-maven-serialization/pom.xml
index ea86026b7da..67c00b1be8c 100755
--- a/libraries/tools/kotlin-maven-serialization/pom.xml
+++ b/libraries/tools/kotlin-maven-serialization/pom.xml
@@ -7,12 +7,8 @@
3.0.5
${basedir}/../../../plugins/kotlin-serialization/kotlin-serialization-compiler/src/
- ${basedir}/../../../plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler
+ ${basedir}/../../../plugins/kotlin-serialization/kotlin-serialization-compiler/resources/
${basedir}/src/main/kotlin
- ${basedir}/src/main/resources
- ${basedir}/target/src/main/kotlin
- ${basedir}/target/src/main/kotlin/org/jetbrains/kotlinx/serialization/compiler
- ${basedir}/target/resource
@@ -43,56 +39,23 @@
- ${serialization.target-src}
-
- ${serialization.target-resources}
-
+ ${serialization.resources}
- maven-resources-plugin
- 3.0.0
+ org.codehaus.mojo
+ build-helper-maven-plugin
- copy-maven-sources
- validate
-
- copy-resources
-
+ generate-sources
+ add-source
- ${serialization.target-src}
-
- ${serialization.maven.plugin.src}
-
-
-
-
- copy-sources
- validate
-
- copy-resources
-
-
- ${serialization.target-src.kt}
-
- ${serialization.src.kt}
-
-
-
-
- copy-resources
- validate
-
- copy-resources
-
-
- ${serialization.target-resources}/META-INF
-
- ${serialization.src}/META-INF
- ${serialization.maven.plugin.resources}/META-INF
-
+
+ ${serialization.src}
+ ${serialization.maven.plugin.src}
+
@@ -107,11 +70,6 @@
compile
compile
compile
-
-
- ${serialization.target-src}
-
-