Merge branch 'develop' into main

purejava · Jan 31, 2024 · 6ef2071 · 6ef2071
2 parents 4d573b2 + 4be2d00
commit 6ef2071
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 24 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -28,10 +28,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: java
       - name: Build
         run: mvn -B compile
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2023 Ralph Plawetzki
+Copyright (c) 2020-2024 Ralph Plawetzki
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # kdewallet
 ![KWallet](KWallet.png)
 
-[![Java CI with Maven](https://github.com/purejava/kdewallet/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/purejava/kdewallet/actions?query=workflow%3A%22Java+CI+with+Maven%22)
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/b1379afd2db3447abfbdca82fbdc2b7a)](https://www.codacy.com/gh/purejava/kdewallet/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=purejava/kdewallet&amp;utm_campaign=Badge_Grade)
+[![Publish to Maven Central](https://github.com/purejava/kdewallet/workflows/Publish%20to%20Maven%20Central/badge.svg)](https://github.com/purejava/kdewallet/actions?query=workflow%3A%22Publish+to+Maven+Central%22)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/b1379afd2db3447abfbdca82fbdc2b7a)](https://app.codacy.com/gh/purejava/kdewallet/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![Maven Central](https://img.shields.io/maven-central/v/org.purejava/kdewallet.svg?label=Maven%20Central)](https://central.sonatype.com/search?q=kdewallet&smo=true&namespace=org.purejava)
 [![License](https://img.shields.io/github/license/purejava/kdewallet.svg)](https://github.com/purejava/kdewallet/blob/master/LICENSE)
 
@@ -19,7 +19,7 @@ Add `kdewallet` as a dependency to your project.
 <dependency>
     <groupId>org.purejava</groupId>
     <artifactId>kdewallet</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
 </dependency>
 ```
 
@@ -74,4 +74,4 @@ Thanks to David M., who wrote an improved version of [Java DBus](https://github.
 Thanks to Sebastian Wiesendahl, who implemented the original core messaging interface to DBus in his [secret-service](https://github.com/swiesend/secret-service) library.
 
 ## Copyright
-Copyright (C) 2020-2023 Ralph Plawetzki
+Copyright (C) 2020-2024 Ralph Plawetzki
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.purejava</groupId>
     <artifactId>kdewallet</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
     <packaging>jar</packaging>
 
     <name>kdewallet</name>
@@ -47,13 +47,13 @@
         <dependency>
             <groupId>com.github.hypfvieh</groupId>
             <artifactId>dbus-java-core</artifactId>
-            <version>4.3.1</version>
+            <version>5.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.hypfvieh</groupId>
             <artifactId>dbus-java-transport-native-unixsocket</artifactId>
-            <version>4.3.1</version>
+            <version>5.0.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
@@ -82,14 +82,14 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.11</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.11</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -112,11 +112,11 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.12.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.2.5</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
@@ -136,7 +136,7 @@
                 <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>4.0.0-M12</version>
+                    <version>4.0.0-M13</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-project-info-reports-plugin</artifactId>
@@ -149,7 +149,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.12.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -183,7 +183,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.2.5</version>
                 <dependencies>
                     <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
                     <dependency>

diff --git a/src/main/java/org/purejava/kwallet/freedesktop/dbus/handlers/MessageHandler.java b/src/main/java/org/purejava/kwallet/freedesktop/dbus/handlers/MessageHandler.java
@@ -2,7 +2,6 @@
 
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
-import org.freedesktop.dbus.messages.MethodCall;
 import org.freedesktop.dbus.types.Variant;
 import org.purejava.kwallet.Static;
 import org.slf4j.Logger;
@@ -29,11 +28,8 @@ public MessageHandler(DBusConnection connection) {
 
     public Object[] send(String service, String path, String iface, String method, String signature, Object... args) {
         try {
-            var message = new MethodCall(
-                    service,
-                    path,
-                    iface,
-                    method, (byte) 0, signature, args);
+            var msgFactory = connection.getMessageFactory();
+            var message = msgFactory.createMethodCall(service, path, iface, method, (byte) 0, signature, args);
 
             if (LOG.isTraceEnabled()) LOG.trace(String.valueOf(message));
             connection.sendMessage(message);
@@ -47,7 +43,7 @@ public Object[] send(String service, String path, String iface, String method, S
                 LOG.debug(Arrays.deepToString(parameters));
             }
 
-            if (response instanceof org.freedesktop.dbus.errors.Error) {
+            if (response instanceof org.freedesktop.dbus.messages.Error) {
                 var error = response.getName();
                 switch (error) {
                     case "org.freedesktop.DBus.Error.NoReply",