Replace Apache StringUtils with native Java methods

Co-authored-by: laeubi <[email protected]>

Author: Copilot

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenProperties.java

@@ -50,7 +50,6 @@
 
 import org.apache.maven.cli.CLIManager;
 import org.apache.maven.cli.MavenCli;
-import org.apache.maven.shared.utils.StringUtils;
 
 import org.eclipse.m2e.core.embedder.IMavenConfiguration;
 import org.eclipse.m2e.core.embedder.MavenSettingsLocations;
@@ -169,7 +168,7 @@ static String createMavenVersionString(Properties buildProperties) {
     if(rev != null || timestamp != null) {
       msg += " (";
       msg += (rev != null ? rev : "");
-      if(StringUtils.isNotBlank(timestamp)) {
+      if(timestamp != null && !timestamp.isBlank()) {
         String ts = formatTimestamp(Long.parseLong(timestamp));
         msg += (rev != null ? "; " : "") + ts;
       }

org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java

@@ -13,8 +13,6 @@
 
 package org.eclipse.m2e.jdt.internal;
 
-import static org.apache.maven.shared.utils.StringUtils.isEmpty;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -118,8 +116,8 @@ public void convert(IProject project, Model model, IProgressMonitor monitor) thr
     Map<String, String> options = javaProject.getOptions(true);
     String source = options.get(JavaCore.COMPILER_SOURCE);
     String target = options.get(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM);
-    boolean emptySource = isEmpty(source);
-    boolean emptyTarget = isEmpty(target);
+    boolean emptySource = source == null || source.isEmpty();
+    boolean emptyTarget = target == null || target.isEmpty();
 
     if(emptySource && emptyTarget) {
       return;

org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/internal/TargetDependencyModel.java

@@ -19,7 +19,6 @@
 import java.util.function.BiConsumer;
 import java.util.stream.Stream;
 
-import org.apache.maven.shared.utils.StringUtils;
 import org.eclipse.core.databinding.observable.sideeffect.ISideEffectFactory;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
@@ -266,7 +265,7 @@ public boolean canUpdate() {
 			downStream.accept(dependency.getVersion());
 		});
 
-		return allFields.noneMatch(StringUtils::isBlank) && !currentSelection.isEmpty();
+		return allFields.noneMatch(s -> s == null || s.isBlank()) && !currentSelection.isEmpty();
 	}
 
 	public boolean hasErrors() {
@@ -298,7 +297,7 @@ public void check() {
 			downStream.accept(dependency.getVersion());
 			downStream.accept(dependency.getType());
 		});
-		hasErrors.setValue(allFields.anyMatch(StringUtils::isBlank));
+		hasErrors.setValue(allFields.anyMatch(s -> s == null || s.isBlank()));
 	}
 
 	private static List<MavenTargetDependency> deepClone(List<MavenTargetDependency> dependencies) {

org.eclipse.m2e.profiles.core/src/org/eclipse/m2e/profiles/core/internal/management/ProfileManager.java

@@ -50,7 +50,6 @@
 import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.SettingsUtils;
-import org.apache.maven.shared.utils.StringUtils;
 
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.embedder.IMaven;
@@ -264,11 +263,9 @@ private Model buildParentModelViaRelativePath(Model model) {
       return null;
     }
 
-    String relativePath;
-    if(StringUtils.isEmpty(model.getParent().getRelativePath())) {
+    String relativePath = model.getParent().getRelativePath();
+    if(relativePath == null || relativePath.isEmpty()) {
       relativePath = ".." + File.separator + "pom.xml";
-    } else {
-      relativePath = model.getParent().getRelativePath();
     }
     String relativeFileSystemPathToParentPom = ".." + File.separator + relativePath;