From 5b4049418d5d3575ae61fc814aeff0ac35c621dc Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Sun, 28 Apr 2019 19:06:04 +0200 Subject: [PATCH 1/4] Some tweak for wro4j 1.8 compatibility with Java 9+ --- spring-petclinic-api-gateway/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml index b179c8c4e..c2710dbd2 100644 --- a/spring-petclinic-api-gateway/pom.xml +++ b/spring-petclinic-api-gateway/pom.xml @@ -158,6 +158,12 @@ bootstrap ${webjars-bootstrap.version} + + + org.mockito + mockito-core + ${mockito.version} + From 0c0267088aae57f6b8348da8ca3fecc486a5d900 Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Sun, 28 Apr 2019 20:23:26 +0200 Subject: [PATCH 2/4] Upgrade maven-docker-plugin to version 1.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8314aff71..ae90f6e3e 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ 9090 ${basedir} v0.6.1 - 0.4.13 + 1.2.0 From 2c8131c056023f70138ed1eb6a186ffb78197e1d Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Sat, 4 May 2019 18:44:25 +0200 Subject: [PATCH 3/4] Switch to Java 11 --- .gitignore | 3 +++ docker-compose.yml | 14 +++++++------- docker/Dockerfile | 4 ++-- spring-petclinic-api-gateway/pom.xml | 3 ++- spring-petclinic-discovery-server/pom.xml | 6 ++++++ 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 098818e4f..3b29741b0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ target/ !.mvn/wrapper/maven-wrapper.jar +# Jenv +.java-version + # Eclipse .settings/ .classpath diff --git a/docker-compose.yml b/docker-compose.yml index 2fffc3ebe..ae6bc751a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: mem_limit: 512M depends_on: - config-server - entrypoint: ["./dockerize","-wait=tcp://config-server:8888","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] + entrypoint: ["./dockerize","-wait=tcp://config-server:8888","-timeout=60s","--","java", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] ports: - 8761:8761 @@ -25,7 +25,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] ports: - 8081:8081 @@ -36,7 +36,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] ports: - 8082:8082 @@ -47,7 +47,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] ports: - 8083:8083 @@ -58,7 +58,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] ports: - 8080:8080 @@ -78,7 +78,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] ports: - 9090:9090 @@ -89,7 +89,7 @@ services: depends_on: - config-server - discovery-server - entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] + entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] ports: - 7979:7979 diff --git a/docker/Dockerfile b/docker/Dockerfile index 00b01670f..172d21355 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-alpine +FROM openjdk:11-jre VOLUME /tmp ARG DOCKERIZE_VERSION ARG ARTIFACT_NAME @@ -11,4 +11,4 @@ RUN chmod +x dockerize ADD ${ARTIFACT_NAME}.jar /app.jar RUN touch /app.jar EXPOSE ${EXPOSED_PORT} -ENTRYPOINT ["java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml index c2710dbd2..4c9aa09f1 100644 --- a/spring-petclinic-api-gateway/pom.xml +++ b/spring-petclinic-api-gateway/pom.xml @@ -158,7 +158,8 @@ bootstrap ${webjars-bootstrap.version} - + + org.mockito mockito-core diff --git a/spring-petclinic-discovery-server/pom.xml b/spring-petclinic-discovery-server/pom.xml index 1049dbeb9..7ef53e766 100644 --- a/spring-petclinic-discovery-server/pom.xml +++ b/spring-petclinic-discovery-server/pom.xml @@ -48,6 +48,12 @@ junit-jupiter-engine test + + + + org.glassfish.jaxb + jaxb-runtime + From 20a1c5359533aac8a33f7cc299ac2b33f3f039b3 Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Sun, 5 May 2019 18:34:57 +0200 Subject: [PATCH 4/4] Use the springcommunity Docker Hub organization --- docker-compose.yml | 16 ++++++++-------- pom.xml | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ae6bc751a..b81798915 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,14 +2,14 @@ version: '2' services: config-server: - image: mszarlinski/spring-petclinic-config-server + image: springcommunity/spring-petclinic-config-server container_name: config-server mem_limit: 512M ports: - 8888:8888 discovery-server: - image: mszarlinski/spring-petclinic-discovery-server + image: springcommunity/spring-petclinic-discovery-server container_name: discovery-server mem_limit: 512M depends_on: @@ -19,7 +19,7 @@ services: - 8761:8761 customers-service: - image: mszarlinski/spring-petclinic-customers-service + image: springcommunity/spring-petclinic-customers-service container_name: customers-service mem_limit: 512M depends_on: @@ -30,7 +30,7 @@ services: - 8081:8081 visits-service: - image: mszarlinski/spring-petclinic-visits-service + image: springcommunity/spring-petclinic-visits-service container_name: visits-service mem_limit: 512M depends_on: @@ -41,7 +41,7 @@ services: - 8082:8082 vets-service: - image: mszarlinski/spring-petclinic-vets-service + image: springcommunity/spring-petclinic-vets-service container_name: vets-service mem_limit: 512M depends_on: @@ -52,7 +52,7 @@ services: - 8083:8083 api-gateway: - image: mszarlinski/spring-petclinic-api-gateway + image: springcommunity/spring-petclinic-api-gateway container_name: api-gateway mem_limit: 512M depends_on: @@ -72,7 +72,7 @@ services: - 9411:9411 admin-server: - image: mszarlinski/spring-petclinic-admin-server + image: springcommunity/spring-petclinic-admin-server container_name: admin-server mem_limit: 512M depends_on: @@ -83,7 +83,7 @@ services: - 9090:9090 hystrix-dashboard: - image: mszarlinski/spring-petclinic-hystrix-dashboard + image: springcommunity/spring-petclinic-hystrix-dashboard container_name: hystrix-dashboard mem_limit: 512M depends_on: diff --git a/pom.xml b/pom.xml index ae90f6e3e..19f5b5b76 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 2.22.0 - mszarlinski + springcommunity 9090 ${basedir} v0.6.1 @@ -154,6 +154,8 @@ ${docker.image.prefix}/${project.artifactId} ${docker.image.dockerfile.dir} + docker-hub + https://index.docker.io/v1/ /