Attempt to fix the jdt formatter error#19199
Attempt to fix the jdt formatter error#19199cwperks merged 9 commits intoopensearch-project:mainfrom
Conversation
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
|
Adding @reta @cwperks @getsaurabh02 to please take a look. Thanks |
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
|
If this dint work we can explore https://download.eclipse.org/oomph/archive/mirror.php?location=eclipse/updates/4.29 |
|
❌ Gradle check result for 7561fe2: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
|
❌ Gradle check result for 7561fe2: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
|
❌ Gradle check result for 6a74ac5: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
gradle/formatting.gradle
Outdated
| ) | ||
|
|
||
| eclipse().withP2Mirrors(Map.of("https://download.eclipse.org/", "https://mirror.umd.edu/eclipse/")).configFile rootProject.file('buildSrc/formatterConfig.xml') | ||
| eclipse().withP2Mirrors(['https://download.eclipse.org/eclipse/updates/4.29/':'https://ftp.osuosl.org/pub/eclipse/eclipse/updates/4.29/']).configFile rootProject.file('buildSrc/formatterConfig.xml') |
There was a problem hiding this comment.
This can be?
| eclipse().withP2Mirrors(['https://download.eclipse.org/eclipse/updates/4.29/':'https://ftp.osuosl.org/pub/eclipse/eclipse/updates/4.29/']).configFile rootProject.file('buildSrc/formatterConfig.xml') | |
| eclipse().withP2Mirrors(Map.of("https://download.eclipse.org/eclipse/updates/4.29/", "https://ftp.osuosl.org/pub/eclipse/eclipse/updates/4.29/")).configFile rootProject.file('buildSrc/formatterConfig.xml') |
There was a problem hiding this comment.
Initially we use Map.of (#17172) which works, but just following the instructions in https://github.com/diffplug/spotless/blob/main/plugin-gradle/README.md#eclipse-jdt
There was a problem hiding this comment.
@prudhvigodithi Map worked too https://github.com/opensearch-project/neural-search/pull/1540/files.
Nvm, I see mirrors are completely removed
|
I believe this is not new issue [1], has been surfacing since spotless 7.0.0 release (if I am not mistaken), probably the best option is to downgrade spotless to 6.x |
|
❌ Gradle check result for 6a74ac5: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
|
❌ Gradle check result for 6a74ac5: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
|
I'm still seeing: |
|
@prudhvigodithi do we potentially need to add this to other branches? |
|
I'm thinking to completely remove |
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
Yes @cwperks we need to backport to the relevant branches , IMO we need to force merge and backport as the configured mirror is completely down https://mirror.umd.edu/eclipse/eclipse/updates/4.29. |
|
❌ Gradle check result for d7213a4: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
* Attempt to fix the jdt formatter error Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Fix the changelog Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.29 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Remove mirrors Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> --------- Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> (cherry picked from commit 4fc44d1) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Attempt to fix the jdt formatter error Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Fix the changelog Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.29 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Remove mirrors Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> --------- Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> (cherry picked from commit 4fc44d1) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Attempt to fix the jdt formatter error Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Fix the changelog Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.29 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Remove mirrors Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> --------- Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> (cherry picked from commit 4fc44d1) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.18 2.18
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.18
# Create a new branch
git switch --create backport/backport-19199-to-2.18
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4fc44d10caa18c9280cf5ad8377dc1f1cdfa4599
# Push it to GitHub
git push --set-upstream origin backport/backport-19199-to-2.18
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.18Then, create a pull request where the |
* Attempt to fix the jdt formatter error * Fix the changelog * Update to 4.36 * Update to 4.29 * Update to 4.36 * Update Syntax * Update Syntax * Update Syntax * Remove mirrors --------- (cherry picked from commit 4fc44d1) Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Attempt to fix the jdt formatter error * Fix the changelog * Update to 4.36 * Update to 4.29 * Update to 4.36 * Update Syntax * Update Syntax * Update Syntax * Remove mirrors --------- (cherry picked from commit 4fc44d1) Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Attempt to fix the jdt formatter error * Fix the changelog * Update to 4.36 * Update to 4.29 * Update to 4.36 * Update Syntax * Update Syntax * Update Syntax * Remove mirrors --------- (cherry picked from commit 4fc44d1) Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
|
#19199 (comment) we dont need to backport to 2.18 as I dont see the mirrors added to 2.18 https://github.com/opensearch-project/OpenSearch/blob/2.18/gradle/formatting.gradle#L85. |
* Attempt to fix the jdt formatter error Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Fix the changelog Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.29 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Remove mirrors Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> --------- Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
* Attempt to fix the jdt formatter error Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Fix the changelog Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.29 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Remove mirrors Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> --------- Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
* Attempt to fix the jdt formatter error Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Fix the changelog Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.29 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Remove mirrors Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> --------- Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: Ankit Jain <jainankitk@apache.org>
* Attempt to fix the jdt formatter error Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Fix the changelog Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.29 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Remove mirrors Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> --------- Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: Ankit Jain <jainankitk@apache.org>
* Attempt to fix the jdt formatter error Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Fix the changelog Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.29 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Remove mirrors Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> --------- Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
* Attempt to fix the jdt formatter error Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Fix the changelog Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.29 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update to 4.36 Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Update Syntax Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> * Remove mirrors Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> --------- Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
…ensearch-project#19217) * Attempt to fix the jdt formatter error * Fix the changelog * Update to 4.36 * Update to 4.29 * Update to 4.36 * Update Syntax * Update Syntax * Update Syntax * Remove mirrors --------- (cherry picked from commit 4fc44d1) Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Attempt to fix the jdt formatter error * Fix the changelog * Update to 4.36 * Update to 4.29 * Update to 4.36 * Update Syntax * Update Syntax * Update Syntax * Remove mirrors --------- (cherry picked from commit 4fc44d1) Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> (cherry picked from commit 859602f) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Attempt to fix the jdt formatter error * Fix the changelog * Update to 4.36 * Update to 4.29 * Update to 4.36 * Update Syntax * Update Syntax * Update Syntax * Remove mirrors --------- (cherry picked from commit 4fc44d1) (cherry picked from commit 859602f) Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Description
Seeing https://github.com/diffplug/spotless/blob/main/plugin-gradle/README.md#eclipse-jdt Attempt to fix the jdt formatter error which is seen failing on recent open PR's.
https://github.com/opensearch-project/OpenSearch/actions/runs/17335154878/job/49219860173?pr=19188
The issue started because the https://mirror.umd.edu/eclipse/eclipse/updates/4.29 mirror is not accessible.
Related Issues
Seeing on all open PR's #19188
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.