Rework dependencies

build.gradle

@@ -62,6 +62,7 @@ allprojects {
     project.ext {
         slf4jVersion = '1.7.32'
         junitVersion = '5.7.2'
+        picocliVersion = '4.6.1'
         rootConfigDir = new File(rootDir, 'config')
         gitCommit = getGitCommit()
         isContinuousIntegrationEnvironment = Boolean.parseBoolean(System.getenv('CI'))

pgpainless-cli/build.gradle

@@ -22,33 +22,24 @@ task generateVersionProperties {
 processResources.dependsOn generateVersionProperties
 
 dependencies {
-    implementation(project(":pgpainless-sop"))
-    implementation(project(":sop-java"))
-
-    implementation(project(":sop-java-picocli"))
-    implementation 'info.picocli:picocli:4.5.2'
 
     testImplementation(project(":pgpainless-core"))
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
-
     // https://todd.ginsberg.com/post/testing-system-exit/
     testImplementation 'com.ginsberg:junit5-system-exit:1.1.1'
-
     // We want logback logging in tests
     testImplementation 'ch.qos.logback:logback-classic:1.2.5'
 
+    implementation(project(":pgpainless-sop"))
+    implementation(project(":sop-java"))
+    implementation(project(":sop-java-picocli"))
+
+    implementation "info.picocli:picocli:$picocliVersion"
     // We don't want logging in the application itself
     implementation "org.slf4j:slf4j-nop:$slf4jVersion"
 
-    /*
-    implementation "org.bouncycastle:bcprov-debug-jdk15on:$bouncyCastleVersion"
-    /*/
-    implementation "org.bouncycastle:bcprov-jdk15on:$bouncyCastleVersion"
-    //*/
-    implementation "org.bouncycastle:bcpg-jdk15on:$bouncyCastleVersion"
-
     // https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 }

pgpainless-sop/build.gradle

@@ -9,14 +9,13 @@ repositories {
 }
 
 dependencies {
-
-    implementation(project(":pgpainless-core"))
-    implementation(project(":sop-java"))
-
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
 
     testImplementation 'ch.qos.logback:logback-classic:1.2.5'
+
+    implementation(project(":pgpainless-core"))
+    implementation(project(":sop-java"))
 }
 
 test {

sop-java-picocli/build.gradle

@@ -3,18 +3,15 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":sop-java"))
-    implementation 'info.picocli:picocli:4.6.1'
-    implementation 'com.google.inject:guice:5.0.1'
-
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
-
     // https://todd.ginsberg.com/post/testing-system-exit/
     testImplementation 'com.ginsberg:junit5-system-exit:1.1.1'
-
     testImplementation "org.mockito:mockito-core:3.11.2"
 
+    implementation(project(":sop-java"))
+    implementation "info.picocli:picocli:$picocliVersion"
+
     // https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 }