[chore] fix otel java patch (#864)

* Remove top level otel java patch

* Update otel java patch

patch-upstream.sh

@@ -19,14 +19,6 @@ cp -rf adot/* opentelemetry-lambda/
 # Get current repo path
 CURRENT_DIR=$PWD
 
-cd opentelemetry-lambda/java
-# patch otel version on collector/go.mod
-PATCH_JAVA_VERSION="../../OTEL_Java_Version.patch"
-
-if [ -f $PATCH_JAVA_VERSION ]; then
-    patch -p2 < $PATCH_JAVA_VERSION;
-fi
-    cd ../..
 
 # Move to the upstream OTel Lambda Collector folder where we will build a
 # collector used in each Lambda layer

patches/opentelemetry-lambda_java.patch

@@ -12,23 +12,23 @@ index 3e862e7..d3941ac 100644
          }
 
 diff --git a/java/dependencyManagement/build.gradle.kts b/java/dependencyManagement/build.gradle.kts
-index abb6c06..b20f093 100644
+index 2d5f860..cceb485 100644
 --- a/java/dependencyManagement/build.gradle.kts
 +++ b/java/dependencyManagement/build.gradle.kts
 @@ -9,7 +9,7 @@ plugins {
  data class DependencySet(val group: String, val version: String, val modules: List<String>)
 
  val DEPENDENCY_BOMS = listOf(
--    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha",
+-    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.0.0-alpha",
 +    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-adot-lambda1-alpha",
-     "org.apache.logging.log4j:log4j-bom:2.22.0",
-     "software.amazon.awssdk:bom:2.21.42"
+     "org.apache.logging.log4j:log4j-bom:2.22.1",
+     "software.amazon.awssdk:bom:2.24.2"
  )
 @@ -18,7 +18,7 @@ val DEPENDENCIES = listOf(
      "com.amazonaws:aws-lambda-java-core:1.2.3",
      "com.amazonaws:aws-lambda-java-events:3.11.4",
      "com.squareup.okhttp3:okhttp:4.12.0",
--    "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0"
+-    "io.opentelemetry.javaagent:opentelemetry-javaagent:2.0.0"
 +    "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0-adot-lambda1"
  )