From ef3375fefb072022a9106986e1fc02f77900f7e3 Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Mon, 7 Oct 2024 13:23:18 -0400 Subject: [PATCH 1/4] NH-86008: add codeql.yml and SECURITY.md --- .github/workflows/codeql.yml | 72 ++++++++++++++++++++++++++++++++++++ CODEOWNERS | 2 +- SECURITY.md | 26 +++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/codeql.yml create mode 100644 SECURITY.md diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 00000000..0b23adc7 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,72 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ "main" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "main" ] + schedule: + - cron: '0 7 * * 1' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'java' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Use only 'java' to analyze code written in Java, Kotlin or both + # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + queries: +security-extended,security-and-quality + + # Autobuild fails so use custom build steps + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '8.0.302' + distribution: 'temurin' + + - name: Run maven package + run: mvn -s .github/m2/settings.xml clean package + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" diff --git a/CODEOWNERS b/CODEOWNERS index 8187239f..c1a06a24 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @solarwinds-cloud/eng-apm-instrumentation +* @solarwinds/eng-pub-apm-instrumentation \ No newline at end of file diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..76397249 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,26 @@ +# Security Policy + +## Security at SolarWinds + +SolarWinds is committed to taking our customers security and privacy concerns seriously and makes it a priority. We strive to implement and maintain security processes, procedures, standards, and take all reasonable care to prevent unauthorized access to our customer data. We apply appropriate administrative, operational, and technical security controls to help ensure that our customer data is handled and processed in a responsible and secure manner. + +Our security strategy covers all aspects of our business, including: + +* Corporate security policies +* Organizational security +* Physical and environmental security +* Operational security processes and procedures +* Incident management and response +* Business continuity and disaster recovery +* Data protection + +## Security Documents +[Security Statement](https://www.solarwinds.com/security/security-statement) + +[Vendor Data Protection Requirements](https://www.solarwinds.com/security/vendor-data-protection-requirements) + +## Vulnerability Disclosure Policy +[SolarWinds Vulnerability Disclosure Policy](https://www.solarwinds.com/information-security/vulnerability-disclosure-policy) + +## Want to report a security concern? +SolarWinds reviews all reports of security vulnerabilities submitted to it affecting SolarWinds products and services. To report a vulnerability in one of our products or solutions or a vulnerability in one of our corporate websites, please contact our Product Security Incident Response Team (PSIRT) at [psirt@solarwinds.com](mailto:psirt@solarwinds.com). From 3876b517a953541aac9760bd6d663fe6e93ee4a2 Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Mon, 7 Oct 2024 15:40:18 -0400 Subject: [PATCH 2/4] NH-86008: add LICENSE --- LICENSE | 256 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 256 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..05c91c73 --- /dev/null +++ b/LICENSE @@ -0,0 +1,256 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2020 SolarWinds Worldwide, LLC. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License 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. + +VENDORED LIBRARIES + +* This software includes portions of ebson from https://github.com/kohanyirobert/ebson + under the following license: + + Copyright (C) 2011-2012 by Kohányi Róbert + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +* This software includes portions of HdrHistogram from https://github.com/HdrHistogram/HdrHistogram + under the following BSD license: + + Copyright (c) 2012, 2013, 2014, 2015, 2016 Gil Tene + Copyright (c) 2014 Michael Barker + Copyright (c) 2014 Matt Warren + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file From 24c809dc0239c46b04e257dcc3880e88242f17ff Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Tue, 8 Oct 2024 10:05:52 -0400 Subject: [PATCH 3/4] 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/** From 2c3588db3c3d26153e768f999aa074dc43bb5dd2 Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Tue, 15 Oct 2024 16:08:55 -0400 Subject: [PATCH 4/4] NH-93750: bump deps --- core/pom.xml | 6 +++--- pom.xml | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 03c1369d..d98517d7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -14,7 +14,7 @@ core https://maven.apache.org - 1.59.0 + 1.68.0 @@ -83,9 +83,9 @@ 4.12.0 - cloud.solarwindscloud + com.solarwinds apm-proto - 1.0.1 + 1.0.8 guava diff --git a/pom.xml b/pom.xml index ba73a7e4..c7b9a135 100644 --- a/pom.xml +++ b/pom.xml @@ -10,11 +10,8 @@ joboe - 10.0.12-SNAPSHOT - 1.0.0 + 10.0.13-SNAPSHOT UTF-8 - https://oss.sonatype.org/service/local/staging/deploy/maven2 - sonatype_staging ${git.commit.time} @@ -24,6 +21,7 @@ org.apache.maven.plugins maven-deploy-plugin + 3.1.3 false