diff --git a/.circleci/config.yml b/.circleci/config.yml index 59f934de7..8b66228c7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ orbs: executors: openjdk_executor: docker: - - image: cimg/openjdk:17.0.2 + - image: circleci/openjdk:11.0.8-jdk environment: _JAVA_OPTIONS: "-Xmx3g" GRADLE_OPTS: "-Dorg.gradle.daemon=false" diff --git a/Dockerfile b/Dockerfile index cf3bf4e0a..861eeb446 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:15-jdk-slim +FROM openjdk:11-jdk-slim COPY . /mms WORKDIR /mms RUN ./gradlew --no-daemon bootJar diff --git a/example/example.gradle b/example/example.gradle index bbdd23269..87b646db8 100644 --- a/example/example.gradle +++ b/example/example.gradle @@ -38,9 +38,6 @@ dependencies { ) } -bootJar { - duplicatesStrategy(DuplicatesStrategy.INCLUDE) -} //https://stackoverflow.com/questions/61197984/bootjar-mavenjar-artifact-wasnt-produced-by-this-build configurations { [apiElements, runtimeElements].each { diff --git a/gradle.properties b/gradle.properties index bf04fcefd..6e7ed6e40 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ -version=4.0.6 +version=4.0.7 group=org.openmbee.mms -springBootVersion=2.3.2.RELEASE +springBootVersion=2.2.6.RELEASE springFrameworkVersion=5.2.5.RELEASE springSecurityVersion=5.3.1.RELEASE springDataVersion=2.2.6.RELEASE