diff --git a/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesXmlRenderer.java b/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesXmlRenderer.java index 6c98285bc..3abfcdc41 100644 --- a/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesXmlRenderer.java +++ b/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesXmlRenderer.java @@ -187,8 +187,9 @@ else if ( details.getOldestUpdate( UpdateScope.MAJOR ) != null ) public static String getVersionsBlocks( ArtifactVersions versions ) { StringBuilder sBuilder = new StringBuilder(); - sBuilder.append( TAB ).append( TAB ).append( TAB ).append( wrapElement( versions.getCurrentVersion().toString(), - CURRENT_VERSION ) ).append( NL ); + sBuilder.append( TAB ).append( TAB ).append( TAB ).append( wrapElement( versions.isCurrentVersionDefined() + ? versions.getCurrentVersion().toString() : versions.getArtifact().getVersionRange().toString(), + CURRENT_VERSION ) ).append( NL ); ArtifactVersion nextVersion = versions.getOldestUpdate( UpdateScope.ANY ); if ( nextVersion != null ) { diff --git a/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesXmlRendererTest.java b/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesXmlRendererTest.java new file mode 100644 index 000000000..6f890a8f7 --- /dev/null +++ b/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesXmlRendererTest.java @@ -0,0 +1,66 @@ +package org.codehaus.mojo.versions; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.DefaultArtifact; +import org.apache.maven.artifact.versioning.ArtifactVersion; +import org.apache.maven.artifact.versioning.DefaultArtifactVersion; +import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; +import org.apache.maven.artifact.versioning.VersionRange; +import org.codehaus.mojo.versions.api.ArtifactVersions; +import org.hamcrest.core.Is; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.core.IsNull.nullValue; + +/** + * Basic tests for {@linkplain DependencyUpdatesXmlRenderer}. + * + * @author Andrzej Jarmoniuk + */ +public class DependencyUpdatesXmlRendererTest +{ + @Test + public void testGetVersionsBlocks() throws InvalidVersionSpecificationException + { + List versions = + versionsOf( "1.0.0.1", "1.0.0.2", "2.121.2.1", "2.100.0.1", "3.1.0.1", "1.1.1" ); + final Artifact artifact = + new DefaultArtifact( "group", "artifact", VersionRange.createFromVersionSpec( "[1.0,3.0]" ), "foo", + "bar", "jar", null ); + ArtifactVersions artifactVersions = new ArtifactVersions( artifact, versions, null ); + assertThat( artifactVersions.getCurrentVersion(), nullValue() ); + assertThat( artifactVersions.isCurrentVersionDefined(), Is.is( false ) ); + String versionsBlocks = DependencyUpdatesXmlRenderer.getVersionsBlocks( artifactVersions ); + assertThat( versionsBlocks, containsString( "[1.0,3.0]" ) ); + } + + private static List versionsOf( String... versions ) + { + return Arrays.stream( versions ).map( DefaultArtifactVersion::new ).collect( Collectors.toList() ); + } +}