Merge branch 'develop'

# Conflicts: # VERSION # pom.xml
Willena · Apr 26, 2021 · ee876b7 · ee876b7
2 parents b406477 + 4a7094d
commit ee876b7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,12 @@
 sudo: required
 os: linux
-dist: trusty
+dist: bionic
 services:
   - docker
 
 language: java
 jdk:
-  - oraclejdk8
+  - oraclejdk12
 
 jobs:
   include:
@@ -20,7 +20,8 @@ jobs:
 install:
   - mkdir -p /tmp/willena/
   - openssl aes-256-cbc -K $encrypted_0e6f4e1fcef0_key -iv $encrypted_0e6f4e1fcef0_iv -in /home/travis/build/Willena/sqlite-jdbc-crypt/scripts/private.key.enc -out /tmp/willena/private.key -d
-  - gpg --import /tmp/willena/private.key
+  - gpg --version
+  - gpg --batch --import /tmp/willena/private.key
   - rm /tmp/willena/private.key
 before_install:
   - sudo apt-get update

diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-version=3.35.4
-artifactVersion=3.35.4
+version=3.35.5
+artifactVersion=3.35.5
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.willena</groupId>
     <artifactId>sqlite-jdbc</artifactId>
-    <version>3.35.4</version>
+    <version>3.35.5</version>
     <name>SQLite JDBC</name>
     <description>SQLite JDBC library with encryption and authentication support</description>
     <url>https://github.com/Willena/sqlite-jdbc-crypt</url>
@@ -149,6 +149,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.10.3</version>
+                <configuration>
+                    <source>8</source>
+                    <detectJavaApiLink>false</detectJavaApiLink>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -165,14 +169,20 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.5</version>
+                <version>1.6</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
                         <phase>verify</phase>
                         <goals>
                             <goal>sign</goal>
                         </goals>
+                        <configuration>
+                            <gpgArguments>
+                                <arg>--pinentry-mode</arg>
+                                <arg>loopback</arg>
+                            </gpgArguments>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

diff --git a/src/main/java/org/sqlite/SQLiteConfig.java b/src/main/java/org/sqlite/SQLiteConfig.java
@@ -217,7 +217,7 @@ public void apply(Connection conn) throws SQLException {
             if (pragmaTable.containsKey(Pragma.PASSWORD.pragmaName) || pragmaTable.containsKey(Pragma.KEY.pragmaName)) {
 
                 String password = pragmaTable.getProperty(Pragma.KEY.pragmaName);
-                password = password.isEmpty() ? pragmaTable.getProperty(Pragma.PASSWORD.pragmaName) : password;
+                password = password == null || password.isEmpty() ? pragmaTable.getProperty(Pragma.PASSWORD.pragmaName) : password;
 
                 String cipherName = pragmaTable.getProperty(Pragma.CIPHER.pragmaName);