Merge pull request #221 from zonkyio/mssql-2022

tomix26 · web-flow · commit bbe2ca6fd7dd · 2022-12-06T02:17:54.000+01:00
#209 Add support for Microsoft SQL Server 2022
diff --git a/accept-third-party-license.sh b/accept-third-party-license.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 {
+  echo "mcr.microsoft.com/mssql/server:2022-latest"
   echo "mcr.microsoft.com/mssql/server:2019-latest"
   echo "mcr.microsoft.com/mssql/server:2017-latest"
   echo "mcr.microsoft.com/mssql/server:2017-CU20"
diff --git a/build.gradle b/build.gradle
@@ -61,7 +61,8 @@ ext {
             ]],
             [name: 'mssql', versions: [
                     [name: '2017',  'mssql': '2017-latest',  'mssql-driver': 'default'],
-                    [name: '2019',  'mssql': '2019-latest',  'mssql-driver': 'default']
+                    [name: '2019',  'mssql': '2019-latest',  'mssql-driver': 'default'],
+                    [name: '2022',  'mssql': '2022-latest',  'mssql-driver': 'default']
             ]],
             [name: 'mysql', versions: [
                     [name: '5.7',  'mysql': '5.7',  'mysql-driver': 'default'],
diff --git a/embedded-database-spring-test/src/main/resources/META-INF/spring-configuration-metadata.json b/embedded-database-spring-test/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -337,6 +337,9 @@
     {
       "name": "zonky.test.database.mssql.docker.image",
       "values": [
+        {
+          "value": "mcr.microsoft.com/mssql/server:2022-latest"
+        },
         {
           "value": "mcr.microsoft.com/mssql/server:2019-latest"
         },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`	`3`	`{`
	`4`	`+ echo "mcr.microsoft.com/mssql/server:2022-latest"`
`4`	`5`	`echo "mcr.microsoft.com/mssql/server:2019-latest"`
`5`	`6`	`echo "mcr.microsoft.com/mssql/server:2017-latest"`
`6`	`7`	`echo "mcr.microsoft.com/mssql/server:2017-CU20"`
Original file line number	Diff line number	Diff line change
`@@ -337,6 +337,9 @@`
`337`	`337`	`{`
`338`	`338`	`"name": "zonky.test.database.mssql.docker.image",`
`339`	`339`	`"values": [`
	`340`	`+ {`
	`341`	`+ "value": "mcr.microsoft.com/mssql/server:2022-latest"`
	`342`	`+ },`
`340`	`343`	`{`
`341`	`344`	`"value": "mcr.microsoft.com/mssql/server:2019-latest"`
`342`	`345`	`},`