Skip to content

Commit 4a13d66

Browse files
Bump org.codehaus.mojo:versions-maven-plugin from 2.17.1 to 2.18.0 (#134)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 338e075 commit 4a13d66

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>org.codehaus.mojo</groupId>
2828
<artifactId>versions-maven-plugin</artifactId>
29-
<version>2.17.1</version>
29+
<version>2.18.0</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>org.apache.maven.plugin-tools</groupId>

maven-plugin/src/main/java/io/jenkins/tools/incrementals/maven/DetectIndent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.jenkins.tools.incrementals.maven;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44

55
public class DetectIndent {
66

maven-plugin/src/main/java/io/jenkins/tools/incrementals/maven/IncrementalifyMojo.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
import org.codehaus.mojo.versions.api.VersionRetrievalException;
5959
import org.codehaus.mojo.versions.api.VersionsHelper;
6060
import org.codehaus.mojo.versions.api.recording.ChangeRecorder;
61-
import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
61+
import org.codehaus.mojo.versions.rewriting.MutableXMLStreamReader;
6262
import org.eclipse.aether.RepositorySystem;
6363
import static org.twdata.maven.mojoexecutor.MojoExecutor.*;
6464

@@ -120,7 +120,7 @@ public class IncrementalifyMojo extends AbstractVersionsUpdaterMojo {
120120
}
121121
}
122122

123-
@Override protected void update(ModifiedPomXMLEventReader pom) throws MojoExecutionException, MojoFailureException, XMLStreamException {
123+
@Override protected void update(MutableXMLStreamReader pom) throws MojoExecutionException, MojoFailureException, XMLStreamException {
124124
String version = PomHelper.getProjectVersion(pom);
125125
Matcher m = Pattern.compile("(.+)-SNAPSHOT").matcher(version);
126126
if (!m.matches()) {
@@ -175,7 +175,7 @@ public class IncrementalifyMojo extends AbstractVersionsUpdaterMojo {
175175
* @return The parent artifact or <code>null</code> if no parent is specified.
176176
* @throws XMLStreamException if something went wrong.
177177
*/
178-
private static Artifact getProjectParent( final ModifiedPomXMLEventReader pom, VersionsHelper helper )
178+
private static Artifact getProjectParent( final MutableXMLStreamReader pom, VersionsHelper helper )
179179
throws XMLStreamException
180180
{
181181
Stack<String> stack = new Stack<>();
@@ -189,11 +189,11 @@ private static Artifact getProjectParent( final ModifiedPomXMLEventReader pom, V
189189

190190
while ( pom.hasNext() )
191191
{
192-
XMLEvent event = pom.nextEvent();
193-
if ( event.isStartElement() )
192+
pom.next();
193+
if ( pom.isStartElement() )
194194
{
195195
stack.push( path );
196-
final String elementName = event.asStartElement().getName().getLocalPart();
196+
final String elementName = pom.getLocalName();
197197
path = path + "/" + elementName;
198198

199199
if ( matchScopeRegex.matcher( path ).matches() )
@@ -215,7 +215,7 @@ else if ( "version".equals( elementName ) )
215215
}
216216
}
217217
}
218-
if ( event.isEndElement() )
218+
if ( pom.isEndElement() )
219219
{
220220
path = stack.pop();
221221
}
@@ -245,18 +245,18 @@ static ReplaceGitHubRepo replaceGitHubRepo(String text) throws MojoFailureExcept
245245
return new ReplaceGitHubRepo(m.group(1) + "${gitHubRepo}" + m.group(3), m.group(2));
246246
}
247247

248-
private void prependProperty(ModifiedPomXMLEventReader pom, String name, String value) throws XMLStreamException, MojoFailureException {
248+
private void prependProperty(MutableXMLStreamReader pom, String name, String value) throws XMLStreamException, MojoFailureException {
249249
Stack<String> stack = new Stack<>();
250250
pom.rewind();
251251
boolean found = false;
252252
while (pom.hasNext()) {
253-
XMLEvent event = pom.nextEvent();
254-
if (event.isStartElement()) {
255-
stack.push(event.asStartElement().getName().getLocalPart());
253+
pom.next();
254+
if (pom.isStartElement()) {
255+
stack.push(pom.getLocalName());
256256
if (stack.equals(Arrays.asList("project", "properties"))) {
257257
pom.mark(0);
258258
}
259-
} else if (event.isEndElement()) {
259+
} else if (pom.isEndElement()) {
260260
if (stack.equals(Arrays.asList("project", "properties"))) {
261261
pom.mark(1);
262262
found = true;

maven-plugin/src/main/java/io/jenkins/tools/incrementals/maven/UpdateMojo.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.codehaus.mojo.versions.api.PropertyVersions;
5151
import org.codehaus.mojo.versions.api.VersionsHelper;
5252
import org.codehaus.mojo.versions.api.recording.ChangeRecorder;
53-
import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
53+
import org.codehaus.mojo.versions.rewriting.MutableXMLStreamReader;
5454
import org.eclipse.aether.RepositorySystem;
5555

5656
/**
@@ -83,7 +83,7 @@ public class UpdateMojo extends AbstractVersionsDependencyUpdaterMojo {
8383
super(artifactHandlerManager, repositorySystem, wagonMap, changeRecorders);
8484
}
8585

86-
@Override protected void update(ModifiedPomXMLEventReader pom) throws MojoExecutionException, MojoFailureException, XMLStreamException {
86+
@Override protected void update(MutableXMLStreamReader pom) throws MojoExecutionException, MojoFailureException, XMLStreamException {
8787
try {
8888
UpdateChecker checker = new UpdateChecker(message -> getLog().info(message),
8989
// TODO use repos.stream().map(MavenArtifactRepository::getUrl).collect(Collectors.toList()) if UpdateChecker.loadVersions is fixed to exclude snapshots and pass authentication
@@ -108,7 +108,7 @@ public class UpdateMojo extends AbstractVersionsDependencyUpdaterMojo {
108108
}
109109
}
110110

111-
private void update(ModifiedPomXMLEventReader pom, List<Dependency> dependencies, UpdateChecker checker) throws Exception {
111+
private void update(MutableXMLStreamReader pom, List<Dependency> dependencies, UpdateChecker checker) throws Exception {
112112
for (Dependency dep : dependencies) {
113113
Artifact art = toArtifact(dep);
114114
if (!isIncluded(art)) {
@@ -136,12 +136,12 @@ private void update(ModifiedPomXMLEventReader pom, List<Dependency> dependencies
136136
getLog().info("No update found for " + toString(dep));
137137
} else {
138138
getLog().info("Can update dependency " + toString(dep) + " to " + result.version);
139-
PomHelper.setDependencyVersion(pom, groupId, artifactId, version, result.version.toString(), getProject().getModel());
139+
PomHelper.setDependencyVersion(pom, groupId, artifactId, version, result.version.toString(), getProject().getModel(), getLog());
140140
}
141141
}
142142
}
143143

144-
private void updateProperties(ModifiedPomXMLEventReader pom, UpdateChecker checker) throws Exception {
144+
private void updateProperties(MutableXMLStreamReader pom, UpdateChecker checker) throws Exception {
145145
PROPERTY: for (Map.Entry<Property, PropertyVersions> entry : getHelper().getVersionPropertiesMap(VersionsHelper.VersionPropertiesMapRequest.builder().withMavenProject(getProject()).build()).entrySet()) {
146146
Property property = entry.getKey();
147147
String name = property.getName();

0 commit comments

Comments
 (0)