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

Author: dghgit

.gitlab-ci.yml

@@ -1,5 +1,6 @@
 stages:
   - check
+  - build
   - test
 
 check-code:
@@ -18,35 +19,44 @@ check-code:
       - "mail/build/reports"
       - "util/build/reports"
       - "tls/build/reports"
-      - "mls/build/reports"    
-  
+      - "mls/build/reports"
+
+ant-build:
+  stage: build
+  needs: [ "check-code" ]
+  script:
+    - "ecr_login"
+    - "ecr_pull vm_base_intel latest"
+    - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/build_1_8.sh\""
+
+
 test-code-8:
   stage: test
-  needs: ["check-code"]
+  needs: [ "check-code" ]
   script:
-   - "ecr_login"
-   - "ecr_pull vm_base_intel latest"
-   - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_8.sh\""
+    - "ecr_login"
+    - "ecr_pull vm_base_intel latest"
+    - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_8.sh\""
   artifacts:
     when: always
     reports:
       junit:
-      - "core/build/test-results/**/*.xml"
-      - "prov/build/test-results/**/*.xml"
-      - "pg/build/test-results/**/*.xml"
-      - "pkix/build/test-results/**/*.xml"
-      - "mail/build/test-results/**/*.xml"
-      - "util/build/test-results/**/*.xml"
-      - "tls/build/test-results/**/*.xml"
-      - "mls/build/test-results/**/*.xml"
+        - "core/build/test-results/**/*.xml"
+        - "prov/build/test-results/**/*.xml"
+        - "pg/build/test-results/**/*.xml"
+        - "pkix/build/test-results/**/*.xml"
+        - "mail/build/test-results/**/*.xml"
+        - "util/build/test-results/**/*.xml"
+        - "tls/build/test-results/**/*.xml"
+        - "mls/build/test-results/**/*.xml"
 
 test-code-11:
   stage: test
-  needs: ["check-code"]
+  needs: [ "check-code" ]
   script:
-   - "ecr_login"
-   - "ecr_pull vm_base_intel latest"
-   - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_11.sh\""
+    - "ecr_login"
+    - "ecr_pull vm_base_intel latest"
+    - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_11.sh\""
   artifacts:
     when: always
     reports:
@@ -63,11 +73,11 @@ test-code-11:
 
 test-code-17:
   stage: test
-  needs: ["check-code"]
+  needs: [ "check-code" ]
   script:
-   - "ecr_login"
-   - "ecr_pull vm_base_intel latest"
-   - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_17.sh\""
+    - "ecr_login"
+    - "ecr_pull vm_base_intel latest"
+    - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_17.sh\""
   artifacts:
     when: always
     reports:
@@ -84,7 +94,7 @@ test-code-17:
 
 test-code-21:
   stage: test
-  needs: ["check-code"]
+  needs: [ "check-code" ]
   script:
     - "ecr_login"
     - "ecr_pull vm_base_intel latest"

ant/bc+-build.xml

@@ -250,7 +250,7 @@
                      windowtitle="Bouncy Castle Library ${release.name} API Specification"
                      header="<b>Bouncy Castle Cryptography Library ${release.name}</b>">
                 <docElements/>
-                <arg value="${javadoc.args}" />
+                <arg line="${javadoc.args}" />
                 <classpath>
                     <path refid="project.classpath" /> 
                     <fileset dir="${artifacts.jars.dir}">

ant/jdk18+.xml

@@ -9,7 +9,7 @@
     <property name="artifacts.dir" value="${build.dir}/artifacts/${jdk.name}" />
     <property name="src.dir" value="${build.dir}/${jdk.name}" />
     <property name="target.prefix" value="jdk18on" />
-    <property name="javadoc.args" value="-breakiterator" />
+    <property name="javadoc.args" value="-breakiterator -Xdoclint:none -quiet" />
 
     <target name="clean">
         <delete dir="${build.dir}" />

ci/build_1_8.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+
+#
+# This script is for running inside the docker container
+#
+
+cd /workspace/bc-java
+source ci/common.sh
+
+export JAVA_HOME=`openjdk_8`
+export export PATH=$JAVA_HOME/bin:$PATH
+export JDKPATH=$JAVA_HOME
+
+export PATH=$PATH:`ant-bin-1-10`
+
+sh build1-8+