Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions maven-plugin-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,9 @@
<extraArtifact>org.apache.maven.plugin-tools:maven-script-ant:${project.version}</extraArtifact>
<extraArtifact>org.apache.maven.plugin-tools:maven-script-beanshell:${project.version}</extraArtifact>
</extraArtifacts>
<scriptVariables>
<maven3Version>${maven3Version}</maven3Version>
</scriptVariables>
</configuration>
<executions>
<execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ assert descriptorFile.isFile()
def pluginDescriptor = new XmlParser().parse( descriptorFile );

assert pluginDescriptor.requiredJavaVersion.text() == '1.8'
assert pluginDescriptor.requiredMavenVersion.text() == '3.9.9'
assert pluginDescriptor.requiredMavenVersion.text() == maven3Version

def mojo = pluginDescriptor.mojos.mojo.findAll{ it.goal.text() == "first" }[0]

Expand Down
3 changes: 3 additions & 0 deletions maven-plugin-report-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,9 @@
<!-- used in ITs -->
<extraArtifact>org.apache.maven.plugins:maven-plugin-plugin:${project.version}</extraArtifact>
</extraArtifacts>
<scriptVariables>
<maven3Version>${maven3Version}</maven3Version>
</scriptVariables>
</configuration>
<executions>
<execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ assert !pluginInfo.text.contains('Memory')
assert !pluginInfo.text.contains('Disk Space')
// check JDK and Maven requirements
assert pluginInfo.text.contains('1.8')
assert pluginInfo.text.contains('3.9.9')
assert pluginInfo.text.contains(maven3Version)

// deprecated info and description
assert pluginInfo.text.contains('<div><strong>Deprecated.</strong> You don\'t use test goals, do you?</div><br />')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ assert !pluginInfo.text.contains('Memory')
assert !pluginInfo.text.contains('Disk Space')
// check JDK and Maven requirements
assert pluginInfo.text.contains('1.8')
assert pluginInfo.text.contains('3.9.9')
assert pluginInfo.text.contains(maven3Version)

// deprecated info and description
assert pluginInfo.text.contains('<div><strong>Deprecated.</strong> You don\'t use test goals, do you?</div><br />')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ assert !pluginInfo.text.contains('Memory')
assert !pluginInfo.text.contains('Disk Space')
// check JDK and Maven requirements
assert pluginInfo.text.contains('1.8')
assert pluginInfo.text.contains('3.9.9')
assert pluginInfo.text.contains(maven3Version)

// deprecated info and description
assert pluginInfo.text.contains('<div><strong>Deprecated.</strong> You don\'t use test goals, do you?</div><br />')
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
<javaVersion>8</javaVersion>
<pluginTestingHarnessVersion>3.3.0</pluginTestingHarnessVersion>
<maven4Version>4.0.0-alpha-4</maven4Version>
<maven3Version>3.9.9</maven3Version>
<resolverVersion>1.9.20</resolverVersion>
<maven3Version>3.9.11</maven3Version>
<resolverVersion>1.9.24</resolverVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<antVersion>1.10.15</antVersion>
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
Expand Down