From 6d1ca3b7cf1b7a1285e8d3ec059b6340602ad320 Mon Sep 17 00:00:00 2001
From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
Date: Wed, 17 Jan 2024 15:19:59 +0100
Subject: [PATCH] have MavenTargetLocation.equals eventually return true

In the TargetPlatformPreferencePage, upon the Apply button, some target
definition containing some MavenTargetLocation always was rewritten to
it's .target file. This was because MavenTargetLocation.equals never
returned true for multiple reasons, starting with MavenTargetDependency
lacking an impl of equals().
Using serialize(), we can be sure to perform the equals check on any
relevant attribute, including deeply nested ones.
---
 org.eclipse.m2e.pde.feature/feature.xml                      | 2 +-
 org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF              | 2 +-
 .../src/org/eclipse/m2e/pde/target/MavenTargetLocation.java  | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/org.eclipse.m2e.pde.feature/feature.xml b/org.eclipse.m2e.pde.feature/feature.xml
index 1bdce79a74..1b400d6e98 100644
--- a/org.eclipse.m2e.pde.feature/feature.xml
+++ b/org.eclipse.m2e.pde.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.m2e.pde.feature"
       label="%featureName"
-      version="2.3.0.qualifier"
+      version="2.3.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.m2e.core"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF
index ddbfc7e92a..602ac21f2b 100644
--- a/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: M2E PDE Integration
 Bundle-SymbolicName: org.eclipse.m2e.pde.target;singleton:=true
-Bundle-Version: 2.0.500.qualifier
+Bundle-Version: 2.0.501.qualifier
 Automatic-Module-Name: org.eclipse.m2e.pde.target
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.27.0,4.0.0)",
diff --git a/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocation.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocation.java
index 9f27a4e8e1..e127f11ff0 100644
--- a/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocation.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocation.java
@@ -523,9 +523,8 @@ public boolean equals(Object obj) {
 			return true;
 		}
 		return obj instanceof MavenTargetLocation other //
-				&& Objects.equals(roots, other.roots)//
-				&& Objects.equals(dependencyScopes, other.dependencyScopes)
-				&& Objects.equals(failedArtifacts, other.failedArtifacts);
+				// check each and every relevant attribute, including nested ones
+				&& serialize().equals(other.serialize());
 	}
 
 	public boolean isIncludeSource() {