From 45dfbbc193e6c4206f8176d4e09d76855cbda7a7 Mon Sep 17 00:00:00 2001 From: ulvii Date: Thu, 17 Sep 2020 17:06:23 -0700 Subject: [PATCH 1/5] Introduced JAVA 15 support --- azure-pipelines.yml | 12 ++++++------ build.gradle | 12 ++++++------ pom.xml | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 18fac75e8..2c78b59aa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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: @@ -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: @@ -68,4 +68,4 @@ jobs: testResultsFiles: '**/TEST-*.xml' testRunTitle: 'Maven build jre8' javaHomeOption: Path - jdkDirectory: $(JDK14) + jdkDirectory: $(JDK15) diff --git a/build.gradle b/build.gradle index 10fb10ed2..d4004c8a1 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: - * 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 * @@ -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"){ diff --git a/pom.xml b/pom.xml index 1f54230fc..f976ccedf 100644 --- a/pom.xml +++ b/pom.xml @@ -316,12 +316,12 @@ - jre14 + jre15 true - ${project.artifactId}-${project.version}.jre14${releaseExt} + ${project.artifactId}-${project.version}.jre15${releaseExt} org.apache.maven.plugins @@ -331,8 +331,8 @@ **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java - 14 - 14 + 15 + 15 From 13dd273ef0c09337ea7b21d9062089438aac76c6 Mon Sep 17 00:00:00 2001 From: ulvii Date: Thu, 17 Sep 2020 18:18:44 -0700 Subject: [PATCH 2/5] Update bundle plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f976ccedf..f1446ec2b 100644 --- a/pom.xml +++ b/pom.xml @@ -439,7 +439,7 @@ org.apache.felix maven-bundle-plugin - 4.2.0 + 5.1.0 true From b78dac98e5a73a7a463a9235ccef4a3e758f30f8 Mon Sep 17 00:00:00 2001 From: ulvii Date: Thu, 17 Sep 2020 18:23:32 -0700 Subject: [PATCH 3/5] Update bundle plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1446ec2b..de2f592d6 100644 --- a/pom.xml +++ b/pom.xml @@ -439,7 +439,7 @@ org.apache.felix maven-bundle-plugin - 5.1.0 + 5.1.1 true From 586930290e85d8e040475a9bd5eaba078314232f Mon Sep 17 00:00:00 2001 From: ulvii Date: Thu, 17 Sep 2020 18:34:27 -0700 Subject: [PATCH 4/5] Update plugins --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index de2f592d6..ee4fef549 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 **/com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java @@ -261,7 +261,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.1 + 3.2.0 ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -271,7 +271,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M1 + 3.0.0-M5 ${excludedGroups}, xJDBC42 @@ -290,7 +290,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java @@ -302,7 +302,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.1 + 3.2.0 ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -326,7 +326,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java @@ -338,7 +338,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.1 + 3.2.0 ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -380,7 +380,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M2 + 3.0.0-M3 enforce-versions @@ -412,7 +412,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M1 + 3.0.0-M5 3 true @@ -466,7 +466,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.0 + 3.2.0 true mssql.googlecode.*:mssql.security.provider.MD4 @@ -483,7 +483,7 @@ org.codehaus.mojo versions-maven-plugin - 2.5 + 2.8.1 true outdated-dependencies.txt @@ -493,7 +493,7 @@ org.jacoco jacoco-maven-plugin - 0.8.5 + 0.8.6 pre-test @@ -540,17 +540,17 @@ org.apache.maven.plugins maven-resources-plugin - 3.1.0 + 3.2.0 org.apache.maven.plugins maven-site-plugin - 3.7.1 + 3.9.1 org.apache.maven maven-archiver - 3.4.0 + 3.5.0 From 468ff6eb24144c1c83c31018811fb4e3a5511a1e Mon Sep 17 00:00:00 2001 From: ulvii Date: Fri, 18 Sep 2020 12:31:13 -0700 Subject: [PATCH 5/5] Revert some of the plugins to previous version --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index ee4fef549..f0d868e0e 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.8.0 **/com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java @@ -261,7 +261,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.1.1 ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -271,7 +271,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.0.0-M1 ${excludedGroups}, xJDBC42 @@ -290,7 +290,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.8.0 **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java @@ -302,7 +302,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.1.1 ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -326,7 +326,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.8.0 **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java @@ -338,7 +338,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.1.1 ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -380,7 +380,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.0.0-M2 enforce-versions @@ -412,7 +412,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.0.0-M1 3 true @@ -466,7 +466,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.0.0 true mssql.googlecode.*:mssql.security.provider.MD4 @@ -483,7 +483,7 @@ org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.5 true outdated-dependencies.txt @@ -540,17 +540,17 @@ org.apache.maven.plugins maven-resources-plugin - 3.2.0 + 3.1.0 org.apache.maven.plugins maven-site-plugin - 3.9.1 + 3.7.1 org.apache.maven maven-archiver - 3.5.0 + 3.4.0