Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Java 16 support #1579

Merged
merged 9 commits into from May 12, 2021
Merged

Java 16 support #1579

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e76aba
Merge pull request #1471 from microsoft/dev
ulvii Dec 3, 2020
66ee808
Merge dev to master for 9.2.0 release (#1506)
peterbae Jan 29, 2021
fe225c5
merged
lilgreenbird May 1, 2021
96d6f32
Merge remote-tracking branch 'upstream/dev' into dev
lilgreenbird May 4, 2021
7bb59ed
update to jre16
lilgreenbird May 7, 2021
b9a6608
Merge remote-tracking branch 'upstream/dev' into java16
lilgreenbird May 8, 2021
4024295
JDK16
lilgreenbird May 11, 2021
e7f4237
update maven surefire plugin
lilgreenbird May 12, 2021
60c36dd
surefire plugin back to 3.0.0-M1
lilgreenbird May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions azure-pipelines.yml
View file
Open in desktop
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -68,4 +68,4 @@ jobs:
testResultsFiles: '**/TEST-*.xml'
testRunTitle: 'Maven build jre8'
javaHomeOption: Path
jdkDirectory: $(JDK15)
jdkDirectory: $(JDK16)
12 changes: 6 additions & 6 deletions build.gradle
View file
Open in desktop
Expand Up @@ -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
*
Expand Down Expand Up @@ -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"){
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Expand Up @@ -322,12 +322,12 @@
</build>
</profile>
<profile>
<id>jre15</id>
<id>jre16</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<finalName>${project.artifactId}-${project.version}.jre15${releaseExt}</finalName>
<finalName>${project.artifactId}-${project.version}.jre16${releaseExt}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -337,8 +337,8 @@
<excludes>
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
</excludes>
<source>15</source>
<target>15</target>
<source>16</source>
<target>16</target>
</configuration>
</plugin>
<plugin>
Expand Down