diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 45647c1e6..69983369f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -35,14 +35,14 @@ jobs: inputs: secureFile: 'pkcs12_truststore' - task: Maven@3 - displayName: 'Maven build jre12' + displayName: 'Maven build jre13' inputs: mavenPomFile: 'pom.xml' - goals: 'clean -Dmssql_jdbc_test_connection_properties=jdbc:sqlserver://$(Target_SQL)$(server_domain);$(database);$(user);$(password); install -Pjre12 -DuserNTLM=$(userNTLM) -DpasswordNTLM=$(passwordNTLM) -DdomainNTLM=$(domainNTLM) -DexcludedGroups=$(Ex_Groups) -Dpkcs12_truststore_password=$(pkcs12_truststore_password) -Dpkcs12_truststore=$(pkcs12_truststore.secureFilePath)' + goals: 'clean -Dmssql_jdbc_test_connection_properties=jdbc:sqlserver://$(Target_SQL)$(server_domain);$(database);$(user);$(password); install -Pjre13 -DuserNTLM=$(userNTLM) -DpasswordNTLM=$(passwordNTLM) -DdomainNTLM=$(domainNTLM) -DexcludedGroups=$(Ex_Groups) -Dpkcs12_truststore_password=$(pkcs12_truststore_password) -Dpkcs12_truststore=$(pkcs12_truststore.secureFilePath)' testResultsFiles: '**/TEST-*.xml' - testRunTitle: 'Maven build jre12' + testRunTitle: 'Maven build jre13' javaHomeOption: Path - jdkDirectory: $(JDK12) + jdkDirectory: $(JDK13) - task: Maven@3 displayName: 'Maven build jre11' inputs: @@ -51,7 +51,7 @@ jobs: testResultsFiles: '**/TEST-*.xml' testRunTitle: 'Maven build jre11' javaHomeOption: Path - jdkDirectory: $(JDK12) + jdkDirectory: $(JDK13) - task: Maven@3 displayName: 'Maven build jre8' inputs: @@ -60,4 +60,4 @@ jobs: testResultsFiles: '**/TEST-*.xml' testRunTitle: 'Maven build jre8' javaHomeOption: Path - jdkDirectory: $(JDK12) + jdkDirectory: $(JDK13) diff --git a/build.gradle b/build.gradle index 2deb2a598..de92ea8a7 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: - * jre12 - - PS> gradle build - PS> gradle build -PbuildProfile=jre12 + * jre13 - - PS> gradle build + PS> gradle build -PbuildProfile=jre13 * jre11 - - PS> gradle build -PbuildProfile=jre11 * jre8 - - PS> gradle build -PbuildProfile=jre8 * @@ -35,17 +35,17 @@ test { } } -if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "jre12")){ +if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "jre13")){ - jreVersion = "jre12" + jreVersion = "jre13" excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java' jar { manifest { attributes 'Automatic-Module-Name': 'com.microsoft.sqlserver.jdbc' } } - sourceCompatibility = 12 - targetCompatibility = 12 + sourceCompatibility = 13 + targetCompatibility = 13 } if (hasProperty('buildProfile') && buildProfile == "jre11"){ diff --git a/pom.xml b/pom.xml index 0c4c4a729..9bc532a13 100644 --- a/pom.xml +++ b/pom.xml @@ -274,12 +274,12 @@ - jre12 + jre13 true - ${project.artifactId}-${project.version}.jre12-preview + ${project.artifactId}-${project.version}.jre13-preview org.apache.maven.plugins @@ -289,8 +289,8 @@ **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java - 12 - 12 + 13 + 13