Remove custom XPath logic from PluginRemoting
#442
Conversation
| // Trimming url | ||
| transformedConnectionUrl = transformedConnectionUrl.trim(); |
| // Generally, when connectionUrl is empty, is implies it is declared in a parent pom | ||
| // => Only possibility is to deduct github repository from artifactId (crossing fingers it | ||
| // is not a bizarre repository url...) | ||
| String oldUrl = transformedConnectionUrl; | ||
| if (transformedConnectionUrl.isEmpty()) { | ||
| transformedConnectionUrl = | ||
| "scm:git:git://github.com/jenkinsci/" | ||
| + pomData.artifactId.replaceAll("jenkins", "") | ||
| + "-plugin.git"; | ||
| if (!oldUrl.equals(transformedConnectionUrl)) { | ||
| LOGGER.log( | ||
| Level.WARNING, | ||
| "project.scm.connectionUrl is not present in plugin's pom .. isn't it" | ||
| + " residing somewhere on a parent pom ?"); | ||
| } | ||
| } |
There was a problem hiding this comment.
If this is actually a problem the solution is to update the parent POM to read <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false"> per our archetype.
| // Java.net SVN migration | ||
| oldUrl = transformedConnectionUrl; | ||
| transformedConnectionUrl = | ||
| transformedConnectionUrl.replaceAll( | ||
| "(svn|hudson)\\.dev\\.java\\.net/svn/hudson/", | ||
| "svn.java.net/svn/hudson~svn/"); | ||
| if (!oldUrl.equals(transformedConnectionUrl)) { | ||
| LOGGER.log( | ||
| Level.WARNING, | ||
| "project.scm.connectionUrl is pointing to svn.dev.java.net/svn/hudson/ instead" | ||
| + " of svn.java.net/svn/hudson~svn/"); | ||
| } |
There was a problem hiding this comment.
This migration happened a decade ago.
| // ${project.artifactId} | ||
| transformedConnectionUrl = | ||
| transformedConnectionUrl.replaceAll( | ||
| "\\$\\{project\\.artifactId\\}", pomData.artifactId); |
There was a problem hiding this comment.
I haven't seen a POM like this in years and Maven 4 actually won't accept it.
There was a problem hiding this comment.
for the repository and pluginsRepository section - not for scm? (not that it matters here - but if you we are no longer able to use properties in an SCM connection there are a lot of plugins that need to be fixed for maven 4.
There was a problem hiding this comment.
I saw it at least for dependencies.dependency.groupId in JENKINS-70478.
| // Convert things like | ||
| // scm:git:git://git@github.com:jenkinsci/dockerhub-notification-plugin.git | ||
| oldUrl = transformedConnectionUrl; | ||
| transformedConnectionUrl = | ||
| transformedConnectionUrl.replaceAll( | ||
| "scm:git:git://git@github\\.com:jenkinsci", | ||
| "scm:git:git://github.com/jenkinsci"); | ||
| if (!oldUrl.equals(transformedConnectionUrl)) { | ||
| LOGGER.log( | ||
| Level.WARNING, | ||
| "project.scm.connectionUrl should should be accessed in read-only mode (with" | ||
| + " git:// protocol)"); | ||
| } |
There was a problem hiding this comment.
I have spent months fixing up cases like this and I think most of the fixes have been released. If not then they should be, there is no reason to keep working around this in higher-level code.
| oldUrl = transformedConnectionUrl; | ||
| transformedConnectionUrl = | ||
| transformedConnectionUrl.replaceAll("://github\\.com[^/]", "://github.com/"); | ||
| if (!oldUrl.equals(transformedConnectionUrl)) { | ||
| LOGGER.log( | ||
| Level.WARNING, | ||
| "project.scm.connectionUrl should have a '/' after the github.com url"); | ||
| } |
There was a problem hiding this comment.
Again why not just fix the root cause of the problem.
| "project.scm.connectionUrl should not reference hudson project anymore (no" | ||
| + " plugin repository there))"); | ||
| } catch (IOException e) { | ||
| throw new UncheckedIOException(e); | ||
| } |
| model.getParent().getArtifactId(), | ||
| model.getParent().getVersion()); | ||
| } else { | ||
| parent = null; | ||
| } |
There was a problem hiding this comment.
I'd wager this was fixed years ago.
| // ${project.artifactId} | ||
| transformedConnectionUrl = | ||
| transformedConnectionUrl.replaceAll( | ||
| "\\$\\{project\\.artifactId\\}", pomData.artifactId); |
There was a problem hiding this comment.
for the repository and pluginsRepository section - not for scm? (not that it matters here - but if you we are no longer able to use properties in an SCM connection there are a lot of plugins that need to be fixed for maven 4.
ammend jenkinsci#442 to allow use of project.artifactId and artifactId as properties inside the SCM section testing a project with maven 4.0.0-alpha4 showed no warnings or errors about this use case, and we have many plugins that use it. Whilst fixing all the plugin is nobale - that would unessescarily hold up future improvements.
Fixes #426 by replacing all the custom XPath logic in
PluginRemotingwith a few lines to delegate toMavenXpp3Readerwhich is already on our class path and already knows how to parse Mavenpom.xmlfiles. To test this I ran the fulljenkinsci/bomtest suite.