Skip to content
This repository was archived by the owner on Feb 22, 2026. It is now read-only.

Commit 3e65e23

Browse files
jentfoojentfoo
committed
0.16 Release with dependency updates including threadly 7.0
This allows this JDBC driver to function with JDK 17, but now requires java 11 or newer.
1 parent 3df81c9 commit 3e65e23

11 files changed

Lines changed: 230 additions & 185 deletions

File tree

‎.classpath‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,27 @@
1515
</classpathentry>
1616
<classpathentry combineaccessrules="false" kind="src" path="/threadly"/>
1717
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
18-
<classpathentry kind="lib" path="arcCommon/build/dependencies/hamcrest-core-1.3.jar"/>
19-
<classpathentry kind="lib" path="arcCommon/build/dependencies/logback-classic-1.2.3.jar"/>
20-
<classpathentry kind="lib" path="arcCommon/build/dependencies/logback-core-1.2.3.jar"/>
21-
<classpathentry kind="lib" path="arcCommon/build/dependencies/objenesis-2.6.jar"/>
22-
<classpathentry kind="lib" path="arcCommon/build/dependencies/slf4j-api-1.7.25.jar"/>
23-
<classpathentry kind="lib" path="arcCommon/build/dependencies/byte-buddy-1.10.5.jar"/>
24-
<classpathentry kind="lib" path="arcCommon/build/dependencies/byte-buddy-agent-1.10.5.jar"/>
2518
<classpathentry combineaccessrules="false" kind="src" path="/threadly-test"/>
26-
<classpathentry kind="lib" path="build/dependencies/jdbi3-core-3.12.2.jar"/>
27-
<classpathentry kind="lib" path="build/dependencies/jdbi3-sqlobject-3.12.2.jar"/>
28-
<classpathentry kind="lib" path="arcCommon/build/dependencies/antlr4-runtime-4.7.2.jar"/>
29-
<classpathentry kind="lib" path="arcCommon/build/dependencies/caffeine-2.8.0.jar"/>
30-
<classpathentry kind="lib" path="arcCommon/build/dependencies/geantyref-1.3.7.jar"/>
19+
<classpathentry kind="lib" path="arcCommon/build/dependencies/antlr4-runtime-4.9.2.jar"/>
20+
<classpathentry kind="lib" path="arcCommon/build/dependencies/byte-buddy-1.12.7.jar"/>
21+
<classpathentry kind="lib" path="arcCommon/build/dependencies/byte-buddy-agent-1.12.7.jar"/>
22+
<classpathentry kind="lib" path="arcCommon/build/dependencies/caffeine-3.0.3.jar"/>
3123
<classpathentry kind="lib" path="arcCommon/build/dependencies/commons-math3-3.2.jar"/>
32-
<classpathentry kind="lib" path="arcCommon/build/dependencies/jmh-core-1.21.jar"/>
33-
<classpathentry kind="lib" path="arcCommon/build/dependencies/jmh-generator-annprocess-1.21.jar"/>
34-
<classpathentry kind="lib" path="arcCommon/build/dependencies/jopt-simple-4.6.jar"/>
35-
<classpathentry kind="lib" path="arcCommon/build/dependencies/HikariCP-3.4.3.jar"/>
36-
<classpathentry kind="lib" path="arcCommon/build/dependencies/jdbi3-core-3.13.0.jar"/>
37-
<classpathentry kind="lib" path="arcCommon/build/dependencies/jdbi3-sqlobject-3.13.0.jar"/>
38-
<classpathentry kind="lib" path="arcCommon/build/dependencies/mockito-core-3.3.3.jar"/>
39-
<classpathentry kind="lib" path="mysqlAuroraArc/build/dependencies/mysql-connector-java-8.0.20.jar"/>
40-
<classpathentry kind="lib" path="psqlAuroraArc/build/dependencies/postgresql-42.2.12.jar"/>
24+
<classpathentry kind="lib" path="arcCommon/build/dependencies/geantyref-1.3.13.jar"/>
25+
<classpathentry kind="lib" path="arcCommon/build/dependencies/hamcrest-core-1.3.jar"/>
26+
<classpathentry kind="lib" path="arcCommon/build/dependencies/jdbi3-core-3.25.0.jar"/>
27+
<classpathentry kind="lib" path="arcCommon/build/dependencies/jdbi3-sqlobject-3.25.0.jar"/>
28+
<classpathentry kind="lib" path="arcCommon/build/dependencies/jmh-core-1.34.jar"/>
29+
<classpathentry kind="lib" path="arcCommon/build/dependencies/jmh-generator-annprocess-1.34.jar"/>
30+
<classpathentry kind="lib" path="arcCommon/build/dependencies/jopt-simple-5.0.4.jar"/>
31+
<classpathentry kind="lib" path="arcCommon/build/dependencies/junit-4.13.2.jar"/>
32+
<classpathentry kind="lib" path="arcCommon/build/dependencies/logback-classic-1.2.10.jar"/>
33+
<classpathentry kind="lib" path="arcCommon/build/dependencies/logback-core-1.2.10.jar"/>
34+
<classpathentry kind="lib" path="arcCommon/build/dependencies/mockito-core-4.3.1.jar"/>
35+
<classpathentry kind="lib" path="arcCommon/build/dependencies/objenesis-3.2.jar"/>
36+
<classpathentry kind="lib" path="arcCommon/build/dependencies/slf4j-api-1.7.32.jar"/>
37+
<classpathentry kind="lib" path="arcCommon/build/dependencies/HikariCP-5.0.1.jar"/>
38+
<classpathentry kind="lib" path="mysqlAuroraArc/build/dependencies/mysql-connector-java-8.0.28.jar"/>
39+
<classpathentry kind="lib" path="psqlAuroraArc/build/dependencies/postgresql-42.3.1.jar"/>
4140
<classpathentry kind="output" path="bin"/>
4241
</classpath>

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ For MySQL:
1111
<dependency>
1212
<groupId>org.threadly</groupId>
1313
<artifactId>auroraArc-mysql</artifactId>
14-
<version>0.15</version>
14+
<version>0.16</version>
1515
</dependency>
1616
```
1717

@@ -21,7 +21,7 @@ For Postgresql:
2121
<dependency>
2222
<groupId>org.threadly</groupId>
2323
<artifactId>auroraArc-psql</artifactId>
24-
<version>0.15</version>
24+
<version>0.16</version>
2525
</dependency>
2626
```
2727

‎build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ subprojects {
3030
}
3131
getReports().getJunitXml().setDestination(file("$buildDir/reports/tests/xml"))
3232
getReports().getHtml().setDestination(file("$buildDir/reports/tests/html"))
33-
setBinResultsDir(file("$buildDir/reports/tests/bin"))
33+
setBinaryResultsDirectory(file("$buildDir/reports/tests/bin"))
3434
}
3535

36-
build.dependsOn jacocoTestReport
36+
test.finalizedBy("jacocoTestReport")
3737

3838
jacocoTestReport {
3939
reports {
40-
csv.enabled = false
41-
xml.enabled = true
40+
csv.required = false
41+
xml.required = true
4242
xml.destination = file("$buildDir/reports/jacoco/jacoco.xml")
43-
html.enabled = true
43+
html.required = true
4444
html.destination = file("$buildDir/reports/jacoco/html")
4545
}
4646
doLast {
@@ -72,13 +72,13 @@ subprojects {
7272
classifier = 'sources'
7373
}
7474

75-
build.dependsOn("copyLibs");
76-
7775
task copyLibs(type: Copy) {
7876
into "$buildDir/dependencies/"
7977
from configurations.testRuntimeClasspath
8078
}
8179

80+
build.finalizedBy("copyLibs")
81+
8282
artifacts {
8383
archives jar
8484
archives javadocJar

‎build.upload‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
def findJVM() {
2-
String[] java8Paths = new String[5]
3-
java8Paths[0] = "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/"
4-
java8Paths[1] = "/usr/lib/jvm/java-8-openjdk/jre/lib/"
5-
java8Paths[2] = "/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/"
6-
java8Paths[3] = "/usr/lib/jvm/java-1.8.0-openjdk/jre/lib/"
7-
java8Paths[4] = "/usr/lib/jvm/java-8-sun/jre/lib/"
8-
for (String path : java8Paths) {
2+
String[] java11Paths = new String[4]
3+
java11Paths[0] = "/usr/lib/jvm/java-11-openjdk-amd64/lib/"
4+
java11Paths[1] = "/usr/lib/jvm/java-11-openjdk/lib/"
5+
java11Paths[2] = "/usr/lib/jvm/openjdk-11/lib/"
6+
java11Paths[3] = "/usr/lib/jvm/java-11-sun/lib/"
7+
for (String path : java11Paths) {
98
if (new java.io.File(path).exists()) {
109
return path
1110
}
@@ -27,17 +26,17 @@ subprojects {
2726
}
2827
}
2928

30-
sourceCompatibility = 1.8
31-
targetCompatibility = 1.8
29+
sourceCompatibility = 1.11
30+
targetCompatibility = 1.11
3231

3332
compileJava {
3433
def jvmPath = findJVM()
3534
if (jvmPath == null) {
36-
println 'Unable to find java 8 rt.jar, will cause failure so exiting now'
35+
println 'Unable to find java 11 install, will cause failure so exiting now'
3736
println ''
3837
System.exit(1)
3938
}
40-
println 'Using java 8: ' + jvmPath
39+
println 'Using java 11: ' + jvmPath
4140
options.bootstrapClasspath = fileTree(include: ['*.jar'], dir: jvmPath)
4241
}
4342

@@ -65,17 +64,17 @@ subprojects {
6564
}
6665
getReports().getJunitXml().setDestination(file("$buildDir/reports/tests/xml"))
6766
getReports().getHtml().setDestination(file("$buildDir/reports/tests/html"))
68-
setBinResultsDir(file("$buildDir/reports/tests/bin"))
67+
setBinaryResultsDirectory(file("$buildDir/reports/tests/bin"))
6968
}
7069

71-
build.dependsOn jacocoTestReport
70+
test.finalizedBy("jacocoTestReport")
7271

7372
jacocoTestReport {
7473
reports {
75-
csv.enabled = false
76-
xml.enabled = true
74+
csv.required = false
75+
xml.required = true
7776
xml.destination = file("$buildDir/reports/jacoco/jacoco.xml")
78-
html.enabled = true
77+
html.required = true
7978
html.destination = file("$buildDir/reports/jacoco/html")
8079
}
8180
doLast {
@@ -107,13 +106,13 @@ subprojects {
107106
classifier = 'sources'
108107
}
109108

110-
build.dependsOn("copyLibs");
111-
112109
task copyLibs(type: Copy) {
113110
into "$buildDir/dependencies/"
114111
from configurations.testRuntimeClasspath
115112
}
116113

114+
build.finalizedBy("copyLibs")
115+
117116
artifacts {
118117
archives jar
119118
archives javadocJar

‎config/checkstyle/checkstyle.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<module name="JavadocMethod">
1919
<property name="scope" value="public"/>
2020
<property name="excludeScope" value="private"/>
21-
<property name="suppressLoadErrors" value="true"/>
2221
</module>
2322
<module name="JavadocStyle"/>
2423
<module name="JavadocType"/>

‎gradle.properties‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
group = org.threadly
2-
version = 0.16-SNAPSHOT
2+
version = 0.16
33
org.gradle.parallel = false
44

5-
threadlyVersion = 6.2
5+
threadlyVersion = 7.0
66
threadlyTestVersion = 1.0
7-
mysqlVersion = 8.0.20
8-
psqlVersion = 42.2.12
7+
mysqlVersion = 8.0.28
8+
psqlVersion = 42.3.1
99

10-
jdbiVersion = 3.13.0
11-
hikariVersion = 3.4.5
12-
logbackVersion = 1.2.3
13-
junitVersion = 4.13
14-
mockitoVersion = 3.3.3
15-
jmhVersion = 1.21
10+
jdbiVersion = 3.25.0
11+
hikariVersion = 5.0.1
12+
logbackVersion = 1.2.10
13+
junitVersion = 4.13.2
14+
mockitoVersion = 4.3.1
15+
jmhVersion = 1.34

‎gradle/wrapper/gradle-wrapper.jar‎

841 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)