From df1a427c216ce523ed58f743c40ca032c4b8cf60 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Fri, 5 Oct 2018 11:37:24 -0700 Subject: [PATCH 1/5] Promote jre10 driver jars to jre11 build --- .travis.yml | 2 +- build.gradle | 9 +++++---- pom.xml | 14 ++++++++++---- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a4299131..af4616342 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: java jdk: - - oraclejdk10 + - oraclejdk11 services: - docker diff --git a/build.gradle b/build.gradle index 466f95655..a84afc2a0 100644 --- a/build.gradle +++ b/build.gradle @@ -27,15 +27,15 @@ allprojects { if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "build43")){ - jreVersion = "jre10-preview" + jreVersion = "jre11-preview" excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java' jar { manifest { attributes 'Automatic-Module-Name': 'com.microsoft.sqlserver.jdbc' } } - sourceCompatibility = 10 - targetCompatibility = 10 + sourceCompatibility = 11 + targetCompatibility = 11 } if((hasProperty('buildProfile') && buildProfile == "build42")) { @@ -95,5 +95,6 @@ dependencies { 'org.junit.jupiter:junit-jupiter-api:5.3.1', 'org.junit.jupiter:junit-jupiter-engine:5.3.1', 'com.zaxxer:HikariCP:3.2.0', - 'org.apache.commons:commons-dbcp2:2.5.0' + 'org.apache.commons:commons-dbcp2:2.5.0', + 'org.slf4j:slf4j-nop:1.7.25' } diff --git a/pom.xml b/pom.xml index aba903790..acf4112d4 100644 --- a/pom.xml +++ b/pom.xml @@ -130,8 +130,14 @@ 2.5.0 test + + org.slf4j + slf4j-nop + 1.7.25 + test + - + build42 @@ -202,7 +208,7 @@ true - ${project.artifactId}-${project.version}.jre10-preview + ${project.artifactId}-${project.version}.jre11-preview org.apache.maven.plugins @@ -212,8 +218,8 @@ **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java - 10 - 10 + 11 + 11 From d5160a77d5072378f47b7b90040734ee5ff7a146 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra Date: Fri, 5 Oct 2018 11:39:26 -0700 Subject: [PATCH 2/5] Update enforced Java version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index acf4112d4..9f4e2447b 100644 --- a/pom.xml +++ b/pom.xml @@ -322,7 +322,7 @@ 3.0.5 - 10 + 11 From dc3b52011ae449758ae6c6b6ab3ee6e116fcd01f Mon Sep 17 00:00:00 2001 From: Cheena Malholtra Date: Thu, 25 Oct 2018 16:59:00 -0700 Subject: [PATCH 3/5] Disable Appveyor build and test scripts for now --- appveyor.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6ab08769c..9a31a6426 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,13 +27,13 @@ install: cache: - C:\Users\appveyor\.m2 -> pom.xml -build_script: - - keytool -importkeystore -srckeystore cert.pfx -srcstoretype pkcs12 -destkeystore clientcert.jks -deststoretype JKS -srcstorepass password -deststorepass password - - keytool -list -v -keystore clientcert.jks -storepass "password" > JavaKeyStore.txt - - cd.. - - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild43 - - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild42 - -test_script: - - mvn test -B -Pbuild43 - - mvn test -B -Pbuild42 +# Disable build and test scripts till Java 11 is supported +# build_script: +# - keytool -importkeystore -srckeystore cert.pfx -srcstoretype pkcs12 -destkeystore clientcert.jks -deststoretype JKS -srcstorepass password -deststorepass password +# - keytool -list -v -keystore clientcert.jks -storepass "password" > JavaKeyStore.txt +# - cd.. +# - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild43 +# - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild42 +# test_script: +# - mvn test -B -Pbuild43 +# - mvn test -B -Pbuild42 From a736be48f5faabe1b9bee58ec26f9e4bae00f5b0 Mon Sep 17 00:00:00 2001 From: Cheena Malholtra Date: Thu, 25 Oct 2018 17:01:51 -0700 Subject: [PATCH 4/5] Update Readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 375137e46..2f41f4266 100644 --- a/README.md +++ b/README.md @@ -36,14 +36,14 @@ What's coming next? We will look into adding a more comprehensive set of tests, ## Build ### Prerequisites -* Java 10 +* Java 11 * [Maven](http://maven.apache.org/download.cgi) * An instance of SQL Server or Azure SQL Database that you can connect to. ### Build the JAR files Maven builds automatically trigger a set of verification tests to run. For these tests to pass, you will first need to add an environment variable in your system called `mssql_jdbc_test_connection_properties` to provide the [correct connection properties](https://docs.microsoft.com/en-us/sql/connect/jdbc/building-the-connection-url) for your SQL Server or Azure SQL Database instance. -To build the jar files, you must use Java 10 with Maven. You can choose to build a JDBC 4.3 compliant jar file (for use with JRE 10) and/or a JDBC 4.2 compliant jar file (for use with JRE 8). +To build the jar files, you must use Java 11 with Maven. You can choose to build a JDBC 4.3 compliant jar file (for use with JRE 11) and/or a JDBC 4.2 compliant jar file (for use with JRE 8). * Maven: 1. If you have not already done so, add the environment variable `mssql_jdbc_test_connection_properties` in your system with the connection properties for your SQL Server or SQL DB instance. From 3480e47311ccf3e8364b4b92c700f2459dd75441 Mon Sep 17 00:00:00 2001 From: Cheena Malholtra Date: Fri, 26 Oct 2018 10:26:43 -0700 Subject: [PATCH 5/5] Update Appveyor --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9a31a6426..3e70b718b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,9 +28,9 @@ cache: - C:\Users\appveyor\.m2 -> pom.xml # Disable build and test scripts till Java 11 is supported -# build_script: -# - keytool -importkeystore -srckeystore cert.pfx -srcstoretype pkcs12 -destkeystore clientcert.jks -deststoretype JKS -srcstorepass password -deststorepass password -# - keytool -list -v -keystore clientcert.jks -storepass "password" > JavaKeyStore.txt +build_script: + - keytool -importkeystore -srckeystore cert.pfx -srcstoretype pkcs12 -destkeystore clientcert.jks -deststoretype JKS -srcstorepass password -deststorepass password + - keytool -list -v -keystore clientcert.jks -storepass "password" > JavaKeyStore.txt # - cd.. # - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild43 # - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild42