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..b81798915 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,63 +2,63 @@ 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:
- 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
customers-service:
- image: mszarlinski/spring-petclinic-customers-service
+ image: springcommunity/spring-petclinic-customers-service
container_name: customers-service
mem_limit: 512M
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
visits-service:
- image: mszarlinski/spring-petclinic-visits-service
+ image: springcommunity/spring-petclinic-visits-service
container_name: visits-service
mem_limit: 512M
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
vets-service:
- image: mszarlinski/spring-petclinic-vets-service
+ image: springcommunity/spring-petclinic-vets-service
container_name: vets-service
mem_limit: 512M
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
api-gateway:
- image: mszarlinski/spring-petclinic-api-gateway
+ image: springcommunity/spring-petclinic-api-gateway
container_name: api-gateway
mem_limit: 512M
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
@@ -72,24 +72,24 @@ 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:
- 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
hystrix-dashboard:
- image: mszarlinski/spring-petclinic-hystrix-dashboard
+ image: springcommunity/spring-petclinic-hystrix-dashboard
container_name: hystrix-dashboard
mem_limit: 512M
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/pom.xml b/pom.xml
index 8314aff71..19f5b5b76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,11 +36,11 @@
2.22.0
- mszarlinski
+ springcommunity
9090
${basedir}
v0.6.1
- 0.4.13
+ 1.2.0
@@ -154,6 +154,8 @@
${docker.image.prefix}/${project.artifactId}
${docker.image.dockerfile.dir}
+ docker-hub
+ https://index.docker.io/v1/
/
diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml
index b179c8c4e..4c9aa09f1 100644
--- a/spring-petclinic-api-gateway/pom.xml
+++ b/spring-petclinic-api-gateway/pom.xml
@@ -158,6 +158,13 @@
bootstrap
${webjars-bootstrap.version}
+
+
+
+ org.mockito
+ mockito-core
+ ${mockito.version}
+
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
+