From 24c809dc0239c46b04e257dcc3880e88242f17ff Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Tue, 8 Oct 2024 10:05:52 -0400 Subject: [PATCH] NH-86008: code sweep :broom: --- .github/workflows/maven.yml | 8 --- .whitesource | 15 ----- README.md | 10 +-- core/.classpath | 8 --- core/.project | 23 ------- .../org.eclipse.core.resources.prefs | 5 -- core/.settings/org.eclipse.jdt.core.prefs | 13 ---- core/.settings/org.eclipse.m2e.core.prefs | 4 -- scripts/sign-jars.sh | 67 ------------------- setup/env.sh | 7 -- whitesource.config | 1 - 11 files changed, 1 insertion(+), 160 deletions(-) delete mode 100644 .whitesource delete mode 100644 core/.classpath delete mode 100644 core/.project delete mode 100644 core/.settings/org.eclipse.core.resources.prefs delete mode 100644 core/.settings/org.eclipse.jdt.core.prefs delete mode 100644 core/.settings/org.eclipse.m2e.core.prefs delete mode 100755 scripts/sign-jars.sh delete mode 100644 setup/env.sh delete mode 100644 whitesource.config diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 46f43997..57dff302 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,11 +1,3 @@ -# This workflow does the following things: -# 1. build and test the core Joboe libs (core, metrics, config, logging and sampling) -# 2. publish the jars to Github Packages (which can be used by the NightHawk agent at https://github.com/appoptics/opentelemetry-java-instrumentation-custom-distro) -# 3. make a **draft** release on Github and upload the jars as artifacts (you may need to publish the release manually after it) - -# The workflow needs to be triggered manually. (go to the Actions tab in the repo page, choose the workflow and click `Run Workflow`) -# The draft release will be named based on the `revision` property in the pom file. For example, if the pom revision is 7.0.4, the release -# will be named as "v7.0.4" name: Release on: diff --git a/.whitesource b/.whitesource deleted file mode 100644 index dd20d221..00000000 --- a/.whitesource +++ /dev/null @@ -1,15 +0,0 @@ -{ - "scanSettings": { - "configMode": "LOCAL", - "configExternalURL": "", - "projectToken": "", - "baseBranches": [] - }, - "checkRunSettings": { - "vulnerableCheckRunConclusionLevel": "failure", - "displayMode": "diff" - }, - "issueSettings": { - "minSeverityLevel": "LOW" - } -} diff --git a/README.md b/README.md index 4e4db0b0..64a17c3f 100644 --- a/README.md +++ b/README.md @@ -10,12 +10,4 @@ Java Oboe * Java JDK 8 http://www.oracle.com/technetwork/java/javase/downloads/index.html -* Recommended: IntelliJ IDE: http://www.jetbrains.com/idea/download/index.html - -# Dependencies: - -* See 'dependencies' maven module. We want all 3rd party dependencies to be under the com.solarwinds namespace to avoid version conflicts. - -# Install instructions: - -* https://docs.appoptics.com/kb/apm_tracing/java/install/ +* Recommended: IntelliJ IDE: http://www.jetbrains.com/idea/download/index.html \ No newline at end of file diff --git a/core/.classpath b/core/.classpath deleted file mode 100644 index 0ad72b8e..00000000 --- a/core/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/core/.project b/core/.project deleted file mode 100644 index 013acf48..00000000 --- a/core/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - core - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - diff --git a/core/.settings/org.eclipse.core.resources.prefs b/core/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 839d647e..00000000 --- a/core/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 5ce45188..00000000 --- a/core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/core/.settings/org.eclipse.m2e.core.prefs b/core/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index ff7698fe..00000000 --- a/core/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=false -version=1 diff --git a/scripts/sign-jars.sh b/scripts/sign-jars.sh deleted file mode 100755 index 640bddd0..00000000 --- a/scripts/sign-jars.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -#set -x - -# ENV VAR below are required to be set in the build environment. -#$SIGNPATH_USER_TOKEN - SignPath user token, this is the CI user created in SignPath -#$SIGNPATH_PROJECT - Project Slug settings from SignPath -#$SIGNPATH_POLICY - Policy Slug settings from SignPath -#$SIGNPATH_CONFIGURATION - Configuration Slug settings from SignPath -#$SIGNPATH_ORG - SignPath organization ID - -#$1 path of the file to be signed -response=$(curl -sSL -D - -o /dev/null -H "Authorization: Bearer $SIGNPATH_USER_TOKEN" \ - -F "ProjectSlug=$SIGNPATH_PROJECT" \ - -F "SigningPolicySlug=$SIGNPATH_POLICY" \ - -F "ArtifactConfigurationSlug=$SIGNPATH_CONFIGURATION" \ - -F "Artifact=@$1" \ - https://app.signpath.io/API/v1/$SIGNPATH_ORG/SigningRequests) - -http_status=$(echo "$response" | grep HTTP | awk '{print $2}') -location_header=$(echo "$response" | grep Location | awk '{print $2}' | tr -d '\r') - -echo "Going to ping request status at $location_header" - -if [[ $response == *"201"* ]]; then - json_status="" - json_response="" - while [[ "$json_status" != "Completed" && "$json_status" != "Failed" && "$json_status" != "Cancelled" && "$json_status" != "Denied" ]] - do - json_response=$(curl -sSL -H "Authorization: Bearer $SIGNPATH_USER_TOKEN" $location_header) - json_status=$(echo $json_response | jq .status | tr -d '"') - sleep 5 - echo json status $json_status - done - - if [[ $json_status == "Completed" ]]; then - mv $1 "$1.unsigned" - json_signed_artifact_link=$(echo $json_response | jq .signedArtifactLink | tr -d '"') - echo Signed artifact link $json_signed_artifact_link - echo Downloading signed file to $1 - - download_return_code=0 - download_status_code=$(curl -s -o $1 -w "%{http_code}" -H "Authorization: Bearer $SIGNPATH_USER_TOKEN" $json_signed_artifact_link) || download_return_code=$? - if [[ $download_return_code != 0 ]]; then - echo "Curl connection failed with return code - $download_return_code" - exit 3 - else - if [[ "$download_status_code" != 200 ]]; then - echo "Curl operation/command failed due to server return code - $download_status_code" - exit 4 - else - echo "Curl success with status code $download_status_code" - fi - fi - - - else - echo Failed with json status $json_status - exit 2 - fi - -else - echo Invalid Status code $http_status - exit 1 -fi - - diff --git a/setup/env.sh b/setup/env.sh deleted file mode 100644 index 17983f95..00000000 --- a/setup/env.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Example environment: - -echo "setting java environment." - -export MAVEN_HOME=/usr/local/apache-maven-3.0.4 -export PATH=$PATH:$MAVEN_HOME/bin - diff --git a/whitesource.config b/whitesource.config deleted file mode 100644 index 80049dc1..00000000 --- a/whitesource.config +++ /dev/null @@ -1 +0,0 @@ -excludes=**/test-apps/**