From c02d5e8dccebcb986751a4d239834313c440dd98 Mon Sep 17 00:00:00 2001
From: Bogdan Mukvich <bogdan.mukvich@jetbrains.com>
Date: Tue, 29 Nov 2022 15:05:04 +0100
Subject: [PATCH] Make maven dependencies provided in kotlin-maven-plugin

KTI-1028
---
 libraries/tools/kotlin-maven-allopen/pom.xml         |  6 ++++++
 libraries/tools/kotlin-maven-lombok/pom.xml          |  6 ++++++
 libraries/tools/kotlin-maven-noarg/pom.xml           |  6 ++++++
 .../it/test-executeKotlinScriptBuildAccess/pom.xml   | 12 ++++++++++++
 .../src/it/test-plugins/test-extension/pom.xml       | 12 ++++++++++++
 libraries/tools/kotlin-maven-plugin/pom.xml          |  6 +-----
 .../tools/kotlin-maven-sam-with-receiver/pom.xml     |  6 ++++++
 libraries/tools/kotlin-maven-serialization/pom.xml   |  6 ++++++
 8 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/libraries/tools/kotlin-maven-allopen/pom.xml b/libraries/tools/kotlin-maven-allopen/pom.xml
index 5a222607afb..dd1b8a699ea 100755
--- a/libraries/tools/kotlin-maven-allopen/pom.xml
+++ b/libraries/tools/kotlin-maven-allopen/pom.xml
@@ -37,6 +37,12 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/libraries/tools/kotlin-maven-lombok/pom.xml b/libraries/tools/kotlin-maven-lombok/pom.xml
index dba37b7e20b..0e9a018e37a 100755
--- a/libraries/tools/kotlin-maven-lombok/pom.xml
+++ b/libraries/tools/kotlin-maven-lombok/pom.xml
@@ -37,6 +37,12 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/libraries/tools/kotlin-maven-noarg/pom.xml b/libraries/tools/kotlin-maven-noarg/pom.xml
index c12e498885f..e9f2c9892a1 100755
--- a/libraries/tools/kotlin-maven-noarg/pom.xml
+++ b/libraries/tools/kotlin-maven-noarg/pom.xml
@@ -38,6 +38,12 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml
index 2361a188e9a..4f699b722b9 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptBuildAccess/pom.xml
@@ -35,6 +35,18 @@
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven</groupId>
+                        <artifactId>maven-plugin-api</artifactId>
+                        <version>${maven.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven</groupId>
+                        <artifactId>maven-core</artifactId>
+                        <version>${maven.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/test-extension/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/test-extension/pom.xml
index 1f189a73894..d918edd3f35 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/test-extension/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/test-extension/pom.xml
@@ -29,6 +29,18 @@
             <version>${kotlin.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml
index 69e2f6d634e..045c8c20792 100644
--- a/libraries/tools/kotlin-maven-plugin/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin/pom.xml
@@ -20,11 +20,7 @@
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
             <version>${maven.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>${maven.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
index 33a08815460..7812f2a2b37 100755
--- a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
+++ b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
@@ -38,6 +38,12 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/libraries/tools/kotlin-maven-serialization/pom.xml b/libraries/tools/kotlin-maven-serialization/pom.xml
index a30f03f719d..1be5522aa56 100755
--- a/libraries/tools/kotlin-maven-serialization/pom.xml
+++ b/libraries/tools/kotlin-maven-serialization/pom.xml
@@ -39,6 +39,12 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>