From f2bfa3e6bedd6b8cbe0a7143b397dcff2d4d2081 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 4 May 2024 16:56:42 -0300 Subject: [PATCH 01/17] build(logback): Update dependency set versions without vulnerabilities --- rollbar-logback/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rollbar-logback/build.gradle b/rollbar-logback/build.gradle index e0ba92d2..fcbf37a2 100644 --- a/rollbar-logback/build.gradle +++ b/rollbar-logback/build.gradle @@ -1,6 +1,6 @@ dependencies { api project(':rollbar-java') - api group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' - api group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3' -} \ No newline at end of file + api group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.0' + api group: 'ch.qos.logback', name: 'logback-core', version: '1.5.0' +} From ddc8d0fd65c4f39081c4dc41d23356fd70281650 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 10 May 2024 20:26:55 -0300 Subject: [PATCH 02/17] logging --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fd5b607..4192e4be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,6 +58,7 @@ jobs: ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version + echo crb java: ${{ matrix.java }} echo JAVA_HOME: ${JAVA_HOME} java -version javac -version From 6dc5bb5c53662545cc98890d6ae253193c7f5cd9 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 10 May 2024 20:32:29 -0300 Subject: [PATCH 03/17] Revert "logging" This reverts commit ddc8d0fd65c4f39081c4dc41d23356fd70281650. --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4192e4be..6fd5b607 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,6 @@ jobs: ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version - echo crb java: ${{ matrix.java }} echo JAVA_HOME: ${JAVA_HOME} java -version javac -version From 58b6a3ce8b7d8e8fc9494a1ce25ecc51b7441a73 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 10 May 2024 20:55:07 -0300 Subject: [PATCH 04/17] remove jdk7, add logs --- .github/workflows/ci.yml | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fd5b607..40650a1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,17 +18,6 @@ jobs: - name: Fetch git tags run: ./.github/fetch_to_tag.sh - # Our build uses JDK7's rt.jar to make sure the artifact is fully - # compatible with Java 7, so we let this action set Java 7 up for us - # and we store its JAVA_HOME - - name: Set up Java 7 - uses: actions/setup-java@v1 - with: - java-version: 7 - - - name: Capture JDK7_HOME - run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home - - name: Set up Java 17 (needed for Spring Boot 3) uses: actions/setup-java@v1 with: @@ -58,15 +47,16 @@ jobs: ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version - echo JAVA_HOME: ${JAVA_HOME} + echo CRB JDK7:$JDK7_HOME + echo JAVA_HOME: $JAVA_HOME java -version javac -version - name: Build - run: 'source ~/.jdk7_home && ./gradlew clean build' + run: './gradlew clean build' - name: Check - run: 'source ~/.jdk7_home && ./gradlew clean check' + run: './gradlew clean check' - name: Cleanup Gradle cache # Recommended by https://docs.github.com/en/actions/guides/building-and-testing-java-with-gradle @@ -84,14 +74,6 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Java 7 - uses: actions/setup-java@v1 - with: - java-version: 7 - - - name: Capture JDK7_HOME - run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home - - name: Set up Java 8 uses: actions/setup-java@v1 with: @@ -121,7 +103,6 @@ jobs: if test "$GITHUB_REPOSITORY" = "rollbar/rollbar-java" -a "$GITHUB_BASE_REF" = ""; then openssl enc -aes-256-cbc -K "$SECRING_GPG_KEY" -iv "$SECRING_GPG_IV" -in "$ENCRYPTED_GPG_KEY_LOCATION" -out "$GPG_KEY_LOCATION" -d fi && - source ~/.jdk7_home && ./.github/release.sh - name: Cleanup Gradle cache From dbe87bf37244c0e158f2416560ac01ef0704cbcd Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 10 May 2024 20:58:16 -0300 Subject: [PATCH 05/17] Use update sdkmanager location --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40650a1c..db47f763 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: run: | ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version echo CRB JDK7:$JDK7_HOME echo JAVA_HOME: $JAVA_HOME java -version From df7ed35fb18b6e1fce39fdeebd9059984c3b01c0 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 10 May 2024 22:46:34 -0300 Subject: [PATCH 06/17] Revert "Use update sdkmanager location" This reverts commit dbe87bf37244c0e158f2416560ac01ef0704cbcd. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db47f763..40650a1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: run: | ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version + ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version echo CRB JDK7:$JDK7_HOME echo JAVA_HOME: $JAVA_HOME java -version From 192ce8adf60b2f74434eae615d3d41c29ec9a35e Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 10 May 2024 22:46:38 -0300 Subject: [PATCH 07/17] Revert "remove jdk7, add logs" This reverts commit 58b6a3ce8b7d8e8fc9494a1ce25ecc51b7441a73. --- .github/workflows/ci.yml | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40650a1c..6fd5b607 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,17 @@ jobs: - name: Fetch git tags run: ./.github/fetch_to_tag.sh + # Our build uses JDK7's rt.jar to make sure the artifact is fully + # compatible with Java 7, so we let this action set Java 7 up for us + # and we store its JAVA_HOME + - name: Set up Java 7 + uses: actions/setup-java@v1 + with: + java-version: 7 + + - name: Capture JDK7_HOME + run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home + - name: Set up Java 17 (needed for Spring Boot 3) uses: actions/setup-java@v1 with: @@ -47,16 +58,15 @@ jobs: ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version - echo CRB JDK7:$JDK7_HOME - echo JAVA_HOME: $JAVA_HOME + echo JAVA_HOME: ${JAVA_HOME} java -version javac -version - name: Build - run: './gradlew clean build' + run: 'source ~/.jdk7_home && ./gradlew clean build' - name: Check - run: './gradlew clean check' + run: 'source ~/.jdk7_home && ./gradlew clean check' - name: Cleanup Gradle cache # Recommended by https://docs.github.com/en/actions/guides/building-and-testing-java-with-gradle @@ -74,6 +84,14 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set up Java 7 + uses: actions/setup-java@v1 + with: + java-version: 7 + + - name: Capture JDK7_HOME + run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home + - name: Set up Java 8 uses: actions/setup-java@v1 with: @@ -103,6 +121,7 @@ jobs: if test "$GITHUB_REPOSITORY" = "rollbar/rollbar-java" -a "$GITHUB_BASE_REF" = ""; then openssl enc -aes-256-cbc -K "$SECRING_GPG_KEY" -iv "$SECRING_GPG_IV" -in "$ENCRYPTED_GPG_KEY_LOCATION" -out "$GPG_KEY_LOCATION" -d fi && + source ~/.jdk7_home && ./.github/release.sh - name: Cleanup Gradle cache From 9a038c236cb74e026cd0047c578e09a3174eae92 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 10 May 2024 22:46:45 -0300 Subject: [PATCH 08/17] Revert "build(logback): Update dependency" This reverts commit f2bfa3e6bedd6b8cbe0a7143b397dcff2d4d2081. --- rollbar-logback/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rollbar-logback/build.gradle b/rollbar-logback/build.gradle index fcbf37a2..e0ba92d2 100644 --- a/rollbar-logback/build.gradle +++ b/rollbar-logback/build.gradle @@ -1,6 +1,6 @@ dependencies { api project(':rollbar-java') - api group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.0' - api group: 'ch.qos.logback', name: 'logback-core', version: '1.5.0' -} + api group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' + api group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3' +} \ No newline at end of file From f6e12034598095209ab0f816ef5f1318d236ecb5 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 10 May 2024 22:47:47 -0300 Subject: [PATCH 09/17] Use update sdkmanager location --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fd5b607..c04ee671 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: run: | ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version echo JAVA_HOME: ${JAVA_HOME} java -version javac -version From 994a4e4d2264dbccf1f775cfe1b40ce427509ae7 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 11 May 2024 11:31:38 -0300 Subject: [PATCH 10/17] logs --- .github/workflows/ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c04ee671..b9bbbd6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,6 +57,18 @@ jobs: run: | ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} + echo CRB SDK ROOT + ls -a ${ANDROID_SDK_ROOT} + echo CRB tools + ls -a ${ANDROID_SDK_ROOT}/tools + echo CRB tools bin + ls -la ${ANDROID_SDK_ROOT}/tools/bin + echo CRB cmdline-tools + ls -la ${ANDROID_SDK_ROOT}/cmdline-tools + echo CRB cmdline-tools latest + ls -la ${ANDROID_SDK_ROOT}/cmdline-tools/latest + echo CRB cmdline-tools bin + ls -la ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version echo JAVA_HOME: ${JAVA_HOME} java -version From abd502cc5f50973980e2e601c89e1964bbd84236 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 11 May 2024 11:34:39 -0300 Subject: [PATCH 11/17] logs --- .github/workflows/ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9bbbd6e..acaf3591 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,11 +58,9 @@ jobs: ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} echo CRB SDK ROOT - ls -a ${ANDROID_SDK_ROOT} - echo CRB tools - ls -a ${ANDROID_SDK_ROOT}/tools - echo CRB tools bin - ls -la ${ANDROID_SDK_ROOT}/tools/bin + ls -la ${ANDROID_SDK_ROOT} + echo CRB build-tools + ls -la ${ANDROID_SDK_ROOT}/build-tools echo CRB cmdline-tools ls -la ${ANDROID_SDK_ROOT}/cmdline-tools echo CRB cmdline-tools latest From 63cfaf00149f601cc6f6d80f4b7b5ad00303f986 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 11 May 2024 12:04:19 -0300 Subject: [PATCH 12/17] logs, install sdk manager 2.0 --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index acaf3591..98fef182 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,16 +57,18 @@ jobs: run: | ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - echo CRB SDK ROOT - ls -la ${ANDROID_SDK_ROOT} + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "cmdline-tools;2.0" echo CRB build-tools - ls -la ${ANDROID_SDK_ROOT}/build-tools + ls -la ${ANDROID_SDK_ROOT}/build-tools + echo CRB build-tools 31.0.0 + ls -la ${ANDROID_SDK_ROOT}/build-tools/31.0.0 echo CRB cmdline-tools ls -la ${ANDROID_SDK_ROOT}/cmdline-tools echo CRB cmdline-tools latest ls -la ${ANDROID_SDK_ROOT}/cmdline-tools/latest echo CRB cmdline-tools bin ls -la ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin + echo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version echo JAVA_HOME: ${JAVA_HOME} java -version From e3905db96c56e216e575bfa6df1fe9cfb5e3dfe4 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 11 May 2024 12:07:22 -0300 Subject: [PATCH 13/17] install sdk manager 2.0 after logs --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98fef182..42146722 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,11 +57,11 @@ jobs: run: | ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "cmdline-tools;2.0" echo CRB build-tools ls -la ${ANDROID_SDK_ROOT}/build-tools echo CRB build-tools 31.0.0 ls -la ${ANDROID_SDK_ROOT}/build-tools/31.0.0 + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "cmdline-tools;2.0" echo CRB cmdline-tools ls -la ${ANDROID_SDK_ROOT}/cmdline-tools echo CRB cmdline-tools latest From 2b2b0167ea17189a0354f8402a9589cc17e16e71 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 11 May 2024 12:22:08 -0300 Subject: [PATCH 14/17] logs --- .github/workflows/ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42146722..3a4c1cd2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,15 +61,8 @@ jobs: ls -la ${ANDROID_SDK_ROOT}/build-tools echo CRB build-tools 31.0.0 ls -la ${ANDROID_SDK_ROOT}/build-tools/31.0.0 - ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "cmdline-tools;2.0" - echo CRB cmdline-tools - ls -la ${ANDROID_SDK_ROOT}/cmdline-tools - echo CRB cmdline-tools latest - ls -la ${ANDROID_SDK_ROOT}/cmdline-tools/latest - echo CRB cmdline-tools bin - ls -la ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin + echo crb echo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version - ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version echo JAVA_HOME: ${JAVA_HOME} java -version javac -version From ce313277d25bf038d41138517172455c0ebc0b6d Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 11 May 2024 12:36:14 -0300 Subject: [PATCH 15/17] remove logs --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a4c1cd2..f7f633fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,12 +57,6 @@ jobs: run: | ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - echo CRB build-tools - ls -la ${ANDROID_SDK_ROOT}/build-tools - echo CRB build-tools 31.0.0 - ls -la ${ANDROID_SDK_ROOT}/build-tools/31.0.0 - echo crb - echo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version echo JAVA_HOME: ${JAVA_HOME} java -version javac -version From 2296344fec8990383d27a9e812e5a97a71522094 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 11 May 2024 12:37:14 -0300 Subject: [PATCH 16/17] build(logback): Update dependency --- rollbar-logback/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rollbar-logback/build.gradle b/rollbar-logback/build.gradle index e0ba92d2..fcbf37a2 100644 --- a/rollbar-logback/build.gradle +++ b/rollbar-logback/build.gradle @@ -1,6 +1,6 @@ dependencies { api project(':rollbar-java') - api group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' - api group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3' -} \ No newline at end of file + api group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.0' + api group: 'ch.qos.logback', name: 'logback-core', version: '1.5.0' +} From 034259c69ba9fe400563b55e6f5bab2b66748fdf Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 11 May 2024 13:05:24 -0300 Subject: [PATCH 17/17] build(logback): downgrade to 1.3.14 --- rollbar-logback/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rollbar-logback/build.gradle b/rollbar-logback/build.gradle index fcbf37a2..e0a9b24c 100644 --- a/rollbar-logback/build.gradle +++ b/rollbar-logback/build.gradle @@ -1,6 +1,6 @@ dependencies { api project(':rollbar-java') - api group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.0' - api group: 'ch.qos.logback', name: 'logback-core', version: '1.5.0' + api group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.14' + api group: 'ch.qos.logback', name: 'logback-core', version: '1.3.14' }