Merge remote-tracking branch 'origin/main' into delta-xds-non-breaking-slonka-hash-bytes

# Conflicts:
#	server/src/main/java/io/envoyproxy/controlplane/server/V2DiscoveryServer.java

Author: Ferdudas97

cache/src/main/java/io/envoyproxy/controlplane/cache/v2/SimpleCache.java

@@ -2,6 +2,7 @@
 
 import io.envoyproxy.controlplane.cache.NodeGroup;
 
+@Deprecated
 public class SimpleCache<T> extends io.envoyproxy.controlplane.cache.SimpleCache<T, Snapshot> {
   public SimpleCache(NodeGroup<T> nodeGroup) {
     super(nodeGroup);

cache/src/main/java/io/envoyproxy/controlplane/cache/v2/Snapshot.java

@@ -26,6 +26,7 @@
  * {@code Snapshot} is a data class that contains an internally consistent snapshot of v2 xDS
  * resources. Snapshots should have distinct versions per node group.
  */
+@Deprecated
 @AutoValue
 public abstract class Snapshot extends io.envoyproxy.controlplane.cache.Snapshot {
 

server/src/main/java/io/envoyproxy/controlplane/server/V2DiscoveryServer.java

@@ -24,6 +24,7 @@
 import java.util.Collections;
 import java.util.List;
 
+@Deprecated
 public class V2DiscoveryServer extends DiscoveryServer<DiscoveryRequest, DiscoveryResponse, DeltaDiscoveryRequest,
     DeltaDiscoveryResponse, Resource> {