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 15 | Introduce JAVA 15 Support #1434

Merged
merged 5 commits into from Sep 21, 2020
Merged

JAVA 15 | Introduce JAVA 15 Support #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45dfbbc
Introduced JAVA 15 support
ulvii Sep 18, 2020
13dd273
Update bundle plugin
ulvii Sep 18, 2020
b78dac9
Update bundle plugin
ulvii Sep 18, 2020
5869302
Update plugins
ulvii Sep 18, 2020
468ff6e
Revert some of the plugins to previous version
ulvii Sep 18, 2020
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.1.0.x64-preview.dll'
- task: Maven@3
displayName: 'Maven build jre14'
displayName: 'Maven build jre15'
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 -Pjre14 -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 -Pjre15 -DuserNTLM=$(userNTLM) -DpasswordNTLM=$(passwordNTLM) -DdomainNTLM=$(domainNTLM) -DexcludedGroups=$(Ex_Groups) -Dpkcs12_truststore_password=$(pkcs12_truststore_password) -Dpkcs12_truststore=$(pkcs12_truststore.secureFilePath)
-DapplicationClientID=$(applicationClientID) -DapplicationKey=$(applicationKey) -DkeyID=$(keyID) -DwindowsKeyPath=$(windowsKeyPath) -DenclaveAttestationUrl=$(enclaveAttestationUrl) -DenclaveAttestationProtocol=$(enclaveAttestationProtocol) -DenclaveServer=$(enclaveServer)'
testResultsFiles: '**/TEST-*.xml'
testRunTitle: 'Maven build jre14'
testRunTitle: 'Maven build jre15'
javaHomeOption: Path
jdkDirectory: $(JDK14)
jdkDirectory: $(JDK15)
- 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: $(JDK14)
jdkDirectory: $(JDK15)
- 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: $(JDK14)
jdkDirectory: $(JDK15)
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:
* jre14 - - PS> gradle build
PS> gradle build -PbuildProfile=jre14
* jre15 - - PS> gradle build
PS> gradle build -PbuildProfile=jre15
* 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 == "jre14")){
if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "jre15")){

jreVersion = "jre14"
jreVersion = "jre15"
excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'
jar {
manifest {
attributes 'Automatic-Module-Name': 'com.microsoft.sqlserver.jdbc'
}
}
sourceCompatibility = 14
targetCompatibility = 14
sourceCompatibility = 15
targetCompatibility = 15
}

if (hasProperty('buildProfile') && buildProfile == "jre11"){
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Expand Up @@ -316,12 +316,12 @@
</build>
</profile>
<profile>
<id>jre14</id>
<id>jre15</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<finalName>${project.artifactId}-${project.version}.jre14${releaseExt}</finalName>
<finalName>${project.artifactId}-${project.version}.jre15${releaseExt}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -331,8 +331,8 @@
<excludes>
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
</excludes>
<source>14</source>
<target>14</target>
<source>15</source>
<target>15</target>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -439,7 +439,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>4.2.0</version>
<version>5.1.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down Expand Up @@ -493,7 +493,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<version>0.8.6</version>
<executions>
<execution>
<id>pre-test</id>
Expand Down