Skip to content

Commit

Permalink
- Update Agroal from version 1.3 to 1.4 (fixes intermittent test fail…
Browse files Browse the repository at this point in the history
…ure)

- Changes to make sure a module's tests run before publishing any of its artifacts.  Ideally this would also make sure that a module's artifact would not be published before the tests for all modules are run; however, having trouble getting that to work (Gradle init timing?)
  • Loading branch information
sebersole committed Apr 3, 2019
1 parent b71f161 commit 0a2201d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 1 addition & 3 deletions build.gradle
Expand Up @@ -49,15 +49,13 @@ allprojects {
}
}
apply plugin: 'idea'
apply plugin: 'eclipse'

// minimize changes, at least for now (gradle uses 'build' by default)..
buildDir = "target"

apply from: rootProject.file( 'gradle/base-information.gradle' )

apply plugin: 'idea'
apply plugin: 'eclipse'

}


Expand Down
4 changes: 2 additions & 2 deletions gradle/libraries.gradle
Expand Up @@ -150,8 +150,8 @@ ext {
proxool: "proxool:proxool:0.8.3",
hikaricp: "com.zaxxer:HikariCP:3.2.0",
vibur: "org.vibur:vibur-dbcp:22.2",
agroal_api: "io.agroal:agroal-api:1.3",
agroal_pool: "io.agroal:agroal-pool:1.3",
agroal_api: "io.agroal:agroal-api:1.4",
agroal_pool: "io.agroal:agroal-pool:1.4",

atomikos: "com.atomikos:transactions:4.0.6",
atomikos_jta: "com.atomikos:transactions-jta:4.0.6",
Expand Down
6 changes: 6 additions & 0 deletions gradle/published-java-module.gradle
Expand Up @@ -171,3 +171,9 @@ task ciBuild( dependsOn: [test, publish] )

task release( dependsOn: [test, bintrayUpload] )

afterEvaluate { Project project ->
project.rootProject.subprojects { Project subproject ->
// NOTE : we want this even when `project == subproject`
project.tasks.bintrayUpload.dependsOn( subproject.tasks.build )
}
}

0 comments on commit 0a2201d

Please sign in to comment.