Merge e82ef2f597a6aa063a19a67d4ec7055456b9b1cd into 700be64d6f52f449cd218a7217e93490be962246

.travis.yml

@@ -1,3 +1,8 @@
 language: java
 jdk:
-  - oraclejdk8
+  - oraclejdk8
+  - openjdk8
+cache:
+  directories:
+  - .autoconf
+  - $HOME/.m2

Dockerfile

@@ -0,0 +1,22 @@
+FROM maven:3-jdk-8-alpine as builder
+WORKDIR /app
+
+COPY pom.xml .
+RUN mvn dependency:go-offline \
+    -s /usr/share/maven/ref/settings-docker.xml
+
+COPY src ./src
+RUN mvn package \
+    -Dmaven.test.skip=true \
+    -s /usr/share/maven/ref/settings-docker.xml && \
+    mv target/dddsample*.jar target/dddsample.jar
+
+FROM java:8-jdk-alpine as runner
+EXPOSE 8080
+RUN adduser -S app 
+USER app
+WORKDIR /app
+
+COPY --from=builder /app/target/dddsample.jar /app/
+CMD ["java", "-jar", "dddsample.jar"] 
+

docker-compose.yml

@@ -0,0 +1,22 @@
+version: '3.6'
+services:
+    app:
+      build: .
+      restart: on-failure
+      ports:
+      - 8080
+      depends_on: 
+      - db
+      environment: 
+        hibernate.connection.driver_class: com.mysql.jdbc.Driver
+        hibernate.connection.url: jdbc:mysql://db/dddsample
+        hibernate.connection.username: dddsample
+        hibernate.connection.password: password
+    db:
+      image: mysql:5
+      environment: 
+        MYSQL_ROOT_PASSWORD: password
+        MYSQL_USER: dddsample
+        MYSQL_DATABASE: dddsample
+        MYSQL_PASSWORD: password
+

pom.xml

@@ -160,6 +160,11 @@
             <artifactId>selenium-java</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>6.0.6</version>
+        </dependency>
     </dependencies>
 
     <reporting>

src/main/resources/context-infrastructure-persistence.xml

@@ -9,10 +9,6 @@
 
   <!-- Persistence - database, Hibernate, transactions, repository implementations -->
 
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-    <property name="location" value="classpath:/jdbc.properties"/>
-  </bean>
-
   <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
     <property name="url" value="${hibernate.connection.url}"/>
     <property name="driverClassName" value="${hibernate.connection.driver_class}"/>
@@ -52,4 +48,4 @@
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>
 
-</beans>
+</beans>

src/main/resources/jdbc.properties

@@ -1,4 +0,0 @@
-hibernate.connection.driver_class=org.hsqldb.jdbcDriver
-hibernate.connection.url=jdbc:hsqldb:mem:dddsample
-hibernate.connection.username=sa
-hibernate.connection.password=