diff --git a/.circleci/config.yml b/.circleci/config.yml index 9ec19d859..df27e029d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,7 @@ version: 2.1 orbs: docker: circleci/docker@2.1.1 + sonarcloud: sonarsource/sonarcloud@2.0.0 executors: openjdk_executor: docker: @@ -46,6 +47,16 @@ jobs: paths: - mms/* + scan: + executor: openjdk_executor + working_directory: /home/circleci/mms + steps: + - checkout + - run: + name: Build classes to scan + command: ./gradlew build -x test + - sonarcloud/scan + deploy_snapshot: executor: openjdk_executor working_directory: /home/circleci/mms @@ -73,6 +84,12 @@ workflows: filters: tags: only: /[0-9.]+(-(a|b|rc)[0-9]+)?/ + - scan: + filters: + tags: + only: /[0-9.]+(-(a|b|rc)[0-9]+)?/ + context: + - SonarCloud - deploy_snapshot: requires: - build_and_test diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 000000000..a0c403c64 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,22 @@ +# .readthedocs.yaml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Set the version of Python and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.11" + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: docs/conf.py + +# We recommend specifying your dependencies to enable reproducible builds: +# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html +# python: +# install: +# - requirements: docs/requirements.txt \ No newline at end of file diff --git a/README.rst b/README.rst index 446e42f2a..0aa22a90e 100644 --- a/README.rst +++ b/README.rst @@ -2,13 +2,12 @@ MMS Structured Data Version Control =================================== +.. image:: https://sonarcloud.io/api/project_badges/measure?project=Open-MBEE_exec-mms&metric=alert_status + :target: https://sonarcloud.io/summary/new_code?id=Open-MBEE_exec-mms + :alt: SonarCloud -.. image:: https://img.shields.io/lgtm/grade/java/g/Open-MBEE/mms.svg?logo=lgtm&logoWidth=18 - :target: https://lgtm.com/projects/g/Open-MBEE/mms/context:java - :alt: Language grade: Java - -.. image:: https://circleci.com/gh/Open-MBEE/mms.svg?style=svg - :target: https://circleci.com/gh/Open-MBEE/mms +.. image:: https://circleci.com/gh/Open-MBEE/exec-mms.svg?style=svg + :target: https://circleci.com/gh/Open-MBEE/exec-mms :alt: CircleCI .. image:: https://readthedocs.org/projects/model-management-system/badge/?version=latest diff --git a/docs/conf.py b/docs/conf.py index 2b469ac88..24beaec43 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -19,14 +19,14 @@ # -- Project information ----------------------------------------------------- -project = 'Model Management System' +project = 'Model Management System (MMS 4)' copyright = '2020, OpenMBEE' author = 'OpenMBEE' master_doc = 'index' # The full version, including alpha/beta/rc tags -release = '4.0.0' +release = '4.0.19' # -- General configuration --------------------------------------------------- diff --git a/gradle.properties b/gradle.properties index d605db2b4..336ca74f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ -version=4.0.18 +version=4.0.19 group=org.openmbee.mms -springBootVersion=2.6.7 -springFrameworkVersion=5.3.20 -springSecurityVersion=5.7.0 -springDataVersion=2.7.0 +springBootVersion=2.7.17 +springFrameworkVersion=5.3.30 +springSecurityVersion=5.7.10 +springDataVersion=2.7.14 jacksonVersion=2.13.3 elasticVersion=7.8.1 \ No newline at end of file diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 000000000..b3bfa8103 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,4 @@ +sonar.projectKey=Open-MBEE_exec-mms +sonar.organization=openmbee +sonar.language=java +sonar.java.binaries=**/build/classes/java/main diff --git a/storage/README.rst b/storage/README.rst index d668760da..fb947d2ce 100644 --- a/storage/README.rst +++ b/storage/README.rst @@ -12,6 +12,9 @@ If s3.access_key or s3.secret_key are omitted, will follow the `default credenti Configuration ^^^^^^^^^^^^^ + s3.endpoint + Endpoint of S3 compliant storage service + s3.access_key This is the access key for the S3 bucket. Required.