Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Preparations for resolver alpha-3 (#322) 

Changes:
* transport renames
* some internals rename
This commit is contained in:
Tamas Cservenak 2023-12-06 15:07:51 +01:00 committed by GitHub
parent b806d5972e
commit 8880639cee
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
View File

@ -75,16 +75,8 @@ public class MavenITmng2741PluginMetadataResolutionErrorMessageTest extends Abst
List<String> lines = verifier.loadLines(verifier.getLogFileName(), "UTF-8");
for (String line : lines) {
sb.append(line).append(System.lineSeparator());
if (line.matches(".*Connection refused.*")) {
foundCause = true;
break;
}
// To be fixed with https://issues.apache.org/jira/browse/MRESOLVER-429
if (line.matches(".*ConnectException.*")) {
foundCause = true;
break;
}
if (line.matches(".*Connection to http://localhost:54312 refused.*")) {
if (line.matches(
".*Connection to http://localhost:54312.*refused.*")) { // URL may be with or without trailing /
foundCause = true;
break;
}

5
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
View File

@ -61,11 +61,6 @@ public class MavenITmng3477DependencyResolutionErrorMessageTest extends Abstract
foundCause = true;
break;
}
// To be fixed with https://issues.apache.org/jira/browse/MRESOLVER-429
if (line.matches(".*org.apache.maven.its.mng3477:dep:jar:1.0.*ConnectException.*")) {
foundCause = true;
break;
}
}
assertTrue("Transfer error cause was not found", foundCause);
}

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
View File

@ -107,9 +107,9 @@ public class MavenITmng7470ResolverTransportTest extends AbstractMavenIntegratio
private static final String WAGON_LOG_SNIPPET = "[DEBUG] Using transporter WagonTransporter";
private static final String APACHE_LOG_SNIPPET = "[DEBUG] Using transporter HttpTransporter";
private static final String APACHE_LOG_SNIPPET = "[DEBUG] Using transporter ApacheTransporter";
private static final String JDK_LOG_SNIPPET = "[DEBUG] Using transporter JdkHttpTransporter";
private static final String JDK_LOG_SNIPPET = "[DEBUG] Using transporter JdkTransporter";
/**
* Returns {@code true} if JDK HttpClient transport is usable (Java11 or better).
@ -119,7 +119,7 @@ public class MavenITmng7470ResolverTransportTest extends AbstractMavenIntegratio
}
/**
* Returns {@code true} if JDK HttpClient transport is present in Maven (since 4.0.0-alpha-9, the Resovler 2.0.0
* Returns {@code true} if JDK HttpClient transport is present in Maven (since 4.0.0-alpha-9, the Resolver 2.0.0
* upgrade).
*/
private boolean isJdkTransportPresent() {