Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IT: update archaic deps #1903

Merged
merged 3 commits into from
Nov 13, 2024
Merged

IT: update archaic deps #1903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f65c8a
IT: update archaich deps
cstamas Nov 13, 2024
8f8a73b
Merge remote-tracking branch 'upstream/master' into it-dependencies
cstamas Nov 13, 2024
d3f77eb
Use version already present in bootstrap
cstamas Nov 13, 2024
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
2 changes: 1 addition & 1 deletion its/core-it-suite/src/test/resources/mng-8299-custom-lifecycle/CustomLifecyclePlugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.2.5</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
21 changes: 7 additions & 14 deletions its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,9 @@ under the License.

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-script-ant</artifactId>
<version>2.2.1</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant-launcher</artifactId>
</exclusion>
</exclusions>
<version>3.15.1</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
Expand Down Expand Up @@ -89,11 +79,14 @@ under the License.
resources that have a leading slash).
NOTE: We use a version that is different from the version used by the other modules to workaround MNG-1323
via MNG-3284.

cstamas: this above is untrue anymore, plugin and suite updated to 3.x as part of Maven 4 work.
-->
<version>2.4.2</version>
<version>3.15.1</version>
<configuration>
<!-- NOTE: We use a handwritten descriptor to decouple from MPLUGIN-136/MNG-3741 so dump the generated one -->
<outputDirectory>${project.build.directory}</outputDirectory>
<goalPrefix>maven-it-plugin-ant-based</goalPrefix>
<extractors>
<extractor>ant</extractor>
</extractors>
Expand All @@ -102,7 +95,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-ant</artifactId>
<version>2.4.2</version>
<version>3.15.1</version>
</dependency>
</dependencies>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.0</version>
<version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<version>2.0</version>
<version>3.5.3</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion its/core-it-support/core-it-wagon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>1.0-beta-2</version>
<version>3.5.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down
10 changes: 10 additions & 0 deletions .../core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItHttpWagon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
*/
@Component(role = org.apache.maven.wagon.Wagon.class, hint = "http-coreit", instantiationStrategy = "per-lookup")
public class CoreItHttpWagon extends AbstractWagon {
@Override
public void get(String resourceName, File destination)
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
InputData inputData = new InputData();
Expand All @@ -67,11 +68,13 @@ public void get(String resourceName, File destination)
getTransfer(inputData.getResource(), destination, is);
}

@Override
public boolean getIfNewer(String resourceName, File destination, long timestamp)
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
return false;
}

@Override
public void put(File source, String resourceName)
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
OutputData outputData = new OutputData();
Expand All @@ -94,6 +97,7 @@ public void put(File source, String resourceName)
putTransfer(outputData.getResource(), source, os, true);
}

@Override
public void closeConnection() throws ConnectionException {
File f = new File("target/wagon-data");
try {
Expand Down Expand Up @@ -149,7 +153,13 @@ public void fillOutputData(OutputData outputData) throws TransferFailedException
outputData.setOutputStream(new ByteArrayOutputStream());
}

@Override
public void openConnection() throws ConnectionException, AuthenticationException {
// ignore
}

@Override
protected void openConnectionInternal() throws ConnectionException, AuthenticationException {
// ignore
}
}
9 changes: 9 additions & 0 deletions ...port/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/coreit/CoreItWagon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
*/
@Component(role = org.apache.maven.wagon.Wagon.class, hint = "coreit", instantiationStrategy = "per-lookup")
public class CoreItWagon extends AbstractWagon {
@Override
public void get(String resourceName, File destination)
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
InputData inputData = new InputData();
Expand All @@ -68,11 +69,13 @@ public void get(String resourceName, File destination)
getTransfer(inputData.getResource(), destination, is);
}

@Override
public boolean getIfNewer(String resourceName, File destination, long timestamp)
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
return false;
}

@Override
public void put(File source, String resourceName)
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
OutputData outputData = new OutputData();
Expand All @@ -95,6 +98,7 @@ public void put(File source, String resourceName)
putTransfer(outputData.getResource(), source, os, true);
}

@Override
public void closeConnection() throws ConnectionException {
File f = new File("target/wagon-data");
try {
Expand Down Expand Up @@ -155,9 +159,14 @@ public void fillOutputData(OutputData outputData) throws TransferFailedException
outputData.setOutputStream(new ByteArrayOutputStream());
}

@Override
public void openConnection() throws ConnectionException, AuthenticationException {
// ignore
}

@Override
protected void openConnectionInternal() throws ConnectionException, AuthenticationException {
// ignore
}

private void put(Properties props, String key, String value) {
Expand Down
14 changes: 13 additions & 1 deletion ...t-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
*/
@Component(role = org.apache.maven.wagon.Wagon.class, hint = "scpexe", instantiationStrategy = "per-lookup")
public class ScpExternalWagon extends AbstractWagon {
@Override
public void get(String resourceName, File destination)
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
InputData inputData = new InputData();
Expand All @@ -68,11 +69,13 @@ public void get(String resourceName, File destination)
getTransfer(inputData.getResource(), destination, is);
}

@Override
public boolean getIfNewer(String resourceName, File destination, long timestamp)
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
return false;
}

@Override
public void put(File source, String resourceName)
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException {
OutputData outputData = new OutputData();
Expand All @@ -97,6 +100,7 @@ public void put(File source, String resourceName)
putTransfer(outputData.getResource(), source, os, true);
}

@Override
public void closeConnection() throws ConnectionException {}

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

public void openConnection() throws ConnectionException, AuthenticationException {}
@Override
public void openConnection() throws ConnectionException, AuthenticationException {
// ignore
}

@Override
protected void openConnectionInternal() throws ConnectionException, AuthenticationException {
// ignore
}
}