Merge branch 'main' of gitlab.cryptoworkshop.com:root/bc-java

Author: dghgit

build.gradle

@@ -7,11 +7,13 @@ buildscript {
 
 }
 
+
 plugins {
     id "io.spring.nohttp" version "0.0.11"
     id "checkstyle"
     id "jacoco"
     id "net.ltgt.errorprone" version "3.1.0"
+    id 'maven-publish'
 }
 
 println("Environment setup:")
@@ -160,6 +162,7 @@ allprojects {
         }
     }
 
+
 }
 
 task printProperties {
@@ -183,6 +186,7 @@ ext {
 
 subprojects {
     apply plugin: 'eclipse'
+    apply plugin: 'maven-publish'
 
 
     JavaVersion current = JavaVersion.current();
@@ -276,6 +280,30 @@ subprojects {
             languageVersion = JavaLanguageVersion.of(21)
         }
     }
+
+    publishing {
+        repositories {
+            maven {
+                name "cwmaven"
+                url System.getenv("CW_MAVEN_S3_URL")
+                credentials(AwsCredentials) {
+                    accessKey System.getenv("AWS_KEY")
+                    secretKey System.getenv("AWS_SECRET")
+                }
+            }
+        }
+    }
+
+
+    jar.doLast {
+        if (System.getenv("SIGNJAR_CMD") != null) {
+            exec {
+                commandLine(System.getenv("SIGNJAR_CMD"), archiveFile.get())
+            }
+        }
+    }
+
+
 }
 
 

core/build.gradle

@@ -15,3 +15,14 @@ test {
     maxParallelForks = 8;
 }
 
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'org.bouncycastle'
+            artifactId = "bccore-$vmrange"
+
+            from components.java
+
+        }
+    }
+}

jmail/build.gradle

@@ -27,7 +27,6 @@ dependencies {
 
     implementation group: 'jakarta.mail', name: 'jakarta.mail-api', version: '2.0.1'
     implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: '2.0.0'
-    implementation project(path: ':core')
 
     java9Implementation files(sourceSets.main.output.classesDirs) {
         builtBy compileJava
@@ -113,4 +112,19 @@ test {
     maxParallelForks = 8;
 }
 
-compileJava9Java.dependsOn([":prov:jar", ":util:jar",":pkix:jar"])
+compileJava9Java.dependsOn([":prov:jar", ":util:jar",":pkix:jar"])
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'org.bouncycastle'
+            artifactId = "bcjmail-$vmrange"
+            from components.java
+
+
+            artifact(javadocJar)
+            artifact(sourcesJar)
+        }
+
+    }
+}

mail/build.gradle

@@ -18,7 +18,6 @@ dependencies {
     implementation project(':pkix')
 
     implementation group: 'javax.mail', name: 'mail', version: '1.4'
-    implementation project(path: ':core')
 
     java9Implementation files(sourceSets.main.output.classesDirs) {
         builtBy compileJava
@@ -92,4 +91,20 @@ test {
     maxParallelForks = 8;
 }
 
-compileJava9Java.dependsOn([":prov:jar", ":util:jar",":pkix:jar"])
+compileJava9Java.dependsOn([":prov:jar", ":util:jar",":pkix:jar"])
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'org.bouncycastle'
+            artifactId = "bcmail-$vmrange"
+            from components.java
+
+
+            artifact(javadocJar)
+            artifact(sourcesJar)
+        }
+
+
+    }
+}

mls/build.gradle

@@ -29,7 +29,6 @@ sourceSets {
 }
 
 dependencies {
-    implementation project(':core')
     implementation project(':util')
     implementation project(':pkix')
     implementation project(':prov')
@@ -189,4 +188,20 @@ artifacts {
     archives sourcesJar
 }
 
-compileJava9Java.dependsOn([":prov:jar", ":util:jar",":pkix:jar"])
+compileJava9Java.dependsOn([":prov:jar", ":util:jar",":pkix:jar"])
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'org.bouncycastle'
+            artifactId = "bcmls-$vmrange"
+            from components.java
+
+
+            artifact(javadocJar)
+            artifact(sourcesJar)
+        }
+
+
+    }
+}

pg/build.gradle

@@ -18,7 +18,6 @@ sourceSets {
 
 
 dependencies {
-    implementation project(':core')
     implementation project(':prov')
     implementation project(':util')
 
@@ -113,4 +112,20 @@ test {
     maxHeapSize = "3g";
 }
 
-compileJava9Java.dependsOn([":prov:jar", ":util:jar"])
+compileJava9Java.dependsOn([":prov:jar", ":util:jar"])
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'org.bouncycastle'
+            artifactId = "bcpg-$vmrange"
+            from components.java
+
+
+            artifact(javadocJar)
+            artifact(sourcesJar)
+        }
+
+
+    }
+}

pkix/build.gradle

@@ -15,7 +15,7 @@ evaluationDependsOn(":prov")
 evaluationDependsOn(":util")
 
 dependencies {
-    implementation project(':core')
+
     implementation project(':prov')
     implementation project(':util')
 
@@ -99,4 +99,18 @@ test {
     maxParallelForks = 8;
 }
 
-compileJava9Java.dependsOn([":prov:jar", ":util:jar"])
+compileJava9Java.dependsOn([":prov:jar", ":util:jar"])
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'org.bouncycastle'
+            artifactId = "bcpkix-$vmrange"
+            from components.java
+
+            artifact(javadocJar)
+            artifact(sourcesJar)
+        }
+
+    }
+}

prov/build.gradle

@@ -211,6 +211,21 @@ compileTest21Java {
     options.sourcepath = files(['src/test/java', 'src/test/jdk21'])
 }
 
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'org.bouncycastle'
+            artifactId = "bcprov-$vmrange"
+            from components.java
+
+            artifact(javadocJar)
+            artifact(sourcesJar)
+        }
+
+    }
+}
+
+
 test {
     jvmArgs = ['-Dtest.java.version.prefix=1.8']
     dependsOn("test21")
@@ -360,3 +375,5 @@ task test21(type: Test) {
     }
 }
 
+
+

tls/build.gradle

@@ -45,12 +45,11 @@ sourceSets {
 }
 
 dependencies {
-    implementation project(':core')
+
     implementation project(':prov')
     implementation project(':util')
     implementation project(':pkix')
 
-    java9Implementation project(':core')
     java9Implementation project(':prov')
     java9Implementation project(':util')
     java9Implementation project(':pkix')
@@ -63,17 +62,14 @@ dependencies {
     test21Implementation group: 'junit', name: 'junit', version: '4.13.2'
 
 
-    test11Implementation project(':core')
     test11Implementation project(':prov')
     test11Implementation project(':util')
     test11Implementation project(':pkix')
 
-    test15Implementation project(':core')
     test15Implementation project(':prov')
     test15Implementation project(':util')
     test15Implementation project(':pkix')
 
-    test21Implementation project(':core')
     test21Implementation project(':prov')
     test21Implementation project(':util')
     test21Implementation project(':pkix')
@@ -162,6 +158,21 @@ artifacts {
     archives sourcesJar
 }
 
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'org.bouncycastle'
+            artifactId = "bctls-$vmrange"
+            from components.java
+
+            artifact(javadocJar)
+            artifact(sourcesJar)
+        }
+
+    }
+}
+
+
 test {
     jvmArgs = ['-Dtest.java.version.prefix=1.8']
     dependsOn("test21")

util/build.gradle

@@ -68,6 +68,15 @@ jar {
     manifest.attributes('Bundle-Version': "${v}")
 }
 
+jar.doLast {
+    if (System.getenv("SIGNJAR_CMD") != null ) {
+        exec {
+            commandLine(System.getenv("SIGNJAR_CMD"),jar.archiveFile)
+        }
+    }
+}
+
+
 
 task sourcesJar(type: Jar) {
     archiveBaseName = jar.archiveBaseName
@@ -91,6 +100,21 @@ artifacts {
     archives sourcesJar
 }
 
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'org.bouncycastle'
+            artifactId = "butil-$vmrange"
+            from components.java
+
+            artifact(javadocJar)
+            artifact(sourcesJar)
+        }
+
+    }
+}
+
+
 test {
     forkEvery = 1;
     maxParallelForks = 8;