Skip to content

Commit 5456b58

Browse files
WillenaWillena
committed
Merge branch 'prepare/3.40.0.0'
2 parents 079e6b0 + a2ca00d commit 5456b58

33 files changed

+861
-351
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
strategy:
4646
matrix:
4747
os: [ ubuntu-latest ]
48-
java: [ 8, 17, 18 ]
48+
java: [ 11, 17, 18 ]
4949
include:
5050
- os: windows-latest
5151
java: 18
@@ -78,34 +78,34 @@ jobs:
7878
- name: Test
7979
run: mvn --batch-mode --no-transfer-progress test
8080

81-
test_graalvm:
82-
name: test ubuntu-latest jdk11 GraalVM native-image
83-
runs-on: ubuntu-latest
84-
steps:
85-
- uses: actions/checkout@v3
86-
- uses: DeLaGuardo/setup-graalvm@master
87-
with:
88-
# GraalVM version, no pattern syntax available atm
89-
graalvm: '21.0.0.2'
90-
# Java version, optional, defaults to 'java8'. Available options are 'java8' and 'java11'.
91-
java: 'java11'
92-
# Architecture flag, optional, defaults to 'amd64'. Available options are 'amd64' and 'aarch64'. Later is available only for linux runners.
93-
arch: 'amd64'
94-
- name: Install native-image component
95-
run: |
96-
gu install native-image
97-
98-
- name: Source versions from VERSION file
99-
run: cat VERSION >> $GITHUB_ENV
100-
101-
- name: Display version
102-
run: echo $sqliteMCVersion $version $artifactVersion
103-
104-
- name: Build natives
105-
run: make jni-header native
106-
107-
- name: Test
108-
run: mvn --batch-mode --no-transfer-progress -P native test
81+
# test_graalvm:
82+
# name: test ubuntu-latest jdk11 GraalVM native-image
83+
# runs-on: ubuntu-latest
84+
# steps:
85+
# - uses: actions/checkout@v3
86+
# - uses: DeLaGuardo/setup-graalvm@master
87+
# with:
88+
# # GraalVM version, no pattern syntax available atm
89+
# graalvm: '21.0.0.2'
90+
# # Java version, optional, defaults to 'java8'. Available options are 'java8' and 'java11'.
91+
# java: 'java11'
92+
# # Architecture flag, optional, defaults to 'amd64'. Available options are 'amd64' and 'aarch64'. Later is available only for linux runners.
93+
# arch: 'amd64'
94+
# - name: Install native-image component
95+
# run: |
96+
# gu install native-image
97+
#
98+
# - name: Source versions from VERSION file
99+
# run: cat VERSION >> $GITHUB_ENV
100+
#
101+
# - name: Display version
102+
# run: echo $sqliteMCVersion $version $artifactVersion
103+
#
104+
# - name: Build natives
105+
# run: make jni-header native
106+
#
107+
# - name: Test
108+
# run: mvn --batch-mode --no-transfer-progress -P native test
109109

110110
test_multiarch:
111111
name: test ${{ matrix.arch }} ${{ matrix.distro }} jdk${{ matrix.java }}

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ atlassian-ide-plugin.xml
1616
*.so
1717
*.dll
1818
*.jnilib
19+
20+
.fleet/settings.json

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Development
22
## Prerequisites
33

4-
- JDK 8
5-
- JDK 11 is required to run the `spotless` plugin for code formatting
4+
- JDK 11
65

76
## Commits
87

@@ -21,7 +20,7 @@ Since August 2022 the commit messages follow the [Conventional Commits](https://
2120
# How to compile the native libraries
2221
## Prerequisites
2322

24-
1. JDK 8
23+
1. JDK 11
2524
2. Perl
2625
3. Maven
2726
4. make
@@ -76,7 +75,7 @@ The project version can change by 2 means:
7675
2. When triggering a release. This is done automatically through GitHub Actions.
7776

7877
## Trigger a release
79-
A release can be triggered from GitHub Actions by [manually running](https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow) the **CI** workflow.
78+
A release can be triggered from GitHub Actions by [manually running](https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow) the **CI** workflow and ticking the **Perform release** option.
8079

8180
## What happens when performing a release?
8281

@@ -90,4 +89,4 @@ Multiple actions will happen in sequence, all orchestrated by the GitHub workflo
9089

9190
## Snapshot publishing
9291

93-
The CI workflow will also publish a new snapshot to [Sonatype's snapshots repository](https://oss.sonatype.org/content/repositories/snapshots/org/xerial/sqlite-jdbc/) whenever a change occurs.
92+
The CI workflow will also publish a new snapshot to [Sonatype's snapshots repository](https://oss.sonatype.org/content/repositories/snapshots/org/xerial/sqlite-jdbc/) whenever a change occurs.

‎USAGE.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@ You can use a specific version of the native library by setting the following JV
8888
-Dorg.sqlite.lib.name=your-custom.dll
8989
```
9090

91+
## Override detected architecture
92+
93+
If the detected architecture is incorrect for your system, thus loading the wrong native library, you can override the value setting the following JVM property:
94+
```
95+
-Dorg.sqlite.osinfo.architecture=arm
96+
```
9197

9298
## Configure Connections
9399
```java

‎VERSION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=3.39.4
2-
artifactVersion=3.39.4.1-SNAPSHOT
3-
sqliteMCVersion=1.5.3
1+
version=3.40.0
2+
artifactVersion=3.40.0.0-SNAPSHOT
3+
sqliteMCVersion=1.5.4

‎jreleaser.yml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
project:
22
versionPattern: CUSTOM
3+
copyright: Taro L. Saito
34
release:
45
github:
56
discussionCategoryName: Announcements
67
tagName: '{{projectVersion}}'
78
changelog:
89
links: true
910
formatted: ALWAYS
10-
format: '- {{commitShortHash}} {{commitTitle}}'
11+
format: '- {{commitTitle}} ({{commitShortHash}})'
1112
preset: 'conventional-commits'
13+
skipMergeCommits: true
1214
excludeLabels:
1315
- 'chore'
14-
- 'merge'
1516
labelers:
1617
- label: 'chore'
1718
title: '[maven-release-plugin] prepare'
@@ -22,6 +23,16 @@ release:
2223
labels:
2324
- 'perf'
2425
order: 25
26+
hide:
27+
uncategorized: true
28+
issues:
29+
enabled: true
30+
comment: '🎉 This issue has been resolved in `{{tagName}}` ([Release Notes]({{releaseNotesUrl}}))'
31+
applyMilestone: 'ALWAYS'
32+
label:
33+
name: 'released'
34+
description: 'Issue has been released'
35+
color: '#ededed'
2536
files:
2637
artifacts:
2738
- path: 'target/{{projectName}}-{{projectVersion}}.jar'

‎pom.xml‎

Lines changed: 80 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>io.github.willena</groupId>
66
<artifactId>sqlite-jdbc</artifactId>
7-
<version>3.39.4.1-SNAPSHOT</version>
7+
<version>3.40.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>
1111

1212
<properties>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<junit.version>5.7.2</junit.version>
14+
<junit.version>5.9.1</junit.version>
1515
<surefire.version>2.22.2</surefire.version>
16+
<java9.sourceDirectory>${project.basedir}/src/main/java9</java9.sourceDirectory>
1617
</properties>
1718

1819
<licenses>
@@ -90,17 +91,32 @@
9091
<plugin>
9192
<groupId>org.apache.maven.plugins</groupId>
9293
<artifactId>maven-help-plugin</artifactId>
93-
<version>3.2.0</version>
94+
<version>3.3.0</version>
9495
</plugin>
9596

9697
<plugin>
9798
<groupId>org.apache.maven.plugins</groupId>
9899
<artifactId>maven-compiler-plugin</artifactId>
99-
<version>3.1</version>
100+
<version>3.10.1</version>
100101
<configuration>
101-
<source>1.8</source>
102-
<target>1.8</target>
102+
<release>8</release>
103103
</configuration>
104+
<executions>
105+
<execution>
106+
<id>java9-compile</id>
107+
<phase>compile</phase>
108+
<goals>
109+
<goal>compile</goal>
110+
</goals>
111+
<configuration>
112+
<release>9</release>
113+
<compileSourceRoots>
114+
<compileSourceRoot>${java9.sourceDirectory}</compileSourceRoot>
115+
</compileSourceRoots>
116+
<multiReleaseOutput>true</multiReleaseOutput>
117+
</configuration>
118+
</execution>
119+
</executions>
104120
</plugin>
105121

106122
<plugin>
@@ -117,13 +133,13 @@
117133

118134
<plugin>
119135
<artifactId>maven-jar-plugin</artifactId>
120-
<version>3.2.0</version>
136+
<version>3.3.0</version>
121137
<configuration>
122138
<!-- Pick the MANIFEST generated by the bundle plugin -->
123139
<archive>
124140
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
125141
<manifestEntries>
126-
<Automatic-Module-Name>io.github.willena.sqlitejdbc</Automatic-Module-Name>
142+
<Multi-Release>true</Multi-Release>
127143
</manifestEntries>
128144
</archive>
129145
</configuration>
@@ -145,7 +161,7 @@
145161
<plugin>
146162
<groupId>com.diffplug.spotless</groupId>
147163
<artifactId>spotless-maven-plugin</artifactId>
148-
<version>2.12.3</version>
164+
<version>2.27.2</version>
149165
<configuration>
150166
<java>
151167
<toggleOffOn/>
@@ -160,22 +176,52 @@
160176
<plugin>
161177
<groupId>org.sonatype.plugins</groupId>
162178
<artifactId>nexus-staging-maven-plugin</artifactId>
163-
<version>1.6.8</version>
179+
<version>1.6.13</version>
164180
<extensions>true</extensions>
165181
<configuration>
166182
<serverId>ossrh</serverId>
167183
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
168184
<autoReleaseAfterClose>true</autoReleaseAfterClose>
169185
</configuration>
170186
</plugin>
187+
188+
<plugin>
189+
<groupId>org.codehaus.mojo</groupId>
190+
<artifactId>versions-maven-plugin</artifactId>
191+
<version>2.13.0</version>
192+
</plugin>
193+
194+
<plugin>
195+
<groupId>org.apache.maven.plugins</groupId>
196+
<artifactId>maven-enforcer-plugin</artifactId>
197+
<version>3.1.0</version>
198+
<executions>
199+
<execution>
200+
<id>enforce-maven</id>
201+
<goals>
202+
<goal>enforce</goal>
203+
</goals>
204+
<configuration>
205+
<rules>
206+
<requireMavenVersion>
207+
<version>3.2.5</version>
208+
</requireMavenVersion>
209+
<requireJavaVersion>
210+
<version>11</version>
211+
</requireJavaVersion>
212+
</rules>
213+
</configuration>
214+
</execution>
215+
</executions>
216+
</plugin>
171217
</plugins>
172218

173219
<pluginManagement>
174220
<plugins>
175221
<plugin>
176222
<groupId>org.apache.felix</groupId>
177223
<artifactId>maven-bundle-plugin</artifactId>
178-
<version>2.4.0</version>
224+
<version>5.1.8</version>
179225
<extensions>true</extensions>
180226
<executions>
181227
<execution>
@@ -193,9 +239,9 @@
193239
</build>
194240

195241
<scm>
196-
<connection>scm:git:git://github.com/Willena/sqlite-jdbc-crypt.git</connection>
197-
<developerConnection>scm:git:ssh://[email protected]:Willena/sqlite-jdbc-crypt.git</developerConnection>
198-
<url>https://github.com/Willena/sqlite-jdbc-crypt</url>
242+
<connection>scm:git:git://github.com/xerial/sqlite-jdbc.git</connection>
243+
<developerConnection>scm:git:[email protected]:xerial/sqlite-jdbc.git</developerConnection>
244+
<url>https://github.com/xerial/sqlite-jdbc</url>
199245
</scm>
200246

201247
<distributionManagement>
@@ -225,7 +271,7 @@
225271
<plugin>
226272
<groupId>org.apache.maven.plugins</groupId>
227273
<artifactId>maven-gpg-plugin</artifactId>
228-
<version>1.6</version>
274+
<version>3.0.1</version>
229275
<configuration>
230276
<!-- Prevent gpg from using pinentry programs -->
231277
<gpgArguments>
@@ -246,8 +292,9 @@
246292
<plugin>
247293
<groupId>org.apache.maven.plugins</groupId>
248294
<artifactId>maven-javadoc-plugin</artifactId>
249-
<version>3.2.0</version>
295+
<version>3.4.1</version>
250296
<configuration>
297+
<sourcepath>src/main/java</sourcepath>
251298
<additionalOptions>-Xdoclint:none</additionalOptions>
252299
<additionalJOption>-Xdoclint:none</additionalJOption>
253300
</configuration>
@@ -329,6 +376,8 @@
329376
<include>**/RSMetaDataTest</include>
330377
<!-- SegFault -->
331378
<exclude>**/UDFCustomErrorTest.java</exclude>
379+
<!-- Not needed -->
380+
<exclude>**/architecture/*.java</exclude>
332381
</excludes>
333382
</configuration>
334383
</plugin>
@@ -368,13 +417,26 @@
368417
<dependency>
369418
<groupId>org.junit-pioneer</groupId>
370419
<artifactId>junit-pioneer</artifactId>
371-
<version>1.4.2</version>
420+
<version>1.7.1</version>
372421
<scope>test</scope>
373422
</dependency>
374423
<dependency>
375424
<groupId>org.mockito</groupId>
376425
<artifactId>mockito-core</artifactId>
377-
<version>3.12.4</version>
426+
<version>4.8.1</version>
427+
<scope>test</scope>
428+
</dependency>
429+
<dependency>
430+
<groupId>com.tngtech.archunit</groupId>
431+
<artifactId>archunit-junit5</artifactId>
432+
<version>1.0.0</version>
433+
<scope>test</scope>
434+
</dependency>
435+
<!-- Required by archunit -->
436+
<dependency>
437+
<groupId>ch.qos.logback</groupId>
438+
<artifactId>logback-classic</artifactId>
439+
<version>1.3.4</version>
378440
<scope>test</scope>
379441
</dependency>
380442
</dependencies>

0 commit comments

Comments
 (0)