Skip to content

Commit 1f550f1

Browse files
authored
Java 16 support (#1579)
1 parent a71834c commit 1f550f1

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

azure-pipelines.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ jobs:
4040
inputs:
4141
secureFile: 'mssql-jdbc_auth-9.3.1.x64-preview.dll'
4242
- task: Maven@3
43-
displayName: 'Maven build jre15'
43+
displayName: 'Maven build jre16'
4444
inputs:
4545
mavenPomFile: 'pom.xml'
46-
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)
46+
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)
4747
-DapplicationClientID=$(applicationClientID) -DapplicationKey=$(applicationKey) -DtenantID=$(tenantID) -DkeyID=$(keyID) -DwindowsKeyPath=$(windowsKeyPath) -DenclaveAttestationUrl=$(enclaveAttestationUrl) -DenclaveAttestationProtocol=$(enclaveAttestationProtocol) -DenclaveServer=$(enclaveServer)'
4848
testResultsFiles: '**/TEST-*.xml'
49-
testRunTitle: 'Maven build jre15'
49+
testRunTitle: 'Maven build jre16'
5050
javaHomeOption: Path
51-
jdkDirectory: $(JDK15)
51+
jdkDirectory: $(JDK16)
5252
- task: Maven@3
5353
displayName: 'Maven build jre11'
5454
inputs:
@@ -58,7 +58,7 @@ jobs:
5858
testResultsFiles: '**/TEST-*.xml'
5959
testRunTitle: 'Maven build jre11'
6060
javaHomeOption: Path
61-
jdkDirectory: $(JDK15)
61+
jdkDirectory: $(JDK16)
6262
- task: Maven@3
6363
displayName: 'Maven build jre8'
6464
inputs:
@@ -68,4 +68,4 @@ jobs:
6868
testResultsFiles: '**/TEST-*.xml'
6969
testRunTitle: 'Maven build jre8'
7070
javaHomeOption: Path
71-
jdkDirectory: $(JDK15)
71+
jdkDirectory: $(JDK16)

build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
****************************************************************
44
* Instruction for Building JDBC Driver:
55
* For building particular version of the driver, use commands:
6-
* jre15 - - PS> gradle build
7-
PS> gradle build -PbuildProfile=jre15
6+
* jre16 - - PS> gradle build
7+
PS> gradle build -PbuildProfile=jre16
88
* jre11 - - PS> gradle build -PbuildProfile=jre11
99
* jre8 - - PS> gradle build -PbuildProfile=jre8
1010
*
@@ -35,17 +35,17 @@ test {
3535
}
3636
}
3737

38-
if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "jre15")){
38+
if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "jre16")){
3939

40-
jreVersion = "jre15"
40+
jreVersion = "jre16"
4141
excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'
4242
jar {
4343
manifest {
4444
attributes 'Automatic-Module-Name': 'com.microsoft.sqlserver.jdbc'
4545
}
4646
}
47-
sourceCompatibility = 15
48-
targetCompatibility = 15
47+
sourceCompatibility = 16
48+
targetCompatibility = 16
4949
}
5050

5151
if (hasProperty('buildProfile') && buildProfile == "jre11"){

pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,12 @@
322322
</build>
323323
</profile>
324324
<profile>
325-
<id>jre15</id>
325+
<id>jre16</id>
326326
<activation>
327327
<activeByDefault>true</activeByDefault>
328328
</activation>
329329
<build>
330-
<finalName>${project.artifactId}-${project.version}.jre15${releaseExt}</finalName>
330+
<finalName>${project.artifactId}-${project.version}.jre16${releaseExt}</finalName>
331331
<plugins>
332332
<plugin>
333333
<groupId>org.apache.maven.plugins</groupId>
@@ -337,8 +337,8 @@
337337
<excludes>
338338
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
339339
</excludes>
340-
<source>15</source>
341-
<target>15</target>
340+
<source>16</source>
341+
<target>16</target>
342342
</configuration>
343343
</plugin>
344344
<plugin>

0 commit comments

Comments
 (0)