From f8288ad4315e4fa9d216594971a0a7adb67f64c2 Mon Sep 17 00:00:00 2001
From: Craig Cook <craig.cook@code.red>
Date: Thu, 14 Sep 2017 11:56:34 +0100
Subject: [PATCH] Added travis beanstalk deploy back

---
 .travis.yml                               | 26 +++++++++++------------
 src/main/resources/application.properties | 13 ++++++++----
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 86aa03f..0451c6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ cache:
 
 before_install:
   - sudo apt-get install jq
-  - chmod +x scripts/JMeterInstaller.py
-  - python scripts/JMeterInstaller.py
+#  - chmod +x scripts/JMeterInstaller.py
+#  - python scripts/JMeterInstaller.py
   - wget -O ~/codacy-coverage-reporter-assembly-latest.jar $(curl https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r .assets[0].browser_download_url)
 
 env: JMETER_PATH=./
@@ -19,22 +19,22 @@ env: JMETER_PATH=./
 jobs:
   include:
     - stage: test
-      script: mvn test cobertura:cobertura coveralls:cobertura && java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r target/site/cobertura/coverage.xml
+      script: mvn test cobertura:cobertura coveralls:cobertura && java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l java -r target/site/cobertura/coverage.xml
 #    - stage: publish artifact
 #      script: mvn -s .travis.settings.xml deploy
 #      skip_cleanup: true
 #    - stage: deploy to test
 #      script: mvn package
-#      deploy:
-#        provider: elasticbeanstalk
-#        skip_cleanup: true
-#        zip_file: target/movie-service.jar
-#        access_key_id: $AWS_ACCESS_KEY_ID
-#        secret_access_key: $AWS_SECRET_ACCESS_KEY
-#        bucket_name: $AWS_BUCKET_NAME
-#        region: "eu-west-2"
-#        app: "movie-service"
-#        env: "movie-service-test"
+      deploy:
+        provider: elasticbeanstalk
+        skip_cleanup: true
+        zip_file: target/movie-service.jar
+        access_key_id: $AWS_ACCESS_KEY_ID
+        secret_access_key: $AWS_SECRET_ACCESS_KEY
+        bucket_name: $AWS_BUCKET_NAME
+        region: "eu-west-2"
+        app: "movie-service"
+        env: "movie-service-test"
 #    - stage: performance test
 #      script:
 #        - rm -rf results && mkdir results
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index bf310ed..6be2cf8 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -3,7 +3,12 @@ spring.data.rest.basePath=/api
 #security.ignored=/**
 #security.basic.enable: false
 
-spring.jpa.hibernate.ddl-auto=create
-spring.datasource.url=jdbc:mysql://localhost:3306/movie_service
-spring.datasource.username=movieservice
-spring.datasource.password=password
+#spring.jpa.hibernate.ddl-auto=create
+#spring.datasource.url=jdbc:mysql://localhost:3306/movie_service
+#spring.datasource.username=movieservice
+#spring.datasource.password=password
+
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
+spring.datasource.username=sa
+spring.datasource.password=sa