Merge branch 'master' into nextnext

* master: (497 commits)
  Prepare 7.3.0-SNAPSHOT builds
  Prepare 7.2.1-SNAPSHOT builds
  JGit v7.2.0.202503040940-r
  JGit v7.2.0.202503040805-r
  CacheRegion: fix non translatable text warnings
  Ensure access to autoRefresh is thread-safe
  FileReftableStack: use FileSnapshot to detect modification
  FileReftableDatabase: consider ref updates by another process
  BlameRegionMerger: report invalid regions with checked exception.
  Prepare 7.2.0-SNAPSHOT builds
  [ssh known_hosts] Handle unknown keys better
  [releng] Remove unused target platform definitions
  JGit v7.2.0.202502261823-rc1
  [ssh known_hosts] Handle host certificates
  [ssh known_hosts] Improve updating modified keys
  [ssh known_hosts] Add tests and fix problems
  [ssh, releng] Remove net.i2p.crypto.eddsa
  AddCommand: Use parenthesis to make the operator precedence explicit
  AddCommand: implement --all/--no-all
  Do not load bitmap indexes during directory scans
  ...

Change-Id: I619c89071f5f7a05bcd0218840f7f47bd19b779d

1 files changed, 1 insertions, 19 deletions

diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java
index 75d500ef20..a13a60c2b8 100644
--- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java
+++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java
@@ -41,24 +41,6 @@ public abstract class AnyLongObjectId implements Comparable<AnyLongObjectId> {
 	 * @param secondObjectId
 	 *            the second identifier to compare. Must not be null.
 	 * @return true if the two identifiers are the same.
-	 * @deprecated use {@link #isEqual(AnyLongObjectId, AnyLongObjectId)}
-	 *             instead.
-	 */
-	@Deprecated
-	@SuppressWarnings("AmbiguousMethodReference")
-	public static boolean equals(final AnyLongObjectId firstObjectId,
-			final AnyLongObjectId secondObjectId) {
-		return isEqual(firstObjectId, secondObjectId);
-	}
-
-	/**
-	 * Compare two object identifier byte sequences for equality.
-	 *
-	 * @param firstObjectId
-	 *            the first identifier to compare. Must not be null.
-	 * @param secondObjectId
-	 *            the second identifier to compare. Must not be null.
-	 * @return true if the two identifiers are the same.
 	 * @since 5.4
 	 */
 	public static boolean isEqual(final AnyLongObjectId firstObjectId,
@@ -263,7 +245,7 @@ public abstract class AnyLongObjectId implements Comparable<AnyLongObjectId> {
 	 */
 	@SuppressWarnings({ "NonOverridingEquals", "AmbiguousMethodReference" })
 	public final boolean equals(AnyLongObjectId other) {
-		return other != null ? equals(this, other) : false;
+		return other != null ? isEqual(this, other) : false;
 	}
 
 	@Override