Merge pull request #156 from scala-steward/update/maven-compat-3.8.5

Update maven-compat to 3.8.5
guardrail-dev · Apr 5, 2022 · 3bd3d79 · 3bd3d79
2 parents b2138c2 + 453ffc2
commit 3bd3d79
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -46,13 +46,18 @@
   </developers>
 
   <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven-aether-provider.version>3.0</maven-aether-provider.version>
     <maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
+    <maven-artifact.version>3.0</maven-artifact.version>
+    <maven-core.version>3.0</maven-core.version>
+    <maven-model.version>3.0</maven-model.version>
     <maven-plugin-annotations.version>3.6.4</maven-plugin-annotations.version>
     <maven-plugin-api.version>3.8.5</maven-plugin-api.version>
     <maven-project.version>3.0</maven-project.version>
+    <maven-settings.version>3.0</maven-settings.version>
     <plexus-utils.version>3.3.1</plexus-utils.version>
-    <scala.binary.version>2.12</scala.binary.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <scala.compat.version>2.12</scala.compat.version>
     <scala.version>2.12.15</scala.version>
   </properties>
 
@@ -107,34 +112,28 @@
       <version>${maven-plugin-api.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>${maven-plugin-api.version}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>${maven-plugin-api.version}</version>
+      <version>${maven-artifact.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>${maven-project.version}</version>
+      <version>${maven-core.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
-      <version>${maven-project.version}</version>
+      <version>${maven-settings.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings-builder</artifactId>
-      <version>${maven-project.version}</version>
+      <version>${maven-settings.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -146,13 +145,19 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model-builder</artifactId>
-      <version>${maven-project.version}</version>
+      <version>${maven-model.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>${maven-model.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-aether-provider</artifactId>
-      <version>${maven-project.version}</version>
+      <version>${maven-aether-provider.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -229,7 +234,7 @@
           <compilerPlugins>
             <compilerPlugin>
               <groupId>org.spire-math</groupId>
-              <artifactId>kind-projector_${scala.binary.version}</artifactId>
+              <artifactId>kind-projector_${scala.compat.version}</artifactId>
               <version>0.9.4</version>
             </compilerPlugin>
           </compilerPlugins>