You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2025/03/26 19:42:17 UTC
(maven) branch mismatch created (now 63e3d45077)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch mismatch
in repository https://gitbox.apache.org/repos/asf/maven.git
at 63e3d45077 remove some unnecessary statements
This branch includes the following new commits:
new 63e3d45077 remove some unnecessary statements
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven) 01/01: remove some unnecessary statements
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch mismatch
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 63e3d4507762cbec270683741890874b42236825
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Wed Mar 26 15:42:08 2025 -0400
remove some unnecessary statements
---
.../apache/maven/artifact/versioning/DefaultArtifactVersion.java | 2 +-
.../java/org/apache/maven/artifact/versioning/VersionRangeTest.java | 4 +---
.../org/apache/maven/repository/legacy/DefaultWagonManager.java | 6 ++----
.../src/main/java/org/apache/maven/cli/CleanArgument.java | 1 -
.../src/main/java/org/apache/maven/cling/invoker/CleanArgument.java | 1 -
.../main/java/org/apache/maven/impl/model/DefaultInterpolator.java | 3 +--
.../java/org/apache/maven/impl/model/DefaultInterpolatorTest.java | 2 --
7 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
index 12c37c2d7d..0ce0737740 100644
--- a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
+++ b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
@@ -144,7 +144,7 @@ public final void parseVersion(String version) {
}
}
if (idx < tok.length) {
- qualifier = tok[idx++];
+ qualifier = tok[idx];
fallback = isDigits(qualifier);
}
diff --git a/compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java b/compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
index 5327f7c2ef..426efcf537 100644
--- a/compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
+++ b/compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
@@ -715,9 +715,7 @@ void testContains() throws InvalidVersionSpecificationException {
public boolean enforceVersion(String requiredVersionRange, ArtifactVersion actualVersion)
throws InvalidVersionSpecificationException {
- VersionRange vr = null;
-
- vr = VersionRange.createFromVersionSpec(requiredVersionRange);
+ VersionRange vr = VersionRange.createFromVersionSpec(requiredVersionRange);
return vr.containsVersion(actualVersion);
}
diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index 4fa05c9b14..3073a41053 100644
--- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -343,10 +343,8 @@ public void getRemoteFile(
ChecksumObserver sha1ChecksumObserver = null;
try {
// TODO configure on repository
- int i = 0;
-
- md5ChecksumObserver = addChecksumObserver(wagon, CHECKSUM_ALGORITHMS[i++]);
- sha1ChecksumObserver = addChecksumObserver(wagon, CHECKSUM_ALGORITHMS[i++]);
+ md5ChecksumObserver = addChecksumObserver(wagon, "MD5");
+ sha1ChecksumObserver = addChecksumObserver(wagon, "SHA-1");
// reset the retry flag.
retry = false;
diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java
index 4c8d1e93c8..19837a1f11 100644
--- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java
+++ b/compat/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java
@@ -68,7 +68,6 @@ private static String[] doCleanArgs(String[] args) {
cleaned.add(currentArg.toString());
currentArg = null;
- addedToBuffer = false;
continue;
}
diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CleanArgument.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CleanArgument.java
index f32e71c3e0..ffe53a6ef0 100644
--- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CleanArgument.java
+++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CleanArgument.java
@@ -67,7 +67,6 @@ private static String[] doCleanArgs(String[] args) {
cleaned.add(currentArg.toString());
currentArg = null;
- addedToBuffer = false;
continue;
}
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java
index 29c4ac3245..59ae3a78b0 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java
@@ -294,7 +294,6 @@ private static String processSubstitution(
// Process chained operators from left to right
int startIdx = 0;
- String currentVar = variable;
String substValue = null;
while (startIdx < variable.length()) {
@@ -305,7 +304,7 @@ private static String processSubstitution(
if (idx < 0) {
// No more operators, process the final variable
if (substValue == null) {
- currentVar = variable.substring(startIdx);
+ String currentVar = variable.substring(startIdx);
substValue = resolveVariable(
currentVar, cycleMap, configProps, callback, postprocessor, defaultsToEmptyString);
}
diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java
index fd25e9ef83..867bd7decf 100644
--- a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java
+++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java
@@ -88,8 +88,6 @@ void testLoopEmpty() {
@Test
void testLoopEmpty2() {
- Map<String, String> map = new HashMap<>();
- map.put("a", "${a}");
assertEquals("${a}", substVars("${a}", null, null, null, false));
}