Skip to content
Permalink
Browse files
chore: include META-INF/services/java.sql.Driver for jre7 and jre6 jars
  • Loading branch information
vlsi committed Jun 3, 2020
1 parent bb3c5ca commit 5ca2b9e732022c1852b829227a303edff83a09fc
Showing 2 changed files with 8 additions and 6 deletions.
@@ -52,6 +52,10 @@ if (java6home.isNotBlank()) {
}
}

tasks.processResources {
from("${project(":postgresql").projectDir}/src/main/resources")
}

val preprocessMain by tasks.registering(JavaCommentPreprocessorTask::class) {
baseDir.set(project(":postgresql").projectDir)
sourceFolders.addAll("src/main/java", "src/main/version")
@@ -90,12 +94,6 @@ tasks.configureEach<JavaCommentPreprocessorTask> {
excludedPatterns.addAll("**/jre8/", "**/jdbc42/")
}

tasks.jar {
into("META-INF") {
from("$rootDir/LICENSE")
}
}

val osgiJar by tasks.registering(Bundle::class) {
archiveClassifier.set("osgi")
from(tasks.jar.map { zipTree(it.archiveFile) })
@@ -62,6 +62,10 @@ configure<JavaPluginConvention> {
targetCompatibility = JavaVersion.VERSION_1_7
}

tasks.processResources {
from("${project(":postgresql").projectDir}/src/main/resources")
}

val preprocessMain by tasks.registering(JavaCommentPreprocessorTask::class) {
baseDir.set(project(":postgresql").projectDir)
sourceFolders.addAll("src/main/java", "src/main/version")

0 comments on commit 5ca2b9e

Please sign in to comment.