diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f75d832b8d..916cac5a4a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,15 +40,15 @@ jobs: inputs: secureFile: 'mssql-jdbc_auth-9.3.1.x64-preview.dll' - task: Maven@3 - displayName: 'Maven build jre15' + displayName: 'Maven build jre16' inputs: mavenPomFile: 'pom.xml' - goals: 'clean dependency:purge-local-repository -DdllPath=$(Agent.TempDirectory) -Dmssql_jdbc_test_connection_properties=jdbc:sqlserver://$(Target_SQL)$(server_domain);$(database);$(user);$(password); install -Pjre15 -DuserNTLM=$(userNTLM) -DpasswordNTLM=$(passwordNTLM) -DdomainNTLM=$(domainNTLM) -DexcludedGroups=$(Ex_Groups) -Dpkcs12_truststore_password=$(pkcs12_truststore_password) -Dpkcs12_truststore=$(pkcs12_truststore.secureFilePath) + goals: 'clean dependency:purge-local-repository -DdllPath=$(Agent.TempDirectory) -Dmssql_jdbc_test_connection_properties=jdbc:sqlserver://$(Target_SQL)$(server_domain);$(database);$(user);$(password); install -Pjre16 -DuserNTLM=$(userNTLM) -DpasswordNTLM=$(passwordNTLM) -DdomainNTLM=$(domainNTLM) -DexcludedGroups=$(Ex_Groups) -Dpkcs12_truststore_password=$(pkcs12_truststore_password) -Dpkcs12_truststore=$(pkcs12_truststore.secureFilePath) -DapplicationClientID=$(applicationClientID) -DapplicationKey=$(applicationKey) -DtenantID=$(tenantID) -DkeyID=$(keyID) -DwindowsKeyPath=$(windowsKeyPath) -DenclaveAttestationUrl=$(enclaveAttestationUrl) -DenclaveAttestationProtocol=$(enclaveAttestationProtocol) -DenclaveServer=$(enclaveServer)' testResultsFiles: '**/TEST-*.xml' - testRunTitle: 'Maven build jre15' + testRunTitle: 'Maven build jre16' javaHomeOption: Path - jdkDirectory: $(JDK15) + jdkDirectory: $(JDK16) - task: Maven@3 displayName: 'Maven build jre11' inputs: @@ -58,7 +58,7 @@ jobs: testResultsFiles: '**/TEST-*.xml' testRunTitle: 'Maven build jre11' javaHomeOption: Path - jdkDirectory: $(JDK15) + jdkDirectory: $(JDK16) - task: Maven@3 displayName: 'Maven build jre8' inputs: @@ -68,4 +68,4 @@ jobs: testResultsFiles: '**/TEST-*.xml' testRunTitle: 'Maven build jre8' javaHomeOption: Path - jdkDirectory: $(JDK15) + jdkDirectory: $(JDK16) diff --git a/build.gradle b/build.gradle index 2354fefef0..f8f1b0006d 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ **************************************************************** * Instruction for Building JDBC Driver: * For building particular version of the driver, use commands: - * jre15 - - PS> gradle build - PS> gradle build -PbuildProfile=jre15 + * jre16 - - PS> gradle build + PS> gradle build -PbuildProfile=jre16 * jre11 - - PS> gradle build -PbuildProfile=jre11 * jre8 - - PS> gradle build -PbuildProfile=jre8 * @@ -35,17 +35,17 @@ test { } } -if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "jre15")){ +if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "jre16")){ - jreVersion = "jre15" + jreVersion = "jre16" excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java' jar { manifest { attributes 'Automatic-Module-Name': 'com.microsoft.sqlserver.jdbc' } } - sourceCompatibility = 15 - targetCompatibility = 15 + sourceCompatibility = 16 + targetCompatibility = 16 } if (hasProperty('buildProfile') && buildProfile == "jre11"){ diff --git a/pom.xml b/pom.xml index 0215573f6b..879823a92f 100644 --- a/pom.xml +++ b/pom.xml @@ -322,12 +322,12 @@ - jre15 + jre16 true - ${project.artifactId}-${project.version}.jre15${releaseExt} + ${project.artifactId}-${project.version}.jre16${releaseExt} org.apache.maven.plugins @@ -337,8 +337,8 @@ **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java - 15 - 15 + 16 + 16