From cffeb58ec3020e6891241d2ce8a98dc855f72355 Mon Sep 17 00:00:00 2001
From: Bogdan Mukvich <bogdan.mukvich@jetbrains.com>
Date: Tue, 29 Nov 2022 13:52:53 +0100
Subject: [PATCH] Update maven dependencies in kotlin-maven-plugin

KTI-1028
---
 libraries/pom.xml                                      |  2 ++
 .../tools/kotlin-annotation-processing-maven/pom.xml   |  1 -
 libraries/tools/kotlin-maven-allopen/pom.xml           |  1 -
 libraries/tools/kotlin-maven-lombok/pom.xml            |  1 -
 libraries/tools/kotlin-maven-noarg/pom.xml             |  1 -
 libraries/tools/kotlin-maven-plugin/pom.xml            | 10 +++-------
 libraries/tools/kotlin-maven-sam-with-receiver/pom.xml |  1 -
 libraries/tools/kotlin-maven-serialization/pom.xml     |  1 -
 8 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/libraries/pom.xml b/libraries/pom.xml
index ac8985b9014..ad945419738 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -47,6 +47,8 @@
         <exec-maven-plugin.version>1.2.1</exec-maven-plugin.version>
         <selenium.version>2.53.1</selenium.version>
         <htmlunit.version>2.24</htmlunit.version>
+        <maven.version>3.8.6</maven.version>
+        <maven-plugin-annotations.version>3.7.0</maven-plugin-annotations.version>
 
         <kotlin-dist>${project-root}/dist</kotlin-dist>
         <kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
diff --git a/libraries/tools/kotlin-annotation-processing-maven/pom.xml b/libraries/tools/kotlin-annotation-processing-maven/pom.xml
index 6e2e43b3bf4..e8077212a7e 100755
--- a/libraries/tools/kotlin-annotation-processing-maven/pom.xml
+++ b/libraries/tools/kotlin-annotation-processing-maven/pom.xml
@@ -5,7 +5,6 @@
 
   <modelVersion>4.0.0</modelVersion>
   <properties>
-    <maven.version>3.0.4</maven.version>
     <annotation-processing.src>${basedir}/../../../plugins/kapt3/kapt3-compiler/src</annotation-processing.src>
     <annotation-processing.cli.src>${basedir}/../../../plugins/kapt3/kapt3-cli/src</annotation-processing.cli.src>
     <annotation-processing.resources>${basedir}/../../../plugins/kapt3/kapt3-compiler/resources</annotation-processing.resources>
diff --git a/libraries/tools/kotlin-maven-allopen/pom.xml b/libraries/tools/kotlin-maven-allopen/pom.xml
index d113ff6da6a..5a222607afb 100755
--- a/libraries/tools/kotlin-maven-allopen/pom.xml
+++ b/libraries/tools/kotlin-maven-allopen/pom.xml
@@ -5,7 +5,6 @@
 
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <maven.version>3.0.5</maven.version>
         <allopen.common.src>${basedir}/../../../plugins/allopen/allopen.common/src</allopen.common.src>
         <allopen.k1.src>${basedir}/../../../plugins/allopen/allopen.k1/src</allopen.k1.src>
         <allopen.k2.src>${basedir}/../../../plugins/allopen/allopen.k2/src</allopen.k2.src>
diff --git a/libraries/tools/kotlin-maven-lombok/pom.xml b/libraries/tools/kotlin-maven-lombok/pom.xml
index b61780c3c40..dba37b7e20b 100755
--- a/libraries/tools/kotlin-maven-lombok/pom.xml
+++ b/libraries/tools/kotlin-maven-lombok/pom.xml
@@ -5,7 +5,6 @@
 
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <maven.version>3.0.5</maven.version>
         <lombok.common.src>${basedir}/../../../plugins/lombok/lombok.common/src</lombok.common.src>
         <lombok.k1.src>${basedir}/../../../plugins/lombok/lombok.k1/src</lombok.k1.src>
         <lombok.k2.src>${basedir}/../../../plugins/lombok/lombok.k2/src</lombok.k2.src>
diff --git a/libraries/tools/kotlin-maven-noarg/pom.xml b/libraries/tools/kotlin-maven-noarg/pom.xml
index 1cd6eb4274a..c12e498885f 100755
--- a/libraries/tools/kotlin-maven-noarg/pom.xml
+++ b/libraries/tools/kotlin-maven-noarg/pom.xml
@@ -5,7 +5,6 @@
 
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <maven.version>3.0.5</maven.version>
         <noarg.common.src>${basedir}/../../../plugins/noarg/noarg.common/src</noarg.common.src>
         <noarg.k1.src>${basedir}/../../../plugins/noarg/noarg.k1/src</noarg.k1.src>
         <noarg.k2.src>${basedir}/../../../plugins/noarg/noarg.k2/src</noarg.k2.src>
diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml
index 0881825fdae..69e2f6d634e 100644
--- a/libraries/tools/kotlin-maven-plugin/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin/pom.xml
@@ -4,10 +4,6 @@
         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <maven-plugin-anno.version>1.4.1</maven-plugin-anno.version>
-        <maven.version>3.0.5</maven.version>
-    </properties>
 
     <parent>
         <groupId>org.jetbrains.kotlin</groupId>
@@ -33,7 +29,7 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.4</version>
+            <version>${maven-plugin-annotations.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -48,7 +44,7 @@
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.5.1</version>
+            <version>3.10.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-testing</groupId>
@@ -85,7 +81,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>${maven-plugin-annotations.version}</version>
 
                 <executions>
                     <execution>
diff --git a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
index 1a9396e62ae..33a08815460 100755
--- a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
+++ b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
@@ -5,7 +5,6 @@
 
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <maven.version>3.0.5</maven.version>
         <sam.common.src>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver.common/src</sam.common.src>
         <sam.k1.src>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver.k1/src</sam.k1.src>
         <sam.k2.src>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver.k2/src</sam.k2.src>
diff --git a/libraries/tools/kotlin-maven-serialization/pom.xml b/libraries/tools/kotlin-maven-serialization/pom.xml
index e9721a47367..a30f03f719d 100755
--- a/libraries/tools/kotlin-maven-serialization/pom.xml
+++ b/libraries/tools/kotlin-maven-serialization/pom.xml
@@ -5,7 +5,6 @@
 
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <maven.version>3.0.5</maven.version>
         <serialization.common.src>${basedir}/../../../plugins/kotlinx-serialization/kotlinx-serialization.common/src</serialization.common.src>
         <serialization.k1.src>${basedir}/../../../plugins/kotlinx-serialization/kotlinx-serialization.k1/src</serialization.k1.src>
         <serialization.k2.src>${basedir}/../../../plugins/kotlinx-serialization/kotlinx-serialization.k2/src</serialization.k2.src>