You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by GitBox <gi...@apache.org> on 2022/12/02 10:40:51 UTC
[GitHub] [maven] cstamas opened a new pull request, #895: [MNG-7614] Translate Plexus XML to proper resolver configuration
cstamas opened a new pull request, #895:
URL: https://github.com/apache/maven/pull/895
Now that Maven 3.9.x contains other transports than Wagon, the Plexus XML is not just to be "stuffed", but translation should happen to proper resolver configuration to make them available to all transports.
---
https://issues.apache.org/jira/browse/MNG-7614
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] kwin commented on a diff in pull request #895: [MNG-7614] Translate Plexus XML to proper resolver configuration
Posted by GitBox <gi...@apache.org>.
kwin commented on code in PR #895:
URL: https://github.com/apache/maven/pull/895#discussion_r1038147559
##########
maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java:
##########
@@ -209,6 +211,76 @@ public DefaultRepositorySystemSession newRepositorySession(MavenExecutionRequest
XmlPlexusConfiguration config = new XmlPlexusConfiguration(dom);
configProps.put("aether.connector.wagon.config." + server.getId(), config);
+
+ // Translate to proper resolver configuration properties as well (as Plexus XML above is Wagon specific
+ // only)
+ // but support only configuration/httpConfiguration/all, not the per-method nonsense
+ // https://maven.apache.org/guides/mini/guide-http-settings.html
+ Map<String, String> headers = null;
+ Integer connectTimeout = null;
+ Integer requestTimeout = null;
+
+ PlexusConfiguration httpHeaders = config.getChild("httpHeaders", false);
+ if (httpHeaders != null) {
+ PlexusConfiguration[] properties = httpHeaders.getChildren("property");
+ if (properties != null && properties.length > 0) {
+ headers = new HashMap<>();
+ for (PlexusConfiguration property : properties) {
+ headers.put(
+ property.getChild("name").getValue(),
+ property.getChild("value").getValue());
+ }
+ }
+ }
+
+ PlexusConfiguration connectTimeoutXml = config.getChild("connectTimeout", false);
+ if (connectTimeoutXml != null) {
+ connectTimeout = Integer.parseInt(connectTimeoutXml.getValue());
+ } else {
+ // fallback configuration name
+ PlexusConfiguration httpConfiguration = config.getChild("httpConfiguration", false);
+ if (httpConfiguration != null) {
Review Comment:
maybe instead of the nested if, just `config.getChild("httpConfiguration", true).getChild("all", true).getChild("connectionTimeout", false)`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] kwin commented on a diff in pull request #895: [MNG-7614] Translate Plexus XML to proper resolver configuration
Posted by GitBox <gi...@apache.org>.
kwin commented on code in PR #895:
URL: https://github.com/apache/maven/pull/895#discussion_r1038145135
##########
maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java:
##########
@@ -209,6 +211,76 @@ public DefaultRepositorySystemSession newRepositorySession(MavenExecutionRequest
XmlPlexusConfiguration config = new XmlPlexusConfiguration(dom);
configProps.put("aether.connector.wagon.config." + server.getId(), config);
+
+ // Translate to proper resolver configuration properties as well (as Plexus XML above is Wagon specific
+ // only)
+ // but support only configuration/httpConfiguration/all, not the per-method nonsense
Review Comment:
`not the per-method nonsense` :-) maybe just mention that only method `all` is supported.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] cstamas merged pull request #895: [MNG-7614] Translate Plexus XML to proper resolver configuration
Posted by GitBox <gi...@apache.org>.
cstamas merged PR #895:
URL: https://github.com/apache/maven/pull/895
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] cstamas commented on a diff in pull request #895: [MNG-7614] Translate Plexus XML to proper resolver configuration
Posted by GitBox <gi...@apache.org>.
cstamas commented on code in PR #895:
URL: https://github.com/apache/maven/pull/895#discussion_r1038151549
##########
maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java:
##########
@@ -209,6 +211,76 @@ public DefaultRepositorySystemSession newRepositorySession(MavenExecutionRequest
XmlPlexusConfiguration config = new XmlPlexusConfiguration(dom);
configProps.put("aether.connector.wagon.config." + server.getId(), config);
+
+ // Translate to proper resolver configuration properties as well (as Plexus XML above is Wagon specific
+ // only)
+ // but support only configuration/httpConfiguration/all, not the per-method nonsense
+ // https://maven.apache.org/guides/mini/guide-http-settings.html
+ Map<String, String> headers = null;
+ Integer connectTimeout = null;
+ Integer requestTimeout = null;
+
+ PlexusConfiguration httpHeaders = config.getChild("httpHeaders", false);
+ if (httpHeaders != null) {
+ PlexusConfiguration[] properties = httpHeaders.getChildren("property");
+ if (properties != null && properties.length > 0) {
+ headers = new HashMap<>();
+ for (PlexusConfiguration property : properties) {
+ headers.put(
+ property.getChild("name").getValue(),
+ property.getChild("value").getValue());
+ }
+ }
+ }
+
+ PlexusConfiguration connectTimeoutXml = config.getChild("connectTimeout", false);
+ if (connectTimeoutXml != null) {
+ connectTimeout = Integer.parseInt(connectTimeoutXml.getValue());
+ } else {
+ // fallback configuration name
+ PlexusConfiguration httpConfiguration = config.getChild("httpConfiguration", false);
+ if (httpConfiguration != null) {
Review Comment:
that would mean am potentially mutating the config object (that is already passed to Wagon as Plexus config) -- so nope.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [maven] cstamas commented on a diff in pull request #895: [MNG-7614] Translate Plexus XML to proper resolver configuration
Posted by GitBox <gi...@apache.org>.
cstamas commented on code in PR #895:
URL: https://github.com/apache/maven/pull/895#discussion_r1038151549
##########
maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java:
##########
@@ -209,6 +211,76 @@ public DefaultRepositorySystemSession newRepositorySession(MavenExecutionRequest
XmlPlexusConfiguration config = new XmlPlexusConfiguration(dom);
configProps.put("aether.connector.wagon.config." + server.getId(), config);
+
+ // Translate to proper resolver configuration properties as well (as Plexus XML above is Wagon specific
+ // only)
+ // but support only configuration/httpConfiguration/all, not the per-method nonsense
+ // https://maven.apache.org/guides/mini/guide-http-settings.html
+ Map<String, String> headers = null;
+ Integer connectTimeout = null;
+ Integer requestTimeout = null;
+
+ PlexusConfiguration httpHeaders = config.getChild("httpHeaders", false);
+ if (httpHeaders != null) {
+ PlexusConfiguration[] properties = httpHeaders.getChildren("property");
+ if (properties != null && properties.length > 0) {
+ headers = new HashMap<>();
+ for (PlexusConfiguration property : properties) {
+ headers.put(
+ property.getChild("name").getValue(),
+ property.getChild("value").getValue());
+ }
+ }
+ }
+
+ PlexusConfiguration connectTimeoutXml = config.getChild("connectTimeout", false);
+ if (connectTimeoutXml != null) {
+ connectTimeout = Integer.parseInt(connectTimeoutXml.getValue());
+ } else {
+ // fallback configuration name
+ PlexusConfiguration httpConfiguration = config.getChild("httpConfiguration", false);
+ if (httpConfiguration != null) {
Review Comment:
that would mean am potentially mutating the XML (that is already passed to Wagon as Plexus config) -- so nope.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org