Refresh component for January 2023 #37
Conversation
| <artifactId>enforcer-api</artifactId> | ||
| <version>3.2.1</version> | ||
| <scope>provided</scope> |
There was a problem hiding this comment.
Depending on the public API as recommended upstream rather than on internal implementation details.
|
|
||
| /** | ||
| * Verifies that {@code git-changelist-maven-extension}, if present, is sufficiently new. | ||
| */ | ||
| public class RequireExtensionVersion extends AbstractVersionEnforcer { | ||
| @Named("requireExtensionVersion") |
There was a problem hiding this comment.
As recommended upstream. This means we'll need to change <rule implementation="io.jenkins.tools.incrementals.enforcer.RequireExtensionVersion"> to <requireExtensionVersion> in consumers, which looks nicer anyway.
|
|
||
| /** | ||
| * Verifies that {@code git-changelist-maven-extension}, if present, is sufficiently new. | ||
| */ | ||
| public class RequireExtensionVersion extends AbstractVersionEnforcer { | ||
| @Named("requireExtensionVersion") | ||
| public class RequireExtensionVersion extends AbstractEnforcerRule { |
There was a problem hiding this comment.
AbstractVersionEnforcer is now a private API, so depend only on the public API and copy/paste in everything else we need from the API that is now private.
| /** | ||
| * Specify the required version. Some examples are: | ||
| * <ul> | ||
| * <li><code>2.0.4</code> Version 2.0.4 and higher (different from Maven meaning)</li> | ||
| * <li><code>[2.0,2.1)</code> Versions 2.0 (included) to 2.1 (not included)</li> | ||
| * <li><code>[2.0,2.1]</code> Versions 2.0 to 2.1 (both included)</li> | ||
| * <li><code>[2.0.5,)</code> Versions 2.0.5 and higher</li> | ||
| * <li><code>(,2.0.5],[2.1.1,)</code> Versions up to 2.0.5 (included) and 2.1.1 or higher</li> | ||
| * </ul> | ||
| * | ||
| * @see {@link #setVersion(String)} | ||
| * @see {@link #getVersion()} | ||
| */ | ||
| private String version; |
| private final PlexusContainer container; | ||
|
|
||
| @Inject | ||
| public RequireExtensionVersion(PlexusContainer container) { | ||
| this.container = Objects.requireNonNull(container); | ||
| } |
There was a problem hiding this comment.
Adapting to the new recommended way of injecting components via constructor (EnforcerRuleHelper is now deprecated).
| @Inject public IncrementalifyMojo(RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, Map<String, Wagon> wagonMap, Map<String, ChangeRecorder> changeRecorders) { | ||
| super(repositorySystem, aetherRepositorySystem, wagonMap, changeRecorders); | ||
| } |
There was a problem hiding this comment.
Adapting to the new recommended method for injecting components via constructor.
| try { | ||
| gclmeVersions = getHelper().lookupArtifactVersions(getHelper().createDependencyArtifact("io.jenkins.tools.incrementals", "git-changelist-maven-extension", "[0,)", "type", null, null), true); | ||
| } catch (VersionRetrievalException x) { | ||
| throw new MojoExecutionException(x.getMessage(), x); | ||
| } | ||
| VersionRange any; | ||
| try { | ||
| any = VersionRange.createFromVersionSpec("[0,)"); | ||
| gclmeVersions = getHelper().lookupArtifactVersions(getHelper().createDependencyArtifact("io.jenkins.tools.incrementals", "git-changelist-maven-extension", any, "type", null, null), true); | ||
| } catch (ArtifactMetadataRetrievalException | InvalidVersionSpecificationException x) { | ||
| } catch (InvalidVersionSpecificationException x) { |
There was a problem hiding this comment.
Adapting to random compilation failures. Stepped through the new code in the debugger to make sure it was working.
| PomHelper.setElementValue(pom, "/project/scm", "tag", "${scmTag}"); | ||
| PomHelper.setElementValue(pom, "/project/scm", "connection", connectionRGHR.interpolableText); | ||
| PomHelper.setElementValue(pom, "/project/scm", "developerConnection", developerConnectionRGHR.interpolableText); | ||
| PomHelper.setElementValue(pom, "/project/scm", "url", urlRGHR.interpolableText); |
There was a problem hiding this comment.
Adapting to random API breakage as was done upstream by using the new method.
| /** | ||
| * Gets the parent artifact from the pom. | ||
| * | ||
| * @param pom The pom. | ||
| * @param helper The helper (used to create the artifact). | ||
| * @return The parent artifact or <code>null</code> if no parent is specified. | ||
| * @throws XMLStreamException if something went wrong. | ||
| */ | ||
| private static Artifact getProjectParent( final ModifiedPomXMLEventReader pom, VersionsHelper helper ) | ||
| throws XMLStreamException |
There was a problem hiding this comment.
Copypasta, this was deleted upstream with no explanation. Inlining the last working version of it before it was deleted.
| @@ -133,7 +141,7 @@ private void update(ModifiedPomXMLEventReader pom, List<Dependency> dependencies | |||
| } | |||
|
|
|||
| private void updateProperties(ModifiedPomXMLEventReader pom, UpdateChecker checker) throws Exception { | |||
| PROPERTY: for (Map.Entry<Property, PropertyVersions> entry : getHelper().getVersionPropertiesMap(getProject(), /* TODO */ new Property[0], /* TODO */ null, null, true).entrySet()) { | |||
| PROPERTY: for (Map.Entry<Property, PropertyVersions> entry : getHelper().getVersionPropertiesMap(VersionsHelper.VersionPropertiesMapRequest.builder().withMavenProject(getProject()).build()).entrySet()) { | |||
There was a problem hiding this comment.
Adapting to random upstream breakage as was done in the original commit. Stepped through this in the debugger to make sure it worked.
See jenkinsci/pom#387 and jenkinsci/plugin-pom#689. We cannot update Maven Enforcer Plugin to the latest version until this component is recompiled against recent Maven APIs.
I tested each component manually (with Enforcer 3.2.1):
RequireExtensionVersionwith valid versionRequireExtensionVersionwith invalid versionIncrementalifyMojoin a debugger, verified the changes topom.xmlwere as expectedUpdateMojoin a debugger, verified the mojo completed without any errorsCC @jglick