Skip to content

Fix HDFS fixture by excluding BouncyCastle#8359

Merged
reta merged 1 commit intoopensearch-project:mainfrom
willyborankin:fix-hdfs-fixture
Jun 29, 2023
Merged

Fix HDFS fixture by excluding BouncyCastle#8359
reta merged 1 commit intoopensearch-project:mainfrom
willyborankin:fix-hdfs-fixture

Conversation

@willyborankin
Copy link
Contributor

@willyborankin willyborankin commented Jun 29, 2023

Description

Fix HDFS fixture by excluding BouncyCastle

Issues Resolved

After #8247 got merged, we found out that hdfs-fixture transitivity bring xxx-jdk15on artifacts nonetheless, excluding them:

org.bouncycastle:bcpkix-jdk15on:1.68
   variant "runtime" [
      org.gradle.status              = release (not requested)
      org.gradle.usage               = java-runtime
      org.gradle.libraryelements     = jar
      org.gradle.category            = library

      Requested attributes not found in the selected variant:
         org.gradle.dependency.bundling = external
         org.gradle.jvm.version         = 8
   ]

org.bouncycastle:bcpkix-jdk15on:1.68
\--- org.apache.hadoop:hadoop-yarn-server-web-proxy:3.3.5
     +--- org.apache.hadoop:hadoop-minicluster:3.3.5
     |    \--- runtimeClasspath
     +--- org.apache.hadoop:hadoop-mapreduce-client-app:3.3.5
     |    +--- org.apache.hadoop:hadoop-minicluster:3.3.5 (*)
     |    \--- org.apache.hadoop:hadoop-mapreduce-client-hs:3.3.5
     |         \--- org.apache.hadoop:hadoop-minicluster:3.3.5 (*)
     \--- org.apache.hadoop:hadoop-yarn-server-resourcemanager:3.3.5
          \--- org.apache.hadoop:hadoop-yarn-server-tests:3.3.5
               \--- org.apache.hadoop:hadoop-minicluster:3.3.5 (*)

org.bouncycastle:bcpkix-jdk15to18:1.75
   variant "runtime" [
      org.gradle.status              = release (not requested)
      org.gradle.usage               = java-runtime
      org.gradle.libraryelements     = jar
      org.gradle.category            = library

      Requested attributes not found in the selected variant:
         org.gradle.dependency.bundling = external
         org.gradle.jvm.version         = 8
   ]

org.bouncycastle:bcpkix-jdk15to18:1.75
\--- runtimeClasspath

org.bouncycastle:bcprov-jdk15on:1.68
   variant "runtime" [
      org.gradle.status              = release (not requested)
      org.gradle.usage               = java-runtime
      org.gradle.libraryelements     = jar
      org.gradle.category            = library

      Requested attributes not found in the selected variant:
         org.gradle.dependency.bundling = external
         org.gradle.jvm.version         = 8
   ]

org.bouncycastle:bcprov-jdk15on:1.68
+--- org.apache.hadoop:hadoop-yarn-server-web-proxy:3.3.5
|    +--- org.apache.hadoop:hadoop-minicluster:3.3.5
|    |    \--- runtimeClasspath
|    +--- org.apache.hadoop:hadoop-mapreduce-client-app:3.3.5
|    |    +--- org.apache.hadoop:hadoop-minicluster:3.3.5 (*)
|    |    \--- org.apache.hadoop:hadoop-mapreduce-client-hs:3.3.5
|    |         \--- org.apache.hadoop:hadoop-minicluster:3.3.5 (*)
|    \--- org.apache.hadoop:hadoop-yarn-server-resourcemanager:3.3.5
|         \--- org.apache.hadoop:hadoop-yarn-server-tests:3.3.5
|              \--- org.apache.hadoop:hadoop-minicluster:3.3.5 (*)
\--- org.bouncycastle:bcpkix-jdk15on:1.68
     \--- org.apache.hadoop:hadoop-yarn-server-web-proxy:3.3.5 (*)

org.bouncycastle:bcprov-jdk15to18:1.75
   variant "runtime" [
      org.gradle.status              = release (not requested)
      org.gradle.usage               = java-runtime
      org.gradle.libraryelements     = jar
      org.gradle.category            = library

      Requested attributes not found in the selected variant:
         org.gradle.dependency.bundling = external
         org.gradle.jvm.version         = 8
   ]

org.bouncycastle:bcprov-jdk15to18:1.75
+--- org.bouncycastle:bcpkix-jdk15to18:1.75
|    \--- runtimeClasspath
\--- org.bouncycastle:bcutil-jdk15to18:1.75
     \--- org.bouncycastle:bcpkix-jdk15to18:1.75 (*)

org.bouncycastle:bcutil-jdk15to18:1.75
   variant "runtime" [
      org.gradle.status              = release (not requested)
      org.gradle.usage               = java-runtime
      org.gradle.libraryelements     = jar
      org.gradle.category            = library

      Requested attributes not found in the selected variant:
         org.gradle.dependency.bundling = external
         org.gradle.jvm.version         = 8
   ]

org.bouncycastle:bcutil-jdk15to18:1.75
\--- org.bouncycastle:bcpkix-jdk15to18:1.75
     \--- runtimeClasspath

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

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.

BouncyCastle excluded from the HDFS test fixture

Signed-off-by: Andrey Pleskach <ples@aiven.io>
@willyborankin willyborankin changed the title Fix HDFS fixture with new BouncyCastle Fix HDFS fixture by excluding BouncyCastle Jun 29, 2023
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testNodeDropWithOngoingReplication

@reta reta merged commit 22cb650 into opensearch-project:main Jun 29, 2023
@reta reta added the backport 2.x Backport to 2.x branch label Jun 29, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-8359-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 22cb650e11e77bc86183d418fc99b00232559677
# Push it to GitHub
git push --set-upstream origin backport/backport-8359-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-8359-to-2.x.

willyborankin added a commit to willyborankin/OpenSearch that referenced this pull request Jun 29, 2023
BouncyCastle excluded from the HDFS test fixture

Signed-off-by: Andrey Pleskach <ples@aiven.io>
(cherry picked from commit 22cb650)
Signed-off-by: Andrey Pleskach <ples@aiven.io>
reta pushed a commit that referenced this pull request Jun 30, 2023
BouncyCastle excluded from the HDFS test fixture


(cherry picked from commit 22cb650)

Signed-off-by: Andrey Pleskach <ples@aiven.io>
baba-devv pushed a commit to baba-devv/OpenSearch that referenced this pull request Jul 29, 2023
BouncyCastle excluded from the HDFS test fixture

Signed-off-by: Andrey Pleskach <ples@aiven.io>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
BouncyCastle excluded from the HDFS test fixture

Signed-off-by: Andrey Pleskach <ples@aiven.io>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.x Backport to 2.x branch skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants