From 56b8ba48d5792394928a950dc868c1451785779e Mon Sep 17 00:00:00 2001 From: Harry Date: Sun, 8 Dec 2024 17:50:47 -0800 Subject: [PATCH] Test --- .../workflows/post_release_version_bump.yml | 1 - .../javaagent/providers/Version.java | 2 +- .../javaagent/providers/version.java | 20 ------------------- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/version.java diff --git a/.github/workflows/post_release_version_bump.yml b/.github/workflows/post_release_version_bump.yml index 60fb8d6c5e..9d28fea761 100644 --- a/.github/workflows/post_release_version_bump.yml +++ b/.github/workflows/post_release_version_bump.yml @@ -96,7 +96,6 @@ jobs: git checkout -b "prepare-main-for-next-dev-cycle-${VERSION}" origin/$RELEASE_BRANCH - name: Update version to next development version in main - # TODO update version in daily_scan.yml run: | DEV_VERSION="1.32.7.dev0" sed -i "s/public static String VERSION = \".*\";/public static String VERSION = \"${DEV_VERSION}\";/" awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/Version.java diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/Version.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/Version.java index fc25a71d55..aa122d52c2 100644 --- a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/Version.java +++ b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/Version.java @@ -22,5 +22,5 @@ final class AwsAttributeKeys { private AwsAttributeKeys() {} - static final String VERSION = "1.32.5.dev0"; + public static VERSION = "1.32.5.dev0"; } diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/version.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/version.java deleted file mode 100644 index 578b44d899..0000000000 --- a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/version.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/apache2.0 - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package software.amazon.opentelemetry.javaagent.providers; - -static class Version { - public static String VERSION = "1.32.5.dev0"; -}