Merge pull request #110 from opendevstack/master

Fixes from master

Author: victorpablosceruelo

.github/workflows/continuous-integration-workflow.yml

@@ -38,19 +38,26 @@ jobs:
     - name: copy created artifacts into docker context
       run: | 
         cp build/libs/*-all.jar ./docker/app.jar
+    - name: Show GitHub context (for debugging purposes)
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo "$GITHUB_CONTEXT"
     - name: Build docker image
       if: success()
       run: |
-        COMMIT_AUTHOR=$(git --no-pager show -s --format='%an (%ae)' $GITHUB_SHA)
-        COMMIT_MESSAGE=$(git log -1 --pretty=%B $GITHUB_SHA)
-        COMMIT_TIME=$(git show -s --format=%ci $GITHUB_SHA)
+        echo "GITHUB_SHA (invalid): $GITHUB_SHA "
+        COMMIT_HEAD_SHA="${{ github.event.pull_request.head.sha }}"
+        echo "COMMIT_HEAD_SHA: $COMMIT_HEAD_SHA"
+        COMMIT_AUTHOR=$(git --no-pager show -s --format='%an (%ae)' $COMMIT_HEAD_SHA)
+        COMMIT_MESSAGE=$(git log -1 --pretty=%B $COMMIT_HEAD_SHA)
+        COMMIT_TIME=$(git show -s --format=%ci $COMMIT_HEAD_SHA)
         BUILD_TIME=$(date -u "+%Y-%m-%d %H:%M:%S %z")
         docker build \
         --label "ods.build.job.url=https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
         --label "ods.build.source.repo.ref=$GITHUB_REF" \
         --label "ods.build.source.repo.commit.author=$COMMIT_AUTHOR" \
         --label "ods.build.source.repo.commit.msg=$COMMIT_MESSAGE" \
-        --label "ods.build.source.repo.commit.sha=$GITHUB_SHA" \
+        --label "ods.build.source.repo.commit.sha=$COMMIT_HEAD_SHA" \
         --label "ods.build.source.repo.commit.timestamp=$COMMIT_TIME" \
         --label "ods.build.source.repo.url=https://github.com/$GITHUB_REPOSITORY.git" \
         --label "ods.build.timestamp=$BUILD_TIME" \

CHANGELOG.md

@@ -1,12 +1,18 @@
 # Changelog
 
-## Unreleased
+## Unreleased - pointing release: 4.0.2
 
 ### Added
 - Improve memory management and error handling ([#70](https://github.com/opendevstack/ods-document-generation-svc/pull/70))
 
 ### Fixed
 - ODS AMI build failing due to broken x11 fonts package installation ([#74](https://github.com/opendevstack/ods-document-generation-svc/pull/74))
+- Fix TIR and DTR documents are not properly indexed ([#55](https://github.com/opendevstack/ods-document-generation-svc/pull/55))
+- Fix wkhtmltox hangs ([#66](https://github.com/opendevstack/ods-document-generation-svc/pull/66))
+- ODS AMI build failing due to broken x11 fonts package installation ([#74](https://github.com/opendevstack/ods-document-generation-svc/pull/74))
+- Github template tests fail in proxy environment ([#56](https://github.com/opendevstack/ods-document-generation-svc/issues/56))
+- Jcenter repository not available and build step fails ([#106](https://github.com/opendevstack/ods-document-generation-svc/issues/106))
+- Dependencies no more availables changed ([108](https://github.com/opendevstack/ods-document-generation-svc/issues/108))
 
 ## [4.0] - 2021-18-11
 

Jenkinsfile

@@ -32,15 +32,37 @@ def stageBuild(def context) {
       // get wkhtml
       sh (
         script : """
-        curl -kLO https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz
+        curl -sSkLO https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz
         tar vxf wkhtmltox-0.12.4_linux-generic-amd64.tar.xz
         mv wkhtmltox/bin/wkhtmlto* /usr/bin
+
+        source use-j11.sh || echo 'ERROR: We could NOT setup jdk 11.'
+        ./gradlew --version || echo 'ERROR: Could NOT get gradle version.'
+        java -version || echo 'ERROR: Could NOT get java version.'
+        echo "JAVA_HOME: $JAVA_HOME" || echo "ERROR: JAVA_HOME has NOT been set."
+
         """,
         label : "get and install wkhtml"
       )
 
       def status = sh(
-        script: "./gradlew clean test shadowJar --stacktrace --no-daemon",
+        script: '''
+                source use-j11.sh
+
+                retryNum=0
+                downloadResult=1
+                while [ 0 -ne $downloadResult ] && [ 5 -gt $retryNum ]; do
+                    set -x
+                    ./gradlew -i dependencies
+                    set +x
+                    downloadResult=$?
+                    let "retryNum=retryNum+1"
+                done
+
+                set -x
+                ./gradlew -i clean test shadowJar --full-stacktrace --no-daemon
+                set +x
+        ''',
         label : "gradle build",
         returnStatus: true
       )

build.gradle

@@ -19,18 +19,10 @@ buildscript {
 
   repositories {
     if (no_nexus) {
-      println("using repositories 'jcenter' and 'mavenCentral', because property no_nexus=$no_nexus")
-      jcenter()
+      println("using repository 'mavenCentral', because property no_nexus=$no_nexus")
       mavenCentral()
     } else {
       println("using nexus repositories")
-      maven() {
-        url "${nexus_url}/repository/jcenter/"
-        credentials {
-          username = "${nexus_user}"
-          password = "${nexus_pw}"
-        }
-      }
 
       maven() {
         url "${nexus_url}/repository/maven-public/"
@@ -75,18 +67,13 @@ apply plugin: "jacoco"
 
 repositories {
   if (no_nexus) {
-    println("using repositories 'jcenter' and 'mavenCentral', because property no_nexus=$no_nexus")
-    jcenter()
+    println("using repository 'mavenCentral', because property no_nexus=$no_nexus")
     mavenCentral()
-  } else {
-    println("using nexus repositories")
     maven() {
-      url "${nexus_url}/repository/jcenter/"
-      credentials {
-        username = "${nexus_user}"
-        password = "${nexus_pw}"
-      }
+      url "https://plugins.gradle.org/m2/"
     }
+  } else {
+    println("using nexus repositories")
 
     maven() {
       url "${nexus_url}/repository/maven-public/"
@@ -103,6 +90,10 @@ repositories {
         password = "${nexus_pw}"
       }
     }
+
+    maven() {
+      url "https://plugins.gradle.org/m2/"
+    }
   }
 }
 

buildSrc/build.gradle

@@ -18,18 +18,13 @@ ext {
 
 repositories {
     if (no_nexus) {
-        println("using repositories 'jcenter' and 'mavenCentral', because property no_nexus=$no_nexus")
-        jcenter()
+        println("INFO: using repository 'mavenCentral', because property no_nexus=$no_nexus")
         mavenCentral()
-    } else {
-        println("using nexus repositories")
         maven() {
-            url "${nexus_url}/repository/jcenter/"
-            credentials {
-                username = "${nexus_user}"
-                password = "${nexus_pw}"
-            }
+            url "https://plugins.gradle.org/m2/"
         }
+    } else {
+        println("INFO: using nexus repositories")
 
         maven() {
             url "${nexus_url}/repository/maven-public/"
@@ -46,13 +41,18 @@ repositories {
                 password = "${nexus_pw}"
             }
         }
+        
+        maven() {
+            url "https://plugins.gradle.org/m2/"
+        }
+
     }
 }
 
 apply plugin: 'groovy'
 
 dependencies {
     implementation gradleApi()
-    implementation 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
     implementation "org.codehaus.plexus:plexus-utils:3.0.24"
-}
+    implementation "com.github.jengelman.gradle.plugins:shadow:5.2.0"
+}