Require Maven 3.2.5+

Author: slachiewicz

modello-maven-plugin/pom.xml

@@ -22,7 +22,6 @@
 
   <properties>
     <mavenPluginTools>3.6.4</mavenPluginTools>
-    <maven.version>3.1.1</maven.version>
   </properties>
 
   <dependencies>

modello-maven-plugin/src/it/snakeyaml/pom.xml

@@ -30,7 +30,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.2</version>
+        <version>3.0.0-M7</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>

pom.xml

@@ -219,6 +219,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <jackson.version>2.13.4</jackson.version>
     <jdom.version>2.0.2</jdom.version>
+    <maven.version>3.2.5</maven.version>
     <!--
       ! This controls the minimum java version
       ! and also the version which is used
@@ -422,7 +423,7 @@
                     <version>${java.version}</version>
                   </requireJavaVersion>
                   <requireMavenVersion>
-                    <version>3.0.5</version>
+                    <version>${maven.version}</version>
                   </requireMavenVersion>
                 </rules>
               </configuration>
@@ -504,12 +505,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.2</version>
+          <version>3.0.0-M7</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-report-plugin</artifactId>
-          <version>2.22.2</version>
+          <version>3.0.0-M7</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -518,6 +519,23 @@
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-descriptor</id>
+            <goals>
+              <goal>attach-descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
 
   <reporting>
@@ -610,7 +628,7 @@
           <plugin>
             <groupId>org.codehaus.modello</groupId>
             <artifactId>modello-maven-plugin</artifactId>
-            <version>1.8.3</version>
+            <version>2.0.0</version>
             <configuration>
               <models>
                 <model>src/main/mdo/modello.mdo</model>
@@ -691,38 +709,9 @@
               </reportSet>
             </reportSets>
           </plugin>
-          <!--plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>clirr-maven-plugin</artifactId>
-            <version>2.2.2</version>
-          </plugin-->
         </plugins>
       </reporting>
     </profile>
-    <profile>
-      <id>maven-3</id>
-      <activation>
-        <file>
-          <!--  This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
-          <exists>${basedir}</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-site-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-descriptor</id>
-                <goals>
-                  <goal>attach-descriptor</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
 </project>