Skip to content

Commit

Permalink
[MINVOKER-316] Refresh plugins versions in IT tests
Browse files Browse the repository at this point in the history
use properties for plugins version used in IT tests
  • Loading branch information
slawekjaranowski committed Dec 13, 2022
1 parent bfb75f9 commit 5e5c120
Show file tree
Hide file tree
Showing 52 changed files with 105 additions and 54 deletions.
14 changes: 13 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,19 @@ under the License.
<profile>
<id>run-its</id>
<properties>
<sitePluginVersion>3.7.1</sitePluginVersion>
<!-- plugins versions used in IT tests -->
<antrunPluginVersion>3.1.0</antrunPluginVersion>
<cleanPluginVersion>3.2.0</cleanPluginVersion>
<compilerPluginVersion>3.10.1</compilerPluginVersion>
<enforcerPluginVersion>3.1.0</enforcerPluginVersion>
<helpPluginVersion>3.3.0</helpPluginVersion>
<installPluginVersion>3.1.0</installPluginVersion>
<jarPluginVersion>3.3.0</jarPluginVersion>
<pluginPluginVersion>3.7.0</pluginPluginVersion>
<resourcesPluginVersion>3.3.0</resourcesPluginVersion>
<sitePluginVersion>3.12.1</sitePluginVersion>
<sourcePluginVersion>3.2.1</sourcePluginVersion>
<surefirePluginVersion>3.0.0-M7</surefirePluginVersion>
</properties>
<build>
<pluginManagement>
Expand Down
6 changes: 3 additions & 3 deletions src/it/MINVOKER-191/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>2.9</version>
<version>@pluginPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<version>@resourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
4 changes: 3 additions & 1 deletion src/it/MINVOKER-196_junit_report_file/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ under the License.
<!-- This triggers the download of a known version of this plugin which can then be safely invoked by the IT project -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.2</version>
<version>@resourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -54,6 +54,8 @@ under the License.
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
<goals>
<!-- Maven 4 require strict checksum by default, so relax here -->
<goal>-c</goal>
<goal>validate</goal>
</goals>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.2</version>
<version>@resourcesPluginVersion@</version>
</plugin>
</plugins>
</build>
Expand Down
1 change: 1 addition & 0 deletions src/it/invocation-cmdline-exclude/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ under the License.

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<version>@enforcerPluginVersion@</version>
<executions>
<execution>
<goals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<version>@enforcerPluginVersion@</version>
<executions>
<execution>
<goals>
Expand Down
1 change: 1 addition & 0 deletions src/it/invocation-debug/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ under the License.

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/invocation-debug/src/it/minvoker-142/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.1.1</version>
<version>@enforcerPluginVersion@</version>
<executions>
<execution>
<goals>
Expand Down
1 change: 1 addition & 0 deletions src/it/invocation-emptyproperty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ under the License.

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.1.1</version>
<version>@enforcerPluginVersion@</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 2 additions & 0 deletions src/it/invocation-environmentvariable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ under the License.

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<enforcerPluginVersion>@enforcerPluginVersion@</enforcerPluginVersion>
<helpPluginVersion>@helpPluginVersion@</helpPluginVersion>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.1.1</version>
<version>@enforcerPluginVersion@</version>
<executions>
<execution>
<goals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<version>@enforcerPluginVersion@</version>
<executions>
<execution>
<goals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
<version>3.2.0</version>
<version>@helpPluginVersion@</version>
<executions>
<execution>
<phase>validate</phase>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>@enforcerPluginVersion@</version>
<executions>
<execution>
<id>enforce</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>@enforcerPluginVersion@</version>
<executions>
<execution>
<id>enforce</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>@enforcerPluginVersion@</version>
<executions>
<execution>
<id>enforce</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>@enforcerPluginVersion@</version>
<executions>
<execution>
<id>enforce</id>
Expand Down
7 changes: 7 additions & 0 deletions src/it/invocation-multiple/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ under the License.

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mavenVersion>@mavenVersion@</mavenVersion>
<compilerPluginVersion>@compilerPluginVersion@</compilerPluginVersion>
<installPluginVersion>@installPluginVersion@</installPluginVersion>
<jarPluginVersion>@jarPluginVersion@</jarPluginVersion>
<pluginPluginVersion>@pluginPluginVersion@</pluginPluginVersion>
<resourcesPluginVersion>@resourcesPluginVersion@</resourcesPluginVersion>
<surefirePluginVersion>@surefirePluginVersion@</surefirePluginVersion>
</properties>

<build>
Expand Down
17 changes: 9 additions & 8 deletions src/it/invocation-multiple/src/it/project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<packaging>maven-plugin</packaging>

<prerequisites>
<maven>2.0</maven>
<maven>@mavenVersion@</maven>
</prerequisites>

<properties>
Expand All @@ -38,39 +38,40 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>@mavenVersion@</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<version>@compilerPluginVersion@</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.2</version>
<version>@installPluginVersion@</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<version>@jarPluginVersion@</version>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>2.4.2</version>
<version>@pluginPluginVersion@</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.2</version>
<version>@resourcesPluginVersion@</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.3</version>
<version>@surefirePluginVersion@</version>
</plugin>
</plugins>
</build>
Expand Down
6 changes: 3 additions & 3 deletions src/it/invocation-reactor-indirect/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,17 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>2.9</version>
<version>@pluginPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<version>@resourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
5 changes: 5 additions & 0 deletions src/it/invocation-spaces/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ under the License.

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compilerPluginVersion>@compilerPluginVersion@</compilerPluginVersion>
<installPluginVersion>@installPluginVersion@</installPluginVersion>
<jarPluginVersion>@jarPluginVersion@</jarPluginVersion>
<resourcesPluginVersion>@resourcesPluginVersion@</resourcesPluginVersion>
<surefirePluginVersion>@surefirePluginVersion@</surefirePluginVersion>
</properties>

<build>
Expand Down
10 changes: 5 additions & 5 deletions src/it/invocation-spaces/src/it projects/project/spacy pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,29 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<version>@compilerPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.2</version>
<version>@installPluginVersion@</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<version>@jarPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.2</version>
<version>@resourcesPluginVersion@</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.3</version>
<version>@surefirePluginVersion@</version>
</plugin>
</plugins>
</build>
Expand Down
6 changes: 4 additions & 2 deletions src/it/local-repo-path/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ under the License.
<!-- This triggers the download of a known version of this plugin which can then be safely invoked by the IT project -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.2</version>
<version>@cleanPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -54,7 +54,9 @@ under the License.
</pomIncludes>
<settingsFile>src/it/settings.xml</settingsFile>
<goals>
<goal>org.apache.maven.plugins:maven-clean-plugin:2.2:clean</goal>
<!-- Maven 4 require strict checksum by default, so relax here -->
<goal>-c</goal>
<goal>org.apache.maven.plugins:maven-clean-plugin:@cleanPluginVersion@:clean</goal>
</goals>
</configuration>
<executions>
Expand Down
4 changes: 3 additions & 1 deletion src/it/local-repo-url/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ under the License.
<!-- This triggers the download of a known version of this plugin which can then be safely invoked by the IT project -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.2</version>
<version>@resourcesPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -51,6 +51,8 @@ under the License.
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
<goals>
<!-- Maven 4 require strict checksum by default, so relax here -->
<goal>-c</goal>
<goal>validate</goal>
</goals>
</configuration>
Expand Down
4 changes: 4 additions & 0 deletions src/it/pom-filtering-encoding/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ under the License.

<description>Test to check for proper handling of file encoding during POM filtering.</description>

<properties>
<resourcesPluginVersion>@resourcesPluginVersion@</resourcesPluginVersion>
</properties>

<build>
<plugins>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion src/it/pom-filtering-encoding/src/it/latin-1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.2</version>
<version>@resourcesPluginVersion@</version>
</plugin>
</plugins>
</build>
Expand Down
Loading

0 comments on commit 5e5c120

Please sign in to comment.