Skip to content

Commit ce0666e

Browse files
slawekjaranowskislawekjaranowski
committed
[MINSTALL-184] Cleanup IT tests
remove createChecksum - parameter from tests - was removed in MINSTALL-143 remove updateReleaseInfo - parameter from tests - was removed in MINSTALL-149 refresh plugins versions in tests
1 parent f5980b0 commit ce0666e

File tree

27 files changed

+91
-135
lines changed

27 files changed

+91
-135
lines changed

‎pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,17 @@
6767
<mavenVersion>3.2.5</mavenVersion>
6868
<aetherVersion>1.0.0.v20140518</aetherVersion> <!-- Maven bound -->
6969
<slf4jVersion>1.7.5</slf4jVersion> <!-- Maven bound -->
70+
71+
<!-- plugin versions used in IT tests -->
72+
<mavenAntrunPluginVersion>3.1.0</mavenAntrunPluginVersion>
73+
<mavenCompilerPluginVersion>3.10.1</mavenCompilerPluginVersion>
74+
<mavenEnforcerPluginVersion>3.1.0</mavenEnforcerPluginVersion>
75+
<mavenJarPluginVersion>3.3.0</mavenJarPluginVersion>
76+
<mavenPluginPluginVersion>3.7.0</mavenPluginPluginVersion>
77+
<mavenResourcesPluginVersion>3.3.0</mavenResourcesPluginVersion>
78+
<mavenSourcePluginVersion>3.2.1</mavenSourcePluginVersion>
79+
<mavenSurefirePluginVersion>3.0.0-M7</mavenSurefirePluginVersion>
80+
7081
<project.build.outputTimestamp>2022-07-19T14:21:53Z</project.build.outputTimestamp>
7182
</properties>
7283

‎src/it/MINSTALL-108/invoker.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@
1717

1818
invoker.goals = clean install
1919
# waiting for MINSTALL-108 fix
20-
invoker.maven.version = 3.2.4+

‎src/it/MINSTALL-108/module1/pom.xml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,4 @@
2222
</parent>
2323
<artifactId>module1</artifactId>
2424

25-
<build>
26-
<plugins>
27-
<plugin>
28-
<groupId>org.apache.maven.plugins</groupId>
29-
<artifactId>maven-enforcer-plugin</artifactId>
30-
<version>1.3.1</version>
31-
<executions>
32-
<execution>
33-
<id>enforce</id>
34-
<goals>
35-
<goal>enforce</goal>
36-
</goals>
37-
<configuration>
38-
<rules>
39-
<AlwaysPass/>
40-
</rules>
41-
</configuration>
42-
</execution>
43-
</executions>
44-
</plugin>
45-
</plugins>
46-
</build>
4725
</project>

‎src/it/MINSTALL-108/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ under the License.
4141
<plugin>
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-compiler-plugin</artifactId>
44-
<version>2.0.2</version>
44+
<version>@mavenCompilerPluginVersion@</version>
4545
</plugin>
4646
<plugin>
4747
<groupId>org.apache.maven.plugins</groupId>
@@ -54,17 +54,17 @@ under the License.
5454
<plugin>
5555
<groupId>org.apache.maven.plugins</groupId>
5656
<artifactId>maven-jar-plugin</artifactId>
57-
<version>2.5</version>
57+
<version>@mavenJarPluginVersion@</version>
5858
</plugin>
5959
<plugin>
6060
<groupId>org.apache.maven.plugins</groupId>
6161
<artifactId>maven-resources-plugin</artifactId>
62-
<version>2.6</version>
62+
<version>@mavenResourcesPluginVersion@</version>
6363
</plugin>
6464
<plugin>
6565
<groupId>org.apache.maven.plugins</groupId>
6666
<artifactId>maven-surefire-plugin</artifactId>
67-
<version>2.12</version>
67+
<version>@mavenSurefirePluginVersion@</version>
6868
</plugin>
6969
</plugins>
7070
</build>

‎src/it/MINSTALL-98/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ under the License.
4141
<plugin>
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-compiler-plugin</artifactId>
44-
<version>2.0.2</version>
44+
<version>@mavenCompilerPluginVersion@</version>
4545
</plugin>
4646
<plugin>
4747
<groupId>org.apache.maven.plugins</groupId>
@@ -54,17 +54,17 @@ under the License.
5454
<plugin>
5555
<groupId>org.apache.maven.plugins</groupId>
5656
<artifactId>maven-jar-plugin</artifactId>
57-
<version>2.1</version>
57+
<version>@mavenJarPluginVersion@</version>
5858
</plugin>
5959
<plugin>
6060
<groupId>org.apache.maven.plugins</groupId>
6161
<artifactId>maven-resources-plugin</artifactId>
62-
<version>2.2</version>
62+
<version>@mavenResourcesPluginVersion@</version>
6363
</plugin>
6464
<plugin>
6565
<groupId>org.apache.maven.plugins</groupId>
6666
<artifactId>maven-surefire-plugin</artifactId>
67-
<version>2.12</version>
67+
<version>@mavenSurefirePluginVersion@</version>
6868
</plugin>
6969
</plugins>
7070
</build>

‎src/it/MINSTALL-99/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ under the License.
4141
<plugin>
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-compiler-plugin</artifactId>
44-
<version>2.0.2</version>
44+
<version>@mavenCompilerPluginVersion@</version>
4545
</plugin>
4646
<plugin>
4747
<groupId>org.apache.maven.plugins</groupId>
@@ -54,17 +54,17 @@ under the License.
5454
<plugin>
5555
<groupId>org.apache.maven.plugins</groupId>
5656
<artifactId>maven-jar-plugin</artifactId>
57-
<version>2.1</version>
57+
<version>@mavenJarPluginVersion@</version>
5858
</plugin>
5959
<plugin>
6060
<groupId>org.apache.maven.plugins</groupId>
6161
<artifactId>maven-resources-plugin</artifactId>
62-
<version>2.2</version>
62+
<version>@mavenResourcesPluginVersion@</version>
6363
</plugin>
6464
<plugin>
6565
<groupId>org.apache.maven.plugins</groupId>
6666
<artifactId>maven-surefire-plugin</artifactId>
67-
<version>2.12</version>
67+
<version>@mavenSurefirePluginVersion@</version>
6868
</plugin>
6969
</plugins>
7070
</build>

‎src/it/attach-jar-checksum/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,30 @@ under the License.
4141
<plugin>
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-compiler-plugin</artifactId>
44-
<version>2.0.2</version>
44+
<version>@mavenCompilerPluginVersion@</version>
4545
</plugin>
4646
<plugin>
4747
<groupId>org.apache.maven.plugins</groupId>
4848
<artifactId>maven-install-plugin</artifactId>
4949
<version>@project.version@</version>
50-
<configuration>
51-
<createChecksum>true</createChecksum>
52-
</configuration>
5350
</plugin>
5451
<plugin>
5552
<groupId>org.apache.maven.plugins</groupId>
5653
<artifactId>maven-jar-plugin</artifactId>
57-
<version>2.1</version>
54+
<version>@mavenJarPluginVersion@</version>
5855
</plugin>
5956
<plugin>
6057
<groupId>org.apache.maven.plugins</groupId>
6158
<artifactId>maven-resources-plugin</artifactId>
62-
<version>2.2</version>
59+
<version>@mavenResourcesPluginVersion@</version>
6360
</plugin>
6461
<plugin>
6562
<groupId>org.apache.maven.plugins</groupId>
6663
<artifactId>maven-source-plugin</artifactId>
67-
<version>2.0.4</version>
64+
<version>@mavenSourcePluginVersion@</version>
65+
<configuration>
66+
<forceCreation>true</forceCreation>
67+
</configuration>
6868
<executions>
6969
<execution>
7070
<id>attach-sources</id>
@@ -77,7 +77,7 @@ under the License.
7777
<plugin>
7878
<groupId>org.apache.maven.plugins</groupId>
7979
<artifactId>maven-surefire-plugin</artifactId>
80-
<version>2.3.1</version>
80+
<version>@mavenSurefirePluginVersion@</version>
8181
</plugin>
8282
</plugins>
8383
</build>

‎src/it/attach-release-jar/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,30 @@ under the License.
4141
<plugin>
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-compiler-plugin</artifactId>
44-
<version>2.0.2</version>
44+
<version>@mavenCompilerPluginVersion@</version>
4545
</plugin>
4646
<plugin>
4747
<groupId>org.apache.maven.plugins</groupId>
4848
<artifactId>maven-install-plugin</artifactId>
4949
<version>@project.version@</version>
50-
<configuration>
51-
<updateReleaseInfo>true</updateReleaseInfo>
52-
</configuration>
5350
</plugin>
5451
<plugin>
5552
<groupId>org.apache.maven.plugins</groupId>
5653
<artifactId>maven-jar-plugin</artifactId>
57-
<version>2.1</version>
54+
<version>@mavenJarPluginVersion@</version>
5855
</plugin>
5956
<plugin>
6057
<groupId>org.apache.maven.plugins</groupId>
6158
<artifactId>maven-resources-plugin</artifactId>
62-
<version>2.2</version>
59+
<version>@mavenResourcesPluginVersion@</version>
6360
</plugin>
6461
<plugin>
6562
<groupId>org.apache.maven.plugins</groupId>
6663
<artifactId>maven-source-plugin</artifactId>
67-
<version>2.0.4</version>
64+
<version>@mavenSourcePluginVersion@</version>
65+
<configuration>
66+
<forceCreation>true</forceCreation>
67+
</configuration>
6868
<executions>
6969
<execution>
7070
<id>attach-sources</id>
@@ -77,7 +77,7 @@ under the License.
7777
<plugin>
7878
<groupId>org.apache.maven.plugins</groupId>
7979
<artifactId>maven-surefire-plugin</artifactId>
80-
<version>2.3.1</version>
80+
<version>@mavenSurefirePluginVersion@</version>
8181
</plugin>
8282
</plugins>
8383
</build>

‎src/it/generate-pom-auto-1/test.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ groupId = org.apache.maven.its.install.gpa1
2020
artifactId = test
2121
version = 0.1
2222
packaging = jar
23-
createChecksum = true

‎src/it/install-at-end-fail/module1/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<plugin>
2828
<groupId>org.apache.maven.plugins</groupId>
2929
<artifactId>maven-enforcer-plugin</artifactId>
30-
<version>1.2</version>
30+
<version>@mavenEnforcerPluginVersion@</version>
3131
<executions>
3232
<execution>
3333
<id>enforce</id>

‎src/it/install-at-end-fail/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ under the License.
4141
<plugin>
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-compiler-plugin</artifactId>
44-
<version>2.0.2</version>
44+
<version>@mavenCompilerPluginVersion@</version>
4545
</plugin>
4646
<plugin>
4747
<groupId>org.apache.maven.plugins</groupId>
@@ -54,17 +54,17 @@ under the License.
5454
<plugin>
5555
<groupId>org.apache.maven.plugins</groupId>
5656
<artifactId>maven-jar-plugin</artifactId>
57-
<version>2.1</version>
57+
<version>@mavenJarPluginVersion@</version>
5858
</plugin>
5959
<plugin>
6060
<groupId>org.apache.maven.plugins</groupId>
6161
<artifactId>maven-resources-plugin</artifactId>
62-
<version>2.2</version>
62+
<version>@mavenResourcesPluginVersion@</version>
6363
</plugin>
6464
<plugin>
6565
<groupId>org.apache.maven.plugins</groupId>
6666
<artifactId>maven-surefire-plugin</artifactId>
67-
<version>2.12</version>
67+
<version>@mavenSurefirePluginVersion@</version>
6868
</plugin>
6969
</plugins>
7070
</build>

‎src/it/install-at-end-pass/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ under the License.
4141
<plugin>
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-compiler-plugin</artifactId>
44-
<version>2.0.2</version>
44+
<version>@mavenCompilerPluginVersion@</version>
4545
</plugin>
4646
<plugin>
4747
<groupId>org.apache.maven.plugins</groupId>
@@ -54,17 +54,17 @@ under the License.
5454
<plugin>
5555
<groupId>org.apache.maven.plugins</groupId>
5656
<artifactId>maven-jar-plugin</artifactId>
57-
<version>2.1</version>
57+
<version>@mavenJarPluginVersion@</version>
5858
</plugin>
5959
<plugin>
6060
<groupId>org.apache.maven.plugins</groupId>
6161
<artifactId>maven-resources-plugin</artifactId>
62-
<version>2.2</version>
62+
<version>@mavenResourcesPluginVersion@</version>
6363
</plugin>
6464
<plugin>
6565
<groupId>org.apache.maven.plugins</groupId>
6666
<artifactId>maven-surefire-plugin</artifactId>
67-
<version>2.12</version>
67+
<version>@mavenSurefirePluginVersion@</version>
6868
</plugin>
6969
</plugins>
7070
</build>

‎src/it/jar-sources-javadoc/test.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,3 @@ version = 0.1
2222
packaging = jar
2323
javadoc = javadoc.jar
2424
sources = sources.jar
25-
createChecksum = true
26-
updateReleaseInfo = true

‎src/it/local-repo-override-with-checksum-generatePom/test.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ groupId = gid
2020
artifactId = test
2121
version = 0.1
2222
packaging = jar
23-
createChecksum = true
2423
generatePom = true
2524
localRepositoryPath = target/local-repo

‎src/it/local-repo-override-with-checksum/test.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ groupId = gid
2020
artifactId = test
2121
version = 0.1
2222
packaging = jar
23-
createChecksum = true
2423
localRepositoryPath = target/local-repo

‎src/it/no-main-artifact-1/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ under the License.
4343
<plugin>
4444
<groupId>org.apache.maven.plugins</groupId>
4545
<artifactId>maven-antrun-plugin</artifactId>
46-
<version>1.1</version>
46+
<version>@mavenAntrunPluginVersion@</version>
4747
<configuration>
48-
<tasks>
48+
<target>
4949
<!--
5050
NOTE: The Compiler Plugin sets this as the main artifact file, should be non-existent for this test.
5151
-->
5252
<delete dir="target/classes"/>
53-
</tasks>
53+
</target>
5454
</configuration>
5555
<executions>
5656
<execution>
@@ -65,12 +65,12 @@ under the License.
6565
<plugin>
6666
<groupId>org.apache.maven.plugins</groupId>
6767
<artifactId>maven-compiler-plugin</artifactId>
68-
<version>2.0.2</version>
68+
<version>@mavenCompilerPluginVersion@</version>
6969
</plugin>
7070
<plugin>
7171
<groupId>org.apache.maven.plugins</groupId>
7272
<artifactId>maven-jar-plugin</artifactId>
73-
<version>2.1</version>
73+
<version>@mavenJarPluginVersion@</version>
7474
<configuration>
7575
<classifier>it</classifier>
7676
</configuration>
@@ -83,12 +83,12 @@ under the License.
8383
<plugin>
8484
<groupId>org.apache.maven.plugins</groupId>
8585
<artifactId>maven-resources-plugin</artifactId>
86-
<version>2.2</version>
86+
<version>@mavenResourcesPluginVersion@</version>
8787
</plugin>
8888
<plugin>
8989
<groupId>org.apache.maven.plugins</groupId>
9090
<artifactId>maven-surefire-plugin</artifactId>
91-
<version>2.3.1</version>
91+
<version>@mavenSurefirePluginVersion@</version>
9292
</plugin>
9393
</plugins>
9494
</build>

0 commit comments

Comments
 (0)