Commit f1446c96 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige uso de license-scanning, ya obsoleto

See merge request redmic-project/gitlab-ci-templates!78
parents ea603a51 a4d23160

_maintenance.yml

+1 −0
Original line number Diff line number Diff line 
.scheduled-run:

  stage: maintenance

  dependencies: []

  needs: []

  image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    DOCKER_DEPLOY_IMAGE_NAME: redmic/docker-docker-deploy

_maven-building.yml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
        coverage=$(xmllint --html --xpath "${TEST_COVERAGE_XPATH}" "${coveragePath}");

        echo "Coverage - ${coverage}";

      fi

  coverage: '/^Coverage\s-\s(\d+(?:\.\d+)?%)/'

  after_script:

    - rm -rf .m2/repository/es

  cache:

license-listing.yml

+2 −0
Original line number Diff line number Diff line 
include:

  # The legacy License Compliance analyzer was deprecated in GitLab 15.9 and removed in GitLab 16.3.

  template: License-Scanning.gitlab-ci.yml



license_scanning:

  stage: license-list

  variables:

    LICENSE_MANAGEMENT_VERSION: 4

    LICENSE_MANAGEMENT_SETUP_CMD: curl -s -o settings.xml https://gitlab.com/redmic-project/docker/maven/-/raw/master/config/settings.xml

    MAVEN_CLI_OPTS: -DskipTests --settings settings.xml

  artifacts:

scanning/dependency-scanning.yml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
include:

  # Source: https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Jobs/Dependency-Scanning.gitlab-ci.yml

  template: Security/Dependency-Scanning.gitlab-ci.yml



gemnasium-dependency_scanning:

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never