Skip to content

Commit f36f8e1

Browse files
authored
IT: update archaic deps (#1903)
This PR is based on dependabot PRs but they require code changes as well. Based on: * #1895 * #1889
1 parent 4b18bfb commit f36f8e1

File tree

7 files changed

+43
-19
lines changed

7 files changed

+43
-19
lines changed

its/core-it-suite/src/test/resources/mng-8299-custom-lifecycle/CustomLifecyclePlugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<dependency>
1313
<groupId>org.apache.maven</groupId>
1414
<artifactId>maven-plugin-api</artifactId>
15-
<version>2.0</version>
15+
<version>3.2.5</version>
1616
<scope>provided</scope>
1717
</dependency>
1818
</dependencies>

its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/pom.xml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,9 @@ under the License.
3939

4040
<dependencies>
4141
<dependency>
42-
<groupId>org.apache.maven</groupId>
42+
<groupId>org.apache.maven.plugin-tools</groupId>
4343
<artifactId>maven-script-ant</artifactId>
44-
<version>2.2.1</version>
45-
<exclusions>
46-
<exclusion>
47-
<groupId>ant</groupId>
48-
<artifactId>ant</artifactId>
49-
</exclusion>
50-
<exclusion>
51-
<groupId>ant</groupId>
52-
<artifactId>ant-launcher</artifactId>
53-
</exclusion>
54-
</exclusions>
44+
<version>3.15.1</version>
5545
</dependency>
5646
<dependency>
5747
<groupId>org.apache.ant</groupId>
@@ -89,11 +79,14 @@ under the License.
8979
resources that have a leading slash).
9080
NOTE: We use a version that is different from the version used by the other modules to workaround MNG-1323
9181
via MNG-3284.
82+
83+
cstamas: this above is untrue anymore, plugin and suite updated to 3.x as part of Maven 4 work.
9284
-->
93-
<version>2.4.2</version>
85+
<version>3.15.1</version>
9486
<configuration>
9587
<!-- NOTE: We use a handwritten descriptor to decouple from MPLUGIN-136/MNG-3741 so dump the generated one -->
9688
<outputDirectory>${project.build.directory}</outputDirectory>
89+
<goalPrefix>maven-it-plugin-ant-based</goalPrefix>
9790
<extractors>
9891
<extractor>ant</extractor>
9992
</extractors>
@@ -102,7 +95,7 @@ under the License.
10295
<dependency>
10396
<groupId>org.apache.maven.plugin-tools</groupId>
10497
<artifactId>maven-plugin-tools-ant</artifactId>
105-
<version>2.4.2</version>
98+
<version>3.15.1</version>
10699
</dependency>
107100
</dependencies>
108101
</plugin>

its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ under the License.
5151
<dependency>
5252
<groupId>org.apache.maven.wagon</groupId>
5353
<artifactId>wagon-ssh</artifactId>
54-
<version>2.0</version>
54+
<version>3.5.3</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>org.apache.maven.wagon</groupId>
5858
<artifactId>wagon-file</artifactId>
59-
<version>2.0</version>
59+
<version>3.5.3</version>
6060
</dependency>
6161
</dependencies>
6262
</project>

its/core-it-support/core-it-wagon/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ under the License.
4545
<dependency>
4646
<groupId>org.apache.maven.wagon</groupId>
4747
<artifactId>wagon-provider-api</artifactId>
48-
<version>1.0-beta-2</version>
48+
<version>3.5.3</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>org.codehaus.plexus</groupId>

its/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItHttpWagon.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
*/
4444
@Component(role = org.apache.maven.wagon.Wagon.class, hint = "http-coreit", instantiationStrategy = "per-lookup")
4545
public class CoreItHttpWagon extends AbstractWagon {
46+
@Override
4647
public void get(String resourceName, File destination)
4748
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
4849
InputData inputData = new InputData();
@@ -67,11 +68,13 @@ public void get(String resourceName, File destination)
6768
getTransfer(inputData.getResource(), destination, is);
6869
}
6970

71+
@Override
7072
public boolean getIfNewer(String resourceName, File destination, long timestamp)
7173
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
7274
return false;
7375
}
7476

77+
@Override
7578
public void put(File source, String resourceName)
7679
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
7780
OutputData outputData = new OutputData();
@@ -94,6 +97,7 @@ public void put(File source, String resourceName)
9497
putTransfer(outputData.getResource(), source, os, true);
9598
}
9699

100+
@Override
97101
public void closeConnection() throws ConnectionException {
98102
File f = new File("target/wagon-data");
99103
try {
@@ -149,7 +153,13 @@ public void fillOutputData(OutputData outputData) throws TransferFailedException
149153
outputData.setOutputStream(new ByteArrayOutputStream());
150154
}
151155

156+
@Override
152157
public void openConnection() throws ConnectionException, AuthenticationException {
153158
// ignore
154159
}
160+
161+
@Override
162+
protected void openConnectionInternal() throws ConnectionException, AuthenticationException {
163+
// ignore
164+
}
155165
}

its/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItWagon.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
*/
4545
@Component(role = org.apache.maven.wagon.Wagon.class, hint = "coreit", instantiationStrategy = "per-lookup")
4646
public class CoreItWagon extends AbstractWagon {
47+
@Override
4748
public void get(String resourceName, File destination)
4849
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
4950
InputData inputData = new InputData();
@@ -68,11 +69,13 @@ public void get(String resourceName, File destination)
6869
getTransfer(inputData.getResource(), destination, is);
6970
}
7071

72+
@Override
7173
public boolean getIfNewer(String resourceName, File destination, long timestamp)
7274
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
7375
return false;
7476
}
7577

78+
@Override
7679
public void put(File source, String resourceName)
7780
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
7881
OutputData outputData = new OutputData();
@@ -95,6 +98,7 @@ public void put(File source, String resourceName)
9598
putTransfer(outputData.getResource(), source, os, true);
9699
}
97100

101+
@Override
98102
public void closeConnection() throws ConnectionException {
99103
File f = new File("target/wagon-data");
100104
try {
@@ -155,9 +159,14 @@ public void fillOutputData(OutputData outputData) throws TransferFailedException
155159
outputData.setOutputStream(new ByteArrayOutputStream());
156160
}
157161

162+
@Override
158163
public void openConnection() throws ConnectionException, AuthenticationException {
159164
// ignore
165+
}
160166

167+
@Override
168+
protected void openConnectionInternal() throws ConnectionException, AuthenticationException {
169+
// ignore
161170
}
162171

163172
private void put(Properties props, String key, String value) {

its/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
*/
4545
@Component(role = org.apache.maven.wagon.Wagon.class, hint = "scpexe", instantiationStrategy = "per-lookup")
4646
public class ScpExternalWagon extends AbstractWagon {
47+
@Override
4748
public void get(String resourceName, File destination)
4849
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
4950
InputData inputData = new InputData();
@@ -68,11 +69,13 @@ public void get(String resourceName, File destination)
6869
getTransfer(inputData.getResource(), destination, is);
6970
}
7071

72+
@Override
7173
public boolean getIfNewer(String resourceName, File destination, long timestamp)
7274
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
7375
return false;
7476
}
7577

78+
@Override
7679
public void put(File source, String resourceName)
7780
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
7881
OutputData outputData = new OutputData();
@@ -97,6 +100,7 @@ public void put(File source, String resourceName)
97100
putTransfer(outputData.getResource(), source, os, true);
98101
}
99102

103+
@Override
100104
public void closeConnection() throws ConnectionException {}
101105

102106
public void fillInputData(InputData inputData) throws TransferFailedException, ResourceDoesNotExistException {
@@ -144,5 +148,13 @@ public void fillOutputData(OutputData outputData) throws TransferFailedException
144148
outputData.setOutputStream(new ByteArrayOutputStream());
145149
}
146150

147-
public void openConnection() throws ConnectionException, AuthenticationException {}
151+
@Override
152+
public void openConnection() throws ConnectionException, AuthenticationException {
153+
// ignore
154+
}
155+
156+
@Override
157+
protected void openConnectionInternal() throws ConnectionException, AuthenticationException {
158+
// ignore
159+
}
148160
}

0 commit comments

Comments
 (0)