Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Force nebula plugins to use latest org.bouncycastle:* artifacts #8233

Merged

Conversation

reta
Copy link
Collaborator

@reta reta commented Jun 22, 2023

Description

Force nebula plugins to use latest org.bouncycastle:* artifacts. The new nebula plugins require Gradle 7 which will be a breaking change for 1.x.

Cannot add task 'destructiveDistroTest.docker' as a task with that name already exists.
=======================================   
OpenSearch Build Hamster says Hello!          
  Gradle Version        : 6.6.1
  OS Info               : Linux 6.2.0-23-generic (amd64)     
  JDK Version           : 11 (JDK)                
  JAVA_HOME             : /usr/lib/jvm/java-11-openjdk-amd64
  Random Testing Seed   : F502C2130485FC41
  In FIPS 140 mode      : false
=======================================                        

> Task :build-tools:dependencyInsight
org.bouncycastle:bcpg-jdk15on:1.70
   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
   ]                      
   Selection reasons:                             
      - By conflict resolution : between versions 1.70 and 1.64
                                                                                     
org.bouncycastle:bcpg-jdk15on:1.70                         
\--- runtimeClasspath                                
                                                                                     
org.bouncycastle:bcpg-jdk15on:1.64 -> 1.70
\--- org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r
     \--- com.netflix.nebula:gradle-info-plugin:8.2.0
          \--- runtimeClasspath                               
                                                                                     
org.bouncycastle:bcpkix-jdk15on:1.70      
   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
   ]                                     
   Selection reasons:     
      - By conflict resolution : between versions 1.70 and 1.64                                                                                                            
                                                                                     
org.bouncycastle:bcpkix-jdk15on:1.70
\--- runtimeClasspath
                                                                                     
org.bouncycastle:bcpkix-jdk15on:1.64 -> 1.70
\--- org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r                        
     \--- com.netflix.nebula:gradle-info-plugin:8.2.0
          \--- runtimeClasspath

org.bouncycastle:bcprov-jdk15on:1.70                                                                                                                                                                                                                                                                                                                  
   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
   ]
   Selection reasons:
      - By conflict resolution : between versions 1.70 and 1.64

org.bouncycastle:bcprov-jdk15on:1.70
+--- runtimeClasspath
+--- org.bouncycastle:bcpg-jdk15on:1.70
|    +--- runtimeClasspath
|    \--- org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r (requested org.bouncycastle:bcpg-jdk15on:1.64)
|         \--- com.netflix.nebula:gradle-info-plugin:8.2.0
|              \--- runtimeClasspath
+--- org.bouncycastle:bcpkix-jdk15on:1.70
|    +--- runtimeClasspath
|    \--- org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r (requested org.bouncycastle:bcpkix-jdk15on:1.64) (*)
\--- org.bouncycastle:bcutil-jdk15on:1.70
     +--- runtimeClasspath
     \--- org.bouncycastle:bcpkix-jdk15on:1.70 (*)

org.bouncycastle:bcprov-jdk15on:1.64 -> 1.70
\--- org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r
     \--- com.netflix.nebula:gradle-info-plugin:8.2.0
          \--- runtimeClasspath

org.bouncycastle:bcutil-jdk15on:1.70
   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-jdk15on:1.70
+--- runtimeClasspath
\--- org.bouncycastle:bcpkix-jdk15on:1.70
     +--- runtimeClasspath
     \--- org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r (requested org.bouncycastle:bcpkix-jdk15on:1.64)
          \--- com.netflix.nebula:gradle-info-plugin:8.2.0
               \--- runtimeClasspath

(*) - dependencies omitted (listed previously)

A web-based, searchable dependency report is available by adding the --scan option.

Related Issues

N/A

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
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@reta reta force-pushed the force.bouncycastle.for.nebula branch from 2d5ae77 to c3a8eb1 Compare June 22, 2023 21:07
@kotwanikunal
Copy link
Member

Thanks for the help @reta!

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta reta added dependencies Pull requests that update a dependency file backport 1.3 Backport to 1.3 branch labels Jun 22, 2023
buildSrc/build.gradle Show resolved Hide resolved
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Jun 22, 2023

Codecov Report

Merging #8233 (c3a8eb1) into 1.x (926b69c) will decrease coverage by 0.09%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##                1.x    #8233      +/-   ##
============================================
- Coverage     77.61%   77.53%   -0.09%     
+ Complexity    58791    58777      -14     
============================================
  Files          4223     4223              
  Lines        253547   253547              
  Branches      38714    38714              
============================================
- Hits         196793   196590     -203     
- Misses        40731    40967     +236     
+ Partials      16023    15990      -33     

see 434 files with indirect coverage changes

@kotwanikunal kotwanikunal merged commit c751171 into opensearch-project:1.x Jun 22, 2023
@kotwanikunal kotwanikunal added backport 1.3 Backport to 1.3 branch and removed backport 1.3 Backport to 1.3 branch labels Jun 22, 2023
@kotwanikunal
Copy link
Member

Hmm. Backport workflow seems to be broken?
I'll take care of it manually

kotwanikunal pushed a commit to kotwanikunal/OpenSearch that referenced this pull request Jun 22, 2023
…search-project#8233)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit c751171)
kotwanikunal added a commit that referenced this pull request Jun 22, 2023
… (#8234)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit c751171)

Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.3 Backport to 1.3 branch dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants