Resolves #960: displayDependencyUpdates should display updates from l…

…esser segments

Resolves #299: allowAnyUpdates should be ignored with a warning message if any of: allowMajorUpdates, allowMinorUpdates, allowIncrementalUpdates is set to false

versions-common/src/main/java/org/codehaus/mojo/versions/api/ArtifactVersions.java

@@ -1,22 +1,18 @@
 package org.codehaus.mojo.versions.api;
 
 /*
- * 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
+ * Copyright MojoHaus and Contributors
+ * Licensed 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
+ *    https://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.
+ * 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.List;
@@ -75,12 +71,8 @@ public ArtifactVersions(Artifact artifact, List<ArtifactVersion> versions, Versi
         this.versionComparator = versionComparator;
         this.versions = new TreeSet<>(versionComparator);
         this.versions.addAll(versions);
-        // DefaultArtifact objects are often built from raw model, without a version set
-        // (where the actual version is taken from parent or dependency/plugin management)
-        // this probably isn't the case in an actual Maven execution
-        if (artifact.getVersion() != null) {
-            setCurrentVersion(artifact.getVersion());
-        }
+        setCurrentVersion(artifact.getVersion());
+        setCurrentVersionRange(artifact.getVersionRange());
     }
 
     /**
@@ -94,6 +86,7 @@ public ArtifactVersions(ArtifactVersions other) {
         versionComparator = other.versionComparator;
         versions = other.versions;
         setCurrentVersion(other.getCurrentVersion());
+        setCurrentVersionRange(other.getCurrentVersionRange());
     }
 
     @SuppressWarnings("checkstyle:InnerAssignment")

versions-common/src/main/java/org/codehaus/mojo/versions/api/ArtifactVersionsCache.java

@@ -1,22 +1,18 @@
 package org.codehaus.mojo.versions.api;
 
 /*
- * 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
+ * Copyright MojoHaus and Contributors
+ * Licensed 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
+ *    https://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.
+ * 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.HashMap;
@@ -27,7 +23,7 @@
 import org.apache.commons.lang3.tuple.Triple;
 
 /**
- * Utility providing a cached {@link ArtifactVersions#getNewestUpdate(Optional, boolean)} API
+ * Utility providing a cached {@link ArtifactVersions#getNewestUpdateWithinSegment(Optional, boolean)} API
  */
 public class ArtifactVersionsCache {
     private TriFunction<AbstractVersionDetails, Optional<Segment>, Boolean, ?> cachedFunction;

versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java

@@ -1,22 +1,18 @@
 package org.codehaus.mojo.versions.api;
 
 /*
- * 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
+ * Copyright MojoHaus and Contributors
+ * Licensed 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
+ *    https://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.
+ * 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.io.BufferedInputStream;
@@ -53,6 +49,7 @@
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 import org.apache.maven.artifact.versioning.Restriction;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.execution.MavenSession;
@@ -688,11 +685,10 @@ public Map<Property, PropertyVersions> getVersionPropertiesMap(VersionProperties
             if (dependencies != null) {
                 for (Dependency dependency : dependencies) {
                     getLog().debug("Property ${" + property.getName() + "}: Adding association to " + dependency);
-                    builder.addAssociation(this.createDependencyArtifact(dependency), false);
+                    builder.withAssociation(this.createDependencyArtifact(dependency), false);
                 }
             }
             try {
-                final PropertyVersions versions = builder.newPropertyVersions();
                 if (property.isAutoLinkDependencies()
                         && StringUtils.isEmpty(property.getVersion())
                         && !StringUtils.isEmpty(builder.getVersionRange())) {
@@ -702,8 +698,17 @@ public Map<Property, PropertyVersions> getVersionPropertiesMap(VersionProperties
                 }
                 final String currentVersion =
                         request.getMavenProject().getProperties().getProperty(property.getName());
-                versions.setCurrentVersion(currentVersion);
                 property.setValue(currentVersion);
+                final PropertyVersions versions;
+                try {
+                    if (currentVersion != null) {
+                        builder.withCurrentVersion(DefaultArtifactVersionCache.of(currentVersion))
+                                .withCurrentVersionRange(VersionRange.createFromVersionSpec(currentVersion));
+                    }
+                } catch (InvalidVersionSpecificationException e) {
+                    throw new RuntimeException(e);
+                }
+                versions = builder.build();
                 propertyVersions.put(property, versions);
             } catch (VersionRetrievalException e) {
                 throw new MojoExecutionException(e.getMessage(), e);

versions-common/src/main/java/org/codehaus/mojo/versions/api/PomHelper.java

@@ -1,22 +1,18 @@
 package org.codehaus.mojo.versions.api;
 
 /*
- * 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
+ * Copyright MojoHaus and Contributors
+ * Licensed 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
+ *    https://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.
+ * 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 javax.xml.stream.XMLInputFactory;
@@ -1021,7 +1017,7 @@ private static void addPluginAssociations(
                         }
                         // might as well capture the current value
                         String evaluatedVersion = (String) expressionEvaluator.evaluate(plugin.getVersion());
-                        property.addAssociation(
+                        property.withAssociation(
                                 helper.createPluginArtifact(groupId, artifactId, evaluatedVersion), true);
                         if (!propertyRef.equals(version)) {
                             addBounds(property, version, propertyRef);
@@ -1066,7 +1062,7 @@ private static void addReportPluginAssociations(
                         }
                         // might as well capture the current value
                         String versionEvaluated = (String) expressionEvaluator.evaluate(plugin.getVersion());
-                        property.addAssociation(
+                        property.withAssociation(
                                 helper.createPluginArtifact(groupId, artifactId, versionEvaluated), true);
                         if (!propertyRef.equals(version)) {
                             addBounds(property, version, propertyRef);
@@ -1111,7 +1107,7 @@ private static void addDependencyAssocations(
                         }
                         // might as well capture the current value
                         String versionEvaluated = (String) expressionEvaluator.evaluate(dependency.getVersion());
-                        property.addAssociation(
+                        property.withAssociation(
                                 helper.createDependencyArtifact(
                                         groupId,
                                         artifactId,
@@ -1138,15 +1134,15 @@ private static void addBounds(PropertyVersionsBuilder builder, String rawVersion
             boolean includeLower = "[".equals(m.group(1));
             String lowerLimit = m.group(2);
             if (StringUtils.isNotEmpty(lowerLimit)) {
-                builder.addLowerBound(lowerLimit, includeLower);
+                builder.withLowerBound(lowerLimit, includeLower);
             }
         }
         m = upperBound.matcher(rawVersionRange);
         if (m.find()) {
             boolean includeUpper = "[".equals(m.group(3));
             String upperLimit = m.group(2);
             if (StringUtils.isNotEmpty(upperLimit)) {
-                builder.addUpperBound(upperLimit, includeUpper);
+                builder.withUpperBound(upperLimit, includeUpper);
             }
         }
     }

versions-common/src/main/java/org/codehaus/mojo/versions/api/PropertyVersions.java

@@ -1,22 +1,18 @@
 package org.codehaus.mojo.versions.api;
 
 /*
- * 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
+ * Copyright MojoHaus and Contributors
+ * Licensed 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
+ *    https://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.
+ * 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.ArrayList;
@@ -320,7 +316,7 @@ public ArtifactVersion getNewestVersion(
                 ? null
                 : upperBoundSegment
                         .map(s -> (ArtifactVersion) new BoundArtifactVersion(
-                                currentVersion, s.isMajorTo(SUBINCREMENTAL) ? Segment.of(s.value() + 1) : s))
+                                currentVersion, s.isMajorTo(SUBINCREMENTAL) ? Segment.minorTo(s) : s))
                         .orElse(null);
         if (helper.getLog().isDebugEnabled()) {
             helper.getLog().debug("Property ${" + property.getName() + "}: upperBound is: " + upperBound);