Skip to content

Commit e749f21

Browse files
WillenaWillena
committed
Merge remote-tracking branch 'xerial/master' into sync-3.46.0
# Conflicts: # .github/workflows/ci.yml # VERSION # pom.xml # src/main/resources/org/sqlite/native/FreeBSD/aarch64/libsqlitejdbc.so # src/main/resources/org/sqlite/native/FreeBSD/x86/libsqlitejdbc.so # src/main/resources/org/sqlite/native/FreeBSD/x86_64/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux-Android/aarch64/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux-Android/arm/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux-Android/x86/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux-Android/x86_64/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux-Musl/aarch64/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux-Musl/x86/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux-Musl/x86_64/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux/aarch64/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux/arm/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux/armv6/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux/armv7/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux/ppc64/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux/x86/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Linux/x86_64/libsqlitejdbc.so # src/main/resources/org/sqlite/native/Mac/aarch64/libsqlitejdbc.dylib # src/main/resources/org/sqlite/native/Mac/x86_64/libsqlitejdbc.dylib # src/main/resources/org/sqlite/native/Windows/aarch64/sqlitejdbc.dll # src/main/resources/org/sqlite/native/Windows/armv7/sqlitejdbc.dll # src/main/resources/org/sqlite/native/Windows/x86/sqlitejdbc.dll # src/main/resources/org/sqlite/native/Windows/x86_64/sqlitejdbc.dll
2 parents 773c648 + 50ef887 commit e749f21

File tree

7 files changed

+50
-35
lines changed

7 files changed

+50
-35
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,18 @@ jobs:
105105
# ARM v7
106106
- arch: armv7
107107
distro: ubuntu_latest
108-
java: 11 # apt-get maven is 3.6.x, doesn't support Java 17
108+
java: 21
109109
# ARM 64
110110
- arch: aarch64
111111
distro: ubuntu_latest
112-
java: 11 # apt-get maven is 3.6.x, doesn't support Java 17
112+
java: 21
113113
- arch: aarch64
114114
distro: alpine_latest
115-
java: 11
115+
java: 21
116116
# PPC64
117117
- arch: ppc64le
118118
distro: ubuntu_latest
119-
java: 11 # apt-get maven is 3.6.x, doesn't support Java 17
119+
java: 21
120120
runs-on: ubuntu-latest
121121
steps:
122122
- uses: actions/checkout@v4
@@ -156,12 +156,13 @@ jobs:
156156
157157
env: |
158158
SKIP_TEST_OSINFO: true
159+
SKIP_TEST_MULTIARCH: true
159160
160161
run: |
161162
echo "Architecture: `uname -a`"
162163
mvn --version
163164
export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac))))
164-
cd /work && make jni-header native && mvn --batch-mode --no-transfer-progress test
165+
cd /work && make jni-header native && mvn -Dmaven.repo.local=/work/.m2/repository --batch-mode --no-transfer-progress test
165166
166167
# This will test the build process using an external amalgamation, as well as the
167168
# Java tests with that native library, as some functions will not be available (extensions).
@@ -263,4 +264,4 @@ jobs:
263264
# uses: EndBug/add-and-commit@v9
264265
# with:
265266
# message: 'chore(release): prepare next snapshot [skip ci]'
266-
# default_author: github_actions
267+
# default_author: github_actions

‎README.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
= SQLite JDBC Driver
2-
:project-version: 3.45.3.0
2+
:project-version: 3.46.0.0
33

44
image:https://img.shields.io/github/actions/workflow/status/willena/sqlite-jdbc-crypt/ci.yml?branch=master[GitHub Workflow Status (branch),link=https://github.com/willena/sqlite-jdbc/actions/workflows/ci.yml?query=branch%3Amaster]
55
image:https://maven-badges.herokuapp.com/maven-central/io.github.willena/sqlite-jdbc/badge.svg[Maven Central,link=https://maven-badges.herokuapp.com/maven-central/io.github.willena/sqlite-jdbc/]
@@ -62,7 +62,7 @@ id = 2
6262
{
6363
public static void main(String[] args)
6464
{
65-
// NOTE: Connection and Statement are AutoClosable.
65+
// NOTE: Connection and Statement are AutoCloseable.
6666
// Don't forget to close them both in order to avoid leaks.
6767
try
6868
(

‎VERSION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=3.45.2
2-
artifactVersion=3.45.2.0
3-
sqliteMCVersion=1.8.4
1+
version=3.46.0
2+
artifactVersion=3.46.0.0-SNAPSHOT
3+
sqliteMCVersion=1.8.5

‎demo/Sample.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class Sample
88
{
99
public static void main(String[] args)
1010
{
11-
// NOTE: Connection and Statement are AutoClosable.
11+
// NOTE: Connection and Statement are AutoCloseable.
1212
// Don't forget to close them both in order to avoid leaks.
1313
try
1414
(

‎pom.xml‎

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>io.github.willena</groupId>
66
<artifactId>sqlite-jdbc</artifactId>
7-
<version>3.45.2.0</version>
7+
<version>3.46.0.0-SNAPSHOT</version>
88
<name>SQLite JDBC</name>
99
<description>SQLite JDBC library with encryption and authentication support</description>
1010
<url>https://github.com/Willena/sqlite-jdbc-crypt</url>
@@ -13,7 +13,8 @@
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<junit.version>5.10.2</junit.version>
1515
<surefire.version>3.2.5</surefire.version>
16-
<graalvm.version>24.0.0</graalvm.version>
16+
<archunit.version>1.3.0</archunit.version>
17+
<graalvm.version>24.0.1</graalvm.version>
1718
<java9.sourceDirectory>${project.basedir}/src/main/java9</java9.sourceDirectory>
1819
</properties>
1920

@@ -134,7 +135,7 @@
134135

135136
<plugin>
136137
<artifactId>maven-jar-plugin</artifactId>
137-
<version>3.4.0</version>
138+
<version>3.4.1</version>
138139
<configuration>
139140
<!-- Pick the MANIFEST generated by the bundle plugin -->
140141
<archive>
@@ -184,7 +185,7 @@
184185
<plugin>
185186
<groupId>org.sonatype.plugins</groupId>
186187
<artifactId>nexus-staging-maven-plugin</artifactId>
187-
<version>1.6.13</version>
188+
<version>1.7.0</version>
188189
<extensions>true</extensions>
189190
<configuration>
190191
<serverId>ossrh</serverId>
@@ -202,7 +203,7 @@
202203
<plugin>
203204
<groupId>org.apache.maven.plugins</groupId>
204205
<artifactId>maven-enforcer-plugin</artifactId>
205-
<version>3.4.1</version>
206+
<version>3.5.0</version>
206207
<executions>
207208
<execution>
208209
<id>enforce-maven</id>
@@ -279,7 +280,7 @@
279280
<plugin>
280281
<groupId>org.apache.maven.plugins</groupId>
281282
<artifactId>maven-gpg-plugin</artifactId>
282-
<version>3.2.3</version>
283+
<version>3.2.4</version>
283284
<configuration>
284285
<!-- Prevent gpg from using pinentry programs -->
285286
<gpgArguments>
@@ -300,7 +301,7 @@
300301
<plugin>
301302
<groupId>org.apache.maven.plugins</groupId>
302303
<artifactId>maven-javadoc-plugin</artifactId>
303-
<version>3.6.3</version>
304+
<version>3.7.0</version>
304305
<configuration>
305306
<sourcepath>src/main/java</sourcepath>
306307
<additionalOptions>-Xdoclint:none</additionalOptions>
@@ -339,7 +340,7 @@
339340
<plugin>
340341
<groupId>org.graalvm.buildtools</groupId>
341342
<artifactId>native-maven-plugin</artifactId>
342-
<version>0.10.1</version>
343+
<version>0.10.2</version>
343344
<extensions>true</extensions>
344345
<executions>
345346
<execution>
@@ -353,15 +354,6 @@
353354
<configuration>
354355
<fallback>false</fallback>
355356
<verbose>true</verbose>
356-
<buildArgs>
357-
<!--
358-
ArchUnit tests don't run in native-image tests.
359-
Remove the ArchUnit JUnit Engine from the ServiceLoader.
360-
-->
361-
<buildArg>
362-
-H:ServiceLoaderFeatureExcludeServiceProviders=com.tngtech.archunit.junit.internal.ArchUnitTestEngine
363-
</buildArg>
364-
</buildArgs>
365357
</configuration>
366358
</plugin>
367359

@@ -373,13 +365,30 @@
373365
<excludes>
374366
<!-- Cannot run in native mode, classes under test cannot be found, class path is empty -->
375367
<exclude>**/MultipleClassLoaderTest.java</exclude>
376-
<!-- Not needed -->
377-
<exclude>**/architecture/*.java</exclude>
378368
</excludes>
379369
</configuration>
380370
</plugin>
381371
</plugins>
382372
</build>
373+
374+
<dependencies>
375+
<dependency>
376+
<groupId>com.tngtech.archunit</groupId>
377+
<artifactId>archunit-junit5</artifactId>
378+
<version>${archunit.version}</version>
379+
<scope>test</scope>
380+
<exclusions>
381+
<!--
382+
ArchUnit tests don't run in native-image tests.
383+
Remove the ArchUnit JUnit Engine entirely from the dependency graph thus from the ServiceLoader.
384+
-->
385+
<exclusion>
386+
<groupId>com.tngtech.archunit</groupId>
387+
<artifactId>archunit-junit5-engine</artifactId>
388+
</exclusion>
389+
</exclusions>
390+
</dependency>
391+
</dependencies>
383392
</profile>
384393
<profile>
385394
<id>native-exported</id>
@@ -425,7 +434,7 @@
425434
<dependency>
426435
<groupId>org.assertj</groupId>
427436
<artifactId>assertj-core</artifactId>
428-
<version>3.25.3</version>
437+
<version>3.26.0</version>
429438
<scope>test</scope>
430439
<exclusions>
431440
<exclusion>
@@ -447,13 +456,13 @@
447456
<dependency>
448457
<groupId>org.mockito</groupId>
449458
<artifactId>mockito-core</artifactId>
450-
<version>5.11.0</version>
459+
<version>5.12.0</version>
451460
<scope>test</scope>
452461
</dependency>
453462
<dependency>
454463
<groupId>com.tngtech.archunit</groupId>
455464
<artifactId>archunit-junit5</artifactId>
456-
<version>1.2.1</version>
465+
<version>${archunit.version}</version>
457466
<scope>test</scope>
458467
</dependency>
459468
<!-- Required by archunit -->

‎src/test/java/org/sqlite/MultipleClassLoaderTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@
4848
import org.junit.jupiter.api.AfterEach;
4949
import org.junit.jupiter.api.BeforeEach;
5050
import org.junit.jupiter.api.Test;
51+
import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
5152

53+
@DisabledIfEnvironmentVariable(
54+
named = "SKIP_TEST_MULTIARCH",
55+
matches = "true",
56+
disabledReason = "Those tests would fail when ran on a multi-arch image")
5257
public class MultipleClassLoaderTest {
5358

5459
private Connection connection = null;

‎src/test/java/org/sqlite/util/OSInfoTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.junitpioneer.jupiter.SetSystemProperty;
2525

2626
@DisabledIfEnvironmentVariable(
27-
named = "SKIP_TEST_OSINFO",
27+
named = "SKIP_TEST_MULTIARCH",
2828
matches = "true",
2929
disabledReason = "Those tests would fail when ran on a musl based Linux")
3030
@DisabledInNativeImage

0 commit comments

Comments
 (0)