Skip to content

Commit

Permalink
Merge pull request #252 from Open-MBEE/release/4.0.19
Browse files Browse the repository at this point in the history
Release/4.0.19
  • Loading branch information
HuiJun authored Dec 13, 2023
2 parents 899af3d + 8e33919 commit adc1e8c
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 13 deletions.
17 changes: 17 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
version: 2.1
orbs:
docker: circleci/[email protected]
sonarcloud: sonarsource/[email protected]
executors:
openjdk_executor:
docker:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
22 changes: 22 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -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
11 changes: 5 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions sonar-project.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
sonar.projectKey=Open-MBEE_exec-mms
sonar.organization=openmbee
sonar.language=java
sonar.java.binaries=**/build/classes/java/main
3 changes: 3 additions & 0 deletions storage/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit adc1e8c

Please sign in to comment.