Merge pull request #82 from Open-MBEE/release/4.0.20

Release/4.0.20
Open-MBEE · Mar 26, 2024 · 3dce6be · 3dce6be
2 parents 5bdba0f + 283c07d
commit 3dce6be
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 31 deletions.
diff --git a/.readthedocs.yaml 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
diff --git a/build.gradle b/build.gradle
@@ -46,32 +46,13 @@ dependencies {
             "org.postgresql:postgresql:42.2.27",
             "org.zalando:logbook-spring-boot-starter:2.2.1",
             "ch.qos.logback:logback-classic:1.2.11",
-//            below was commented out due to changes to spring 2.6.7 > 2.7.x upgrade
-            //change the opanapi version from 1.5.4 to 1.6.9
             'org.springdoc:springdoc-openapi-ui:1.6.9',
             "org.springdoc:springdoc-openapi-webmvc-core:1.6.9",
             "org.springdoc:springdoc-openapi-security:1.6.9",
             //resolve https://nvd.nist.gov/vuln/detail/CVE-2022-1471
             "org.yaml:snakeyaml:2.0",
-            //https://nvd.nist.gov/vuln/detail/CVE-2022-46364
-            "org.apache.cxf:cxf-core:3.5.5",
-//        RESOLVE HIGH VULNERABILITIES
-        "org.apache.tomcat.embed:tomcat-embed-core:9.0.75",
-        "org.springframework.boot:spring-boot-autoconfigure:2.7.12",
-        "org.jsoup:jsoup:1.15.3",
-        "org.bouncycastle:bcprov-jdk15on:1.67",
-        "org.apache.lucene:lucene-core:8.10.0",
-        "org.apache.commons:commons-compress:1.21",
-        "com.amazonaws:aws-java-sdk-s3:1.12.261",
-        "com.fasterxml.jackson.core:jackson-core:2.15.0",
-        "com.github.junrar:junrar:7.4.1",
-        // https://mvnrepository.com/artifact/com.google.guava/guava
-        "com.google.guava:guava:32.0.1-jre",
-        "com.google.protobuf:protobuf-java:3.16.3",
-
-
-
-
+            "org.apache.lucene:lucene-core:8.10.0",
+            "com.fasterxml.jackson.core:jackson-core:2.15.0",
     )
     testImplementation(
             'org.springframework.boot:spring-boot-starter-test'

diff --git a/docs/conf.py b/docs/conf.py
@@ -26,7 +26,7 @@
 master_doc = 'index'
 
 # The full version, including alpha/beta/rc tags
-release = '4.0.19'
+release = '4.0.20'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/docker.rst b/docs/docker.rst
@@ -49,7 +49,7 @@ Running MMS
     First, create a container from an MMS image. In the example below, the container is using the host network for simplicity.
     ::
 
-      docker create --name=mms --network="host" -e "SPRING_CONFIG_LOCATION=/mms.properties" openmbee/mms:4.0.19
+      docker create --name=mms --network="host" -e "SPRING_CONFIG_LOCATION=/mms.properties" openmbee/mms:4.0.20
 
   Copy properties
     If using the above command, copy the properties file to the defined spring config location.

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -0,0 +1 @@
+sphinx_rtd_theme
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-version=4.0.19b
+version=4.0.20
 group=org.openmbee.mms
 
-mmsVersion=4.0.19
-springBootVersion=2.7.17
+mmsVersion=4.0.20
+springBootVersion=2.7.18
diff --git a/openapi/api-docs.yaml b/openapi/api-docs.yaml
@@ -5,7 +5,7 @@ info:
   license:
     name: Apache 2.0
     url: http://www.apache.org/licenses/LICENSE-2.0.txt
-  version: 4.0.19
+  version: 4.0.20
   contact:
     name: OpenMBEE
     url: http://openmbee.org

diff --git a/openapi/doc-config.json b/openapi/doc-config.json
@@ -3,5 +3,5 @@
     "invokerPackage": "org.openmbee.mms",
     "groupId": "org.openmbee.mms",
     "artifactId": "mms-client",
-    "artifactVersion": "4.0.19"
+    "artifactVersion": "4.0.20"
 }
diff --git a/openapi/java-config.json b/openapi/java-config.json
@@ -1,7 +1,7 @@
 {
     "groupId": "org.openmbee.mms",
     "artifactId": "mms-java-client",
-    "artifactVersion": "4.0.19",
+    "artifactVersion": "4.0.20",
     "artifactUrl": "https://github.com/Open-MBEE/mms",
     "artifactDescription": "Java OpenAPI Client for MMS",
     "library": "jersey2",

diff --git a/openapi/python-config.json b/openapi/python-config.json
@@ -1,5 +1,5 @@
 {
     "packageName": "mms_python_client",
     "projectName": "mms-python-client",
-    "packageVersion": "4.0.19"
+    "packageVersion": "4.0.20"
 }
diff --git a/src/main/java/org/openmbee/mms/mmsri/MMSRIApplication.java b/src/main/java/org/openmbee/mms/mmsri/MMSRIApplication.java
@@ -13,7 +13,7 @@
 @OpenAPIDefinition(
     info = @Info(
         title = "MMS Reference Implementation API",
-        version = "4.0.19",
+        version = "4.0.20",
         description = "Documentation for MMS API",
         license = @License(name = "Apache 2.0", url = "http://www.apache.org/licenses/LICENSE-2.0.txt")
     ),