Skip to content

Commit 54faa43

Browse files
slawekjaranowskislawekjaranowski
committed
[MDEPLOY-304] Clean up ITs
- refresh plugins versions in tests - remove createChecksum - parameter from tests - was removed in MINSTALL-143 - remove unneeded plugins in test - remove tests with checksum validation
1 parent 5c4272d commit 54faa43

File tree

36 files changed

+146
-653
lines changed

36 files changed

+146
-653
lines changed

‎pom.xml

+14-1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,20 @@ under the License.
7474
<slf4jVersion>1.7.5</slf4jVersion>
7575
<!-- Keep in sync with resolver used in maven above -->
7676
<resolverVersion>1.0.0.v20140518</resolverVersion>
77+
78+
<!-- plugins version used in IT tests -->
79+
<mavenAntrunPluginVersion>3.1.0</mavenAntrunPluginVersion>
80+
<mavenCompilerPluginVersion>3.10.1</mavenCompilerPluginVersion>
81+
<mavenEnforcerPluginVersion>3.1.0</mavenEnforcerPluginVersion>
82+
<mavenInstallPluginVersion>3.1.0</mavenInstallPluginVersion>
83+
<mavenJarPluginVersion>3.3.0</mavenJarPluginVersion>
84+
<mavenJavadocPluginVersion>3.4.1</mavenJavadocPluginVersion>
85+
<mavenPluginToolsVersion>${maven.plugin.tools.version}</mavenPluginToolsVersion>
86+
<mavenResourcesPluginVersion>3.3.0</mavenResourcesPluginVersion>
87+
<mavenSourcePluginVersion>3.2.1</mavenSourcePluginVersion>
88+
<mavenSurefirePluginVersion>${surefire.version}</mavenSurefirePluginVersion>
89+
<mavenWarPluginVersion>3.3.2</mavenWarPluginVersion>
90+
7791
<project.build.outputTimestamp>2022-07-16T16:14:30Z</project.build.outputTimestamp>
7892
</properties>
7993

@@ -215,7 +229,6 @@ under the License.
215229
<postBuildHookScript>verify</postBuildHookScript>
216230
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
217231
<settingsFile>src/it/settings.xml</settingsFile>
218-
<addTestClassPath>true</addTestClassPath>
219232
<goals>
220233
<goal>deploy</goal>
221234
</goals>

‎src/it/MDEPLOY-169_deploy-at-end-multithread/invoker.properties

+17-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
invoker.goals = clean deploy -T2
18-
invoker.maven.version = 3.0+
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
invoker.goals = clean deploy -T2

‎src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ under the License.
4747
<plugin>
4848
<groupId>org.apache.maven.plugins</groupId>
4949
<artifactId>maven-compiler-plugin</artifactId>
50-
<version>2.0.2</version>
50+
<version>@mavenCompilerPluginVersion@</version>
5151
</plugin>
5252
<plugin>
5353
<groupId>org.apache.maven.plugins</groupId>
@@ -60,22 +60,22 @@ under the License.
6060
<plugin>
6161
<groupId>org.apache.maven.plugins</groupId>
6262
<artifactId>maven-install-plugin</artifactId>
63-
<version>2.2</version>
63+
<version>@mavenInstallPluginVersion@</version>
6464
</plugin>
6565
<plugin>
6666
<groupId>org.apache.maven.plugins</groupId>
6767
<artifactId>maven-jar-plugin</artifactId>
68-
<version>2.1</version>
68+
<version>@mavenJarPluginVersion@</version>
6969
</plugin>
7070
<plugin>
7171
<groupId>org.apache.maven.plugins</groupId>
7272
<artifactId>maven-resources-plugin</artifactId>
73-
<version>2.2</version>
73+
<version>@mavenResourcesPluginVersion@</version>
7474
</plugin>
7575
<plugin>
7676
<groupId>org.apache.maven.plugins</groupId>
7777
<artifactId>maven-source-plugin</artifactId>
78-
<version>2.0.4</version>
78+
<version>@mavenSourcePluginVersion@</version>
7979
<executions>
8080
<execution>
8181
<id>attach-sources</id>
@@ -88,7 +88,7 @@ under the License.
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>

‎src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ under the License.
4747
<plugin>
4848
<groupId>org.apache.maven.plugins</groupId>
4949
<artifactId>maven-compiler-plugin</artifactId>
50-
<version>2.0.2</version>
50+
<version>@mavenCompilerPluginVersion@</version>
5151
</plugin>
5252
<plugin>
5353
<groupId>org.apache.maven.plugins</groupId>
@@ -60,22 +60,22 @@ under the License.
6060
<plugin>
6161
<groupId>org.apache.maven.plugins</groupId>
6262
<artifactId>maven-install-plugin</artifactId>
63-
<version>2.2</version>
63+
<version>@mavenInstallPluginVersion@</version>
6464
</plugin>
6565
<plugin>
6666
<groupId>org.apache.maven.plugins</groupId>
6767
<artifactId>maven-jar-plugin</artifactId>
68-
<version>2.1</version>
68+
<version>@mavenJarPluginVersion@</version>
6969
</plugin>
7070
<plugin>
7171
<groupId>org.apache.maven.plugins</groupId>
7272
<artifactId>maven-resources-plugin</artifactId>
73-
<version>2.2</version>
73+
<version>@mavenResourcesPluginVersion@</version>
7474
</plugin>
7575
<plugin>
7676
<groupId>org.apache.maven.plugins</groupId>
7777
<artifactId>maven-source-plugin</artifactId>
78-
<version>2.0.4</version>
78+
<version>@mavenSourcePluginVersion@</version>
7979
<executions>
8080
<execution>
8181
<id>attach-sources</id>
@@ -88,7 +88,7 @@ under the License.
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>

‎src/it/MDEPLOY-212/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ under the License.
3838
<plugin>
3939
<groupId>org.apache.maven.plugins</groupId>
4040
<artifactId>maven-javadoc-plugin</artifactId>
41-
<version>3.0.1</version>
41+
<version>@mavenJavadocPluginVersion@</version>
4242
<executions>
4343
<execution>
4444
<id>attach-javadoc</id>

‎src/it/MDEPLOY-213/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ under the License.
4646
<plugin>
4747
<groupId>org.apache.maven.plugins</groupId>
4848
<artifactId>maven-javadoc-plugin</artifactId>
49-
<version>3.0.1</version>
49+
<version>@mavenJavadocPluginVersion@</version>
5050
<executions>
5151
<execution>
5252
<id>attach-javadoc</id>

‎src/it/alt-deploy-repo-with-dist-mgmt-snapshot/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ under the License.
4848
<plugin>
4949
<groupId>org.apache.maven.plugins</groupId>
5050
<artifactId>maven-compiler-plugin</artifactId>
51-
<version>2.0.2</version>
51+
<version>@mavenCompilerPluginVersion@</version>
5252
</plugin>
5353
<plugin>
5454
<groupId>org.apache.maven.plugins</groupId>
@@ -58,22 +58,22 @@ under the License.
5858
<plugin>
5959
<groupId>org.apache.maven.plugins</groupId>
6060
<artifactId>maven-install-plugin</artifactId>
61-
<version>2.2</version>
61+
<version>@mavenInstallPluginVersion@</version>
6262
</plugin>
6363
<plugin>
6464
<groupId>org.apache.maven.plugins</groupId>
6565
<artifactId>maven-jar-plugin</artifactId>
66-
<version>2.1</version>
66+
<version>@mavenJarPluginVersion@</version>
6767
</plugin>
6868
<plugin>
6969
<groupId>org.apache.maven.plugins</groupId>
7070
<artifactId>maven-resources-plugin</artifactId>
71-
<version>2.2</version>
71+
<version>@mavenResourcesPluginVersion@</version>
7272
</plugin>
7373
<plugin>
7474
<groupId>org.apache.maven.plugins</groupId>
7575
<artifactId>maven-surefire-plugin</artifactId>
76-
<version>2.3.1</version>
76+
<version>@mavenSurefirePluginVersion@</version>
7777
</plugin>
7878
</plugins>
7979
</build>

‎src/it/alt-deploy-repo-with-dist-mgmt/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ under the License.
4848
<plugin>
4949
<groupId>org.apache.maven.plugins</groupId>
5050
<artifactId>maven-compiler-plugin</artifactId>
51-
<version>2.0.2</version>
51+
<version>@mavenCompilerPluginVersion@</version>
5252
</plugin>
5353
<plugin>
5454
<groupId>org.apache.maven.plugins</groupId>
@@ -58,22 +58,22 @@ under the License.
5858
<plugin>
5959
<groupId>org.apache.maven.plugins</groupId>
6060
<artifactId>maven-install-plugin</artifactId>
61-
<version>2.2</version>
61+
<version>@mavenInstallPluginVersion@</version>
6262
</plugin>
6363
<plugin>
6464
<groupId>org.apache.maven.plugins</groupId>
6565
<artifactId>maven-jar-plugin</artifactId>
66-
<version>2.1</version>
66+
<version>@mavenJarPluginVersion@</version>
6767
</plugin>
6868
<plugin>
6969
<groupId>org.apache.maven.plugins</groupId>
7070
<artifactId>maven-resources-plugin</artifactId>
71-
<version>2.2</version>
71+
<version>@mavenResourcesPluginVersion@</version>
7272
</plugin>
7373
<plugin>
7474
<groupId>org.apache.maven.plugins</groupId>
7575
<artifactId>maven-surefire-plugin</artifactId>
76-
<version>2.3.1</version>
76+
<version>@mavenSurefirePluginVersion@</version>
7777
</plugin>
7878
</plugins>
7979
</build>

‎src/it/alt-deploy-repo-without-dist-mgmt/pom.xml

+5-5
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>
@@ -51,22 +51,22 @@ under the License.
5151
<plugin>
5252
<groupId>org.apache.maven.plugins</groupId>
5353
<artifactId>maven-install-plugin</artifactId>
54-
<version>2.2</version>
54+
<version>@mavenInstallPluginVersion@</version>
5555
</plugin>
5656
<plugin>
5757
<groupId>org.apache.maven.plugins</groupId>
5858
<artifactId>maven-jar-plugin</artifactId>
59-
<version>2.1</version>
59+
<version>@mavenJarPluginVersion@</version>
6060
</plugin>
6161
<plugin>
6262
<groupId>org.apache.maven.plugins</groupId>
6363
<artifactId>maven-resources-plugin</artifactId>
64-
<version>2.2</version>
64+
<version>@mavenResourcesPluginVersion@</version>
6565
</plugin>
6666
<plugin>
6767
<groupId>org.apache.maven.plugins</groupId>
6868
<artifactId>maven-surefire-plugin</artifactId>
69-
<version>2.3.1</version>
69+
<version>@mavenSurefirePluginVersion@</version>
7070
</plugin>
7171
</plugins>
7272
</build>

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

-103
This file was deleted.

0 commit comments

Comments
 (0)