From 7204eaf0b3cf46fefc2439b6cef09872ee51e2ec Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@pivotal.io>
Date: Mon, 21 Jan 2019 11:39:11 +0100
Subject: [PATCH] DATAJDBC-320 - Removed container-license-acceptance.txt.

This file accepted the license condition of Microsoft for there Docker image when running tests.
Very likely without the person using this knowing that she is accepting a license.
The file now has to be explicitly provided.

The Travis CI build adds the container-license-acceptance.txt for the build only.
---
 .gitignore                                                | 3 +++
 .travis.yml                                               | 1 +
 spring-data-jdbc/README.adoc                              | 8 ++++++++
 .../src/test/resources/container-license-acceptance.txt   | 1 -
 4 files changed, 12 insertions(+), 1 deletion(-)
 delete mode 100644 spring-data-jdbc/src/test/resources/container-license-acceptance.txt

diff --git a/.gitignore b/.gitignore
index 646c021fa..f826ac141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ target/
 .sonar4clipse
 *.sonar4clipseExternals
 *.graphml
+
+#prevent license accapting file to get accidentially commited to git
+container-license-acceptance.txt
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index fd4d0e511..d3ed4506d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,5 +27,6 @@ services:
 install: true
 
 script:
+  - "echo 'microsoft/mssql-server-linux:2017-CU6' > spring-data-jdbc/src/test/resources/container-license-acceptance.txt"
   - "mvn -version"
   - "mvn clean dependency:list test -Pall-dbs${NO_JACOCO:+',no-jacoco'} -Dsort -U"
diff --git a/spring-data-jdbc/README.adoc b/spring-data-jdbc/README.adoc
index a5c97f97f..da253798c 100644
--- a/spring-data-jdbc/README.adoc
+++ b/spring-data-jdbc/README.adoc
@@ -62,6 +62,14 @@ Currently the following _databasetypes_ are available:
 * mysql
 * postgres
 * mariadb
+* mssql
+
+Testing with Microsoft SQL Server requires you to accept the EULA of the Microsoft SQL Server Docker image, so the build may download and run it for you.
+In order to accept the EULA please add a file named `container-license-acceptance.txt` to the classpath, i.e. `src/test/resources` with the content:
+
+```
+microsoft/mssql-server-linux:2017-CU6
+```
 
 === Run tests with all databases
 
diff --git a/spring-data-jdbc/src/test/resources/container-license-acceptance.txt b/spring-data-jdbc/src/test/resources/container-license-acceptance.txt
deleted file mode 100644
index b546fb081..000000000
--- a/spring-data-jdbc/src/test/resources/container-license-acceptance.txt
+++ /dev/null
@@ -1 +0,0 @@
-microsoft/mssql-server-linux:2017-CU6
\ No newline at end of file