Skip to content

Commit 3f269a1

Browse files
committed
Require Maven 3.2.5+
1 parent fb43f04 commit 3f269a1

File tree

3 files changed

+23
-35
lines changed

3 files changed

+23
-35
lines changed

modello-maven-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
<properties>
2424
<mavenPluginTools>3.6.4</mavenPluginTools>
25-
<maven.version>3.1.1</maven.version>
2625
</properties>
2726

2827
<dependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<plugin>
3131
<groupId>org.apache.maven.plugins</groupId>
3232
<artifactId>maven-surefire-plugin</artifactId>
33-
<version>2.22.2</version>
33+
<version>3.0.0-M7</version>
3434
</plugin>
3535
<plugin>
3636
<groupId>org.codehaus.modello</groupId>

pom.xml

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@
219219
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
220220
<jackson.version>2.13.4</jackson.version>
221221
<jdom.version>2.0.2</jdom.version>
222+
<maven.version>3.2.5</maven.version>
222223
<!--
223224
! This controls the minimum java version
224225
! and also the version which is used
@@ -422,7 +423,7 @@
422423
<version>${java.version}</version>
423424
</requireJavaVersion>
424425
<requireMavenVersion>
425-
<version>3.0.5</version>
426+
<version>${maven.version}</version>
426427
</requireMavenVersion>
427428
</rules>
428429
</configuration>
@@ -504,12 +505,12 @@
504505
<plugin>
505506
<groupId>org.apache.maven.plugins</groupId>
506507
<artifactId>maven-surefire-plugin</artifactId>
507-
<version>2.22.2</version>
508+
<version>3.0.0-M7</version>
508509
</plugin>
509510
<plugin>
510511
<groupId>org.apache.maven.plugins</groupId>
511512
<artifactId>maven-surefire-report-plugin</artifactId>
512-
<version>2.22.2</version>
513+
<version>3.0.0-M7</version>
513514
</plugin>
514515
<plugin>
515516
<groupId>org.apache.maven.plugins</groupId>
@@ -518,6 +519,23 @@
518519
</plugin>
519520
</plugins>
520521
</pluginManagement>
522+
<plugins>
523+
<plugin>
524+
<groupId>org.apache.maven.plugins</groupId>
525+
<artifactId>maven-enforcer-plugin</artifactId>
526+
</plugin>
527+
<plugin>
528+
<artifactId>maven-site-plugin</artifactId>
529+
<executions>
530+
<execution>
531+
<id>attach-descriptor</id>
532+
<goals>
533+
<goal>attach-descriptor</goal>
534+
</goals>
535+
</execution>
536+
</executions>
537+
</plugin>
538+
</plugins>
521539
</build>
522540

523541
<reporting>
@@ -610,7 +628,7 @@
610628
<plugin>
611629
<groupId>org.codehaus.modello</groupId>
612630
<artifactId>modello-maven-plugin</artifactId>
613-
<version>1.8.3</version>
631+
<version>2.0.0</version>
614632
<configuration>
615633
<models>
616634
<model>src/main/mdo/modello.mdo</model>
@@ -691,38 +709,9 @@
691709
</reportSet>
692710
</reportSets>
693711
</plugin>
694-
<!--plugin>
695-
<groupId>org.codehaus.mojo</groupId>
696-
<artifactId>clirr-maven-plugin</artifactId>
697-
<version>2.2.2</version>
698-
</plugin-->
699712
</plugins>
700713
</reporting>
701714
</profile>
702-
<profile>
703-
<id>maven-3</id>
704-
<activation>
705-
<file>
706-
<!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
707-
<exists>${basedir}</exists>
708-
</file>
709-
</activation>
710-
<build>
711-
<plugins>
712-
<plugin>
713-
<artifactId>maven-site-plugin</artifactId>
714-
<executions>
715-
<execution>
716-
<id>attach-descriptor</id>
717-
<goals>
718-
<goal>attach-descriptor</goal>
719-
</goals>
720-
</execution>
721-
</executions>
722-
</plugin>
723-
</plugins>
724-
</build>
725-
</profile>
726715
</profiles>
727716

728717
</project>

0 commit comments

Comments
 (0)