Minor improvements and version bumps

This commit is contained in:
2017-07-02 08:37:43 +02:00
parent a245288359
commit a8addf946b
15 changed files with 25 additions and 31 deletions

View File

@ -10,14 +10,12 @@ uploadArchives {
}
}
sourceCompatibility = 1.8
dependencies {
compile project(':core')
compile 'org.flywaydb:flyway-core:4.1.2'
compile 'org.flywaydb:flyway-core:4.2.0'
testCompile 'junit:junit:4.12'
testCompile 'com.h2database:h2:1.4.194'
testCompile 'com.nhaarman:mockito-kotlin:1.4.0'
testCompile 'com.h2database:h2:1.4.196'
testCompile 'com.nhaarman:mockito-kotlin:1.5.0'
testCompile project(path: ':core', configuration: 'testArtifacts')
testCompile project(':cryptography-bc')
}

View File

@ -156,7 +156,7 @@ class JdbcInventory(config: JdbcConfig) : JdbcHelper(config), Inventory {
}
for (c in cache.values) {
c.entries.removeIf { e -> e.value < now - 5 * MINUTE }
c.entries.removeAll { e -> e.value < now - 5 * MINUTE }
}
}

View File

@ -235,7 +235,6 @@ class JdbcMessageRepository(private val config: JdbcConfig) : AbstractMessageRep
}
}
@Throws(SQLException::class, IOException::class)
private fun update(connection: Connection, message: Plaintext) {
connection.prepareStatement(
"UPDATE Message SET iv=?, type=?, sender=?, recipient=?, data=?, ack_data=?, sent=?, received=?, " +