Merge pull request #63 from Open-MBEE/release/4.0.16

Release/4.0.16

build.gradle

@@ -42,12 +42,13 @@ dependencies {
             "org.openmbee.mms:storage:${mmsVersion}",
             "org.openmbee.mms:groups:${mmsVersion}",
             "org.springframework.boot:spring-boot-starter-web",
-            'org.springframework.boot:spring-boot-starter-actuator',
-            "org.postgresql:postgresql:42.2.5",
+            "org.springframework.boot:spring-boot-starter-actuator",
+            "org.postgresql:postgresql:42.2.27",
             "org.springdoc:springdoc-openapi-ui:1.5.4",
             "org.springdoc:springdoc-openapi-webmvc-core:1.5.4",
             "org.springdoc:springdoc-openapi-security:1.5.4",
-            "org.zalando:logbook-spring-boot-starter:2.2.1"
+            "org.zalando:logbook-spring-boot-starter:2.2.1",
+            "ch.qos.logback:logback-classic:1.2.11"
     )
     testImplementation(
             'org.springframework.boot:spring-boot-starter-test'

docker-services-compose.yml

@@ -0,0 +1,31 @@
+version: '3.8'
+
+services:
+  postgres:
+    image: postgres:11-alpine
+    network_mode: host
+    environment:
+      - POSTGRES_PASSWORD=test1234
+      - POSTGRES_USER=mmsuser
+      - POSTGRES_DB=mms
+    ports:
+      - 5432:5432
+
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.8.1
+    network_mode: host
+    environment:
+      - "discovery.type=single-node"
+    ports:
+      - 9200:9200
+      - 9300:9300
+
+  minio:
+    image: minio/minio:latest
+    network_mode: host
+    environment:
+      - "MINIO_ACCESS_KEY=admintest"
+      - "MINIO_SECRET_KEY=admintest"
+    command: server /tmp/data
+    ports:
+      - 9000:9000

gradle.properties

@@ -1,5 +1,5 @@
-version=4.0.15
+version=4.0.16
 group=org.openmbee.mms
 
-mmsVersion=4.0.15
+mmsVersion=4.0.16
 springBootVersion=2.6.7

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.15
+  version: 4.0.16
   contact:
     name: OpenMBEE
     url: http://openmbee.org

openapi/doc-config.json

@@ -3,5 +3,5 @@
     "invokerPackage": "org.openmbee.mms",
     "groupId": "org.openmbee.mms",
     "artifactId": "mms-client",
-    "artifactVersion": "4.0.9"
+    "artifactVersion": "4.0.16"
 }

openapi/java-config.json

@@ -1,7 +1,7 @@
 {
     "groupId": "org.openmbee.mms",
     "artifactId": "mms-java-client",
-    "artifactVersion": "4.0.9",
+    "artifactVersion": "4.0.16",
     "artifactUrl": "https://github.com/Open-MBEE/mms",
     "artifactDescription": "Java OpenAPI Client for MMS",
     "library": "jersey2",

openapi/python-config.json

@@ -1,5 +1,5 @@
 {
     "packageName": "mms_python_client",
     "projectName": "mms-python-client",
-    "packageVersion": "4.0.9"
+    "packageVersion": "4.0.16"
 }

src/main/java/org/openmbee/mms/mmsri/MMSRIApplication.java

@@ -13,7 +13,7 @@
 @OpenAPIDefinition(
     info = @Info(
         title = "MMS Reference Implementation API",
-        version = "4.0.12",
+        version = "4.0.16",
         description = "Documentation for MMS API",
         license = @License(name = "Apache 2.0", url = "http://www.apache.org/licenses/LICENSE-2.0.txt")
     ),

src/main/resources/application-test.properties

@@ -42,6 +42,8 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 spring.jpa.open-in-view=false
 
 spring.main.allow-bean-definition-overriding=true
+spring.main.allow-circular-references=true
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher
 
 #Configuration for Elasticsearch
 elasticsearch.host=elasticsearch

src/main/resources/logback.xml

@@ -0,0 +1,17 @@
+<configuration scan="true" scanPeriod="10 seconds" debug="true">
+    <contextName>mmsri</contextName>
+    <jmxConfigurator />
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%date{"yyyy-MM-dd'T'HH:mm:ss,SSSXXX", UTC} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+    <logger name="org.apache.jena.sparql" level="WARN"/>
+    <logger name="org.eclipse.jetty" level="INFO"/>
+    <logger name="io.netty" level="INFO"/>
+    <!-- Import loggers configuration from external file -->
+    <include file="/mnt/config/logback/loggers-include.xml"/>
+</configuration>