diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c54cb084b65505d98d83e8a01967fd776d19e232..d137deb0a376b646c0110d53a6f3966e58bc283b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,32 +1,35 @@ --- # Based on the Maven CI/CD template from GitLab: https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Maven.gitlab-ci.yml variables: - # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log. # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. - MAVEN_OPTS: > + MAVEN_OPTS: >- -Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true - # As of Maven 3.3.0 instead of this, you may define these options in `.mvn/maven.config` so the same config is used + # As of Maven 3.3.0 instead of this you MAY define these options in `.mvn/maven.config` so the same config is used # when running from the command line. - # `installAtEnd` and `deployAtEnd` are only effective with the recent version of the corresponding plugins. - MAVEN_CLI_OPTS: > + # As of Maven 3.6.1, the use of `--no-tranfer-progress` (or `-ntp`) suppresses download and upload messages. The use + # of the `Slf4jMavenTransferListener` is no longer necessary. + # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. + MAVEN_CLI_OPTS: >- --batch-mode --errors --fail-at-end --show-version + --no-transfer-progress -DinstallAtEnd=true -DdeployAtEnd=true -# TODO: Add Code Quality and SAST job templates into the CI/CD pipeline configuration -# Check the list of available templates at https://gitlab.com/gitlab-org/gitlab/-/tree/master/lib/gitlab/ci/templates +# TODO: Add and configure the following CI job templates into the CI/CD configuration: +# - [Code Quality](https://docs.gitlab.com/ee/ci/testing/code_quality.html) +# - [Dependency Scanning](https://docs.gitlab.com/ee/user/application_security/dependency_scanning/) +# - [Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) +# Check the list of available CI job templates at https://gitlab.com/gitlab-org/gitlab/-/tree/master/lib/gitlab/ci/templates include: - template: Jobs/Secret-Detection.gitlab-ci.yml - template: Workflows/Branch-Pipelines.gitlab-ci.yml -# TODO: Create .codeclimate.yml file to configure the static analysis engine (i.e. Code Climate) used by Code Quality CI job stages: - build - test @@ -171,5 +174,3 @@ sonarqube-check: dependencies: - build - test - -# TODO: Configure 'spotbugs-sast' job (part of SAST job template) so it analyses the compiled Java artifacts diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 16899897a756dcaab3883157153f341d233b5c19..0c5b1b4e60fd44c73d76c19a61af7576f8f3b4b2 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,6 +3,8 @@ debug=true trace=false +server.port=8080 + sitodo.motivation.empty=Your list is empty :( sitodo.motivation.noFinished=You have not finished any of your tasks! sitodo.motivation.someFinished=You have finished some of your tasks!