Merge pull request #40 from Open-MBEE/release/4.0.8

Release/4.0.8

Dockerfile

@@ -1,12 +1,12 @@
-FROM openjdk:15.0.1-jdk-slim as build
+FROM openjdk:17.0.2-slim as build
 
 WORKDIR application
 COPY . .
 RUN ./gradlew --no-daemon bootJar
 RUN find . -type f -name mms*.jar -not -iname '*javadoc*' -not -iname '*sources*' -exec cp '{}' 'app.jar' ';'
 RUN java -Djarmode=layertools -jar app.jar extract
 
-FROM openjdk:15.0.1-jdk-slim
+FROM openjdk:17.0.2-slim
 WORKDIR application
 RUN apt-get update && apt-get install -y procps
 COPY --from=build application/dependencies/ ./

README.rst

@@ -61,10 +61,10 @@ Docker
 We suggest using Docker to set up PostgreSQL and Elasticsearch.  Installation 
 instructions are found here: `Docker documentation <https://docs.docker.com/>`_
 
-Java SE Development Kit 11
+Java SE Development Kit 17
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Installation instructions: `JDK-11 download <https://www.oracle.com/java/technologies/javase-jdk11-downloads.html>`_
+Installation instructions: `JDK-17 download <https://www.oracle.com/java/technologies/javase-jdk17-downloads.html>`_
 
 Postgresql
 ^^^^^^^^^^

build.gradle

@@ -1,16 +1,25 @@
 buildscript {
+    dependencies {
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
+    }
     repositories {
         mavenCentral()
+        gradlePluginPortal()
+        maven { url 'https://repo.spring.io/plugins-release' }
     }
 }
 
 plugins {
     id 'org.hidetake.swagger.generator' version '2.18.2'
     id 'org.springframework.boot' version "${springBootVersion}"
-    id 'io.spring.dependency-management' version '1.0.9.RELEASE'
+    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java'
 }
 
+apply plugin: 'java-library'
+apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
+
 repositories {
     mavenLocal()
     mavenCentral()
@@ -73,7 +82,10 @@ springBoot {
 }
 
 bootJar {
-    layered()
+    layered {
+        enabled = true
+    }
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
 
 //https://stackoverflow.com/questions/61197984/bootjar-mavenjar-artifact-wasnt-produced-by-this-build

docs/docker.rst

@@ -12,8 +12,8 @@ Dependencies
   Docker
     We suggest using Docker to set up PostgreSQL and Elasticsearch.  Installation instructions are found here: `Docker documentation <https://docs.docker.com/>`_
 
-  Java SE Development Kit 11+
-    Installation instructions: `JDK-11 download <https://www.oracle.com/java/technologies/javase-jdk11-downloads.html>`_
+  Java SE Development Kit 17+
+    Installation instructions: `JDK-17 download <https://www.oracle.com/java/technologies/javase-jdk17-downloads.html>`_
 
   Postgresql or Mysql 5.7
     Install postgres (PostgreSQL) 11, instructions for Docker: `PostgreSQL with Docker <https://hub.docker.com/_/postgres>`_

docs/linux.rst

@@ -8,7 +8,7 @@ Dependencies
 
 This guide assumes that you have setup and configured the following dependencies and that the server or instance the MMS RI application will have access to the services.
 
-  - Java 11+
+  - Java 17+
   - Postgresql 11 or MySQL 5.7+
   - Elasticsearch 7.8+
   - S3 Bucket (either provided by AWS or by MinIO in case of local storage)

gradle.properties

@@ -1,5 +1,5 @@
-version=4.0.7
+version=4.0.8
 group=org.openmbee.mms
 
-mmsVersion=4.0.7
-springBootVersion=2.3.2.RELEASE
+mmsVersion=4.0.8
+springBootVersion=2.6.7

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists