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.

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

Update dependencies versions and to upgrade Gradle version 7 #1627

Merged
merged 3 commits into from Aug 3, 2021
Merged
Changes from 2 commits
Commits
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
45 changes: 27 additions & 18 deletions build.gradle
Expand Up @@ -78,8 +78,8 @@ if(hasProperty('buildProfile') && buildProfile == "jre8") {
jar.archiveFileName = "${archivesBaseName}-${version}.${jreVersion}.jar"
jar {
manifest {
attributes 'Title': "Microsoft JDBC Driver ${version} for SQL Server",
'Version': version,
attributes 'Title': "Microsoft JDBC Driver ${archiveVersion} for SQL Server",
'Version': archiveVersion,
'Vendor': 'Microsoft Corporation'
}
}
Expand All @@ -96,27 +96,36 @@ sourceSets {
}
test {
resources {
srcDirs "src/test/resources", "AE_Certificates"
srcDirs "AE_Certificates"
lilgreenbird marked this conversation as resolved.
Show resolved Hide resolved
output.resourcesDir = testOutputDir
}
}
}
task copyFiles(type: Copy) {
dependsOn "processTestResources"
from 'build/resources/test'
into 'build/classes/java/test'
include '**/*.*'
}
test {
dependsOn "copyFiles"
}

//Get dependencies from Maven central repository
repositories {
mavenCentral()
}

dependencies {
compile 'org.osgi:org.osgi.core:6.0.0',
implementation 'org.osgi:org.osgi.core:6.0.0',
'org.osgi:org.osgi.compendium:5.0.0'
compileOnly 'com.azure:azure-security-keyvault-keys:4.2.1',
'com.azure:azure-identity:1.1.3',
'org.antlr:antlr4-runtime:4.7.2',
'com.google.code.gson:gson:2.8.6',
'org.bouncycastle:bcprov-jdk15on:1.65',
'org.bouncycastle:bcpkix-jdk15on:1.65'
testCompile 'org.junit.platform:junit-platform-console:1.5.2',
compileOnly 'com.azure:azure-security-keyvault-keys:4.2.8',
'com.azure:azure-identity:1.3.3',
'org.antlr:antlr4-runtime:4.9.2',
'com.google.code.gson:gson:2.8.7',
'org.bouncycastle:bcprov-jdk15on:1.69',
'org.bouncycastle:bcpkix-jdk15on:1.69'
testImplementation 'org.junit.platform:junit-platform-console:1.5.2',
'org.junit.platform:junit-platform-commons:1.5.2',
'org.junit.platform:junit-platform-engine:1.5.2',
'org.junit.platform:junit-platform-launcher:1.5.2',
Expand All @@ -127,13 +136,13 @@ dependencies {
'org.junit.jupiter:junit-jupiter-params:5.6.0',
'com.zaxxer:HikariCP:3.4.2',
'org.apache.commons:commons-dbcp2:2.7.0',
'org.slf4j:slf4j-nop:1.7.29',
'org.antlr:antlr4-runtime:4.7.2',
'org.slf4j:slf4j-nop:1.7.30',
'org.antlr:antlr4-runtime:4.9.2',
'org.eclipse.gemini.blueprint:gemini-blueprint-mock:2.1.0.RELEASE',
'com.google.code.gson:gson:2.8.6',
'org.bouncycastle:bcprov-jdk15on:1.65',
'com.azure:azure-security-keyvault-keys:4.2.1',
'com.azure:azure-identity:1.1.3',
'com.microsoft.azure:adal4j:1.6.5',
'com.google.code.gson:gson:2.8.7',
'org.bouncycastle:bcprov-jdk15on:1.69',
'com.azure:azure-security-keyvault-keys:4.2.8',
'com.azure:azure-identity:1.3.3',
'com.microsoft.azure:adal4j:1.6.7',
'com.h2database:h2:1.4.200'
}