update to OpenJDK 21, Gradle 8.7, JNA 5.16.0, Log4j 2.24.3

build.gradle

@@ -1,11 +1,12 @@
 plugins {
-    id "de.marcphilipp.nexus-publish" version "0.4.0"
+    id 'maven-publish'
-    id "io.codearte.nexus-staging" version "0.21.1"
+    id 'signing'
+    id "io.github.gradle-nexus.publish-plugin" version "2.0.0-rc-1"
 }
 
 wrapper {
-    gradleVersion = "${project.property('gradle.wrapper.version')}"
+    gradleVersion = libs.versions.gradle.get()
-    distributionType = Wrapper.DistributionType.ALL
+    distributionType = Wrapper.DistributionType.BIN
 }
 
 ext {
@@ -24,11 +25,8 @@ ext {
 }
 
 subprojects {
-    apply plugin: 'java-library'
-    apply from: rootProject.file('gradle/ide/idea.gradle')
     apply from: rootProject.file('gradle/compile/java.gradle')
     apply from: rootProject.file('gradle/test/junit5.gradle')
-    apply from: rootProject.file('gradle/publishing/publication.gradle')
+    apply from: rootProject.file('gradle/publish/maven.gradle')
+    //apply from: rootProject.file('gradle/publish/maven-central/sonatype.gradle')
 }
-
-apply from: rootProject.file('gradle/publishing/sonatype.gradle')

gradle.properties

@@ -1,10 +1,3 @@
 group = org.xbib
 name = systemd-journal
-version = 2.0.0
+version = 3.0.0
-
-org.gradle.warning.mode = ALL
-gradle.wrapper.version = 7.3
-bridj.version = 0.7.0
-jna.version = 5.10.0
-log4j.version = 2.13.3
-mockito.version = 3.3.3

gradle/compile/java.gradle

@@ -2,17 +2,12 @@
 apply plugin: 'java-library'
 
 java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
     modularity.inferModulePath.set(true)
-}
+    withSourcesJar()
-
+    withJavadocJar()
-compileJava {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-}
-
-compileTestJava {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
 }
 
 jar {
@@ -21,23 +16,15 @@ jar {
     }
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier 'sources'
-    from sourceSets.main.allSource
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier 'javadoc'
-}
-
-artifacts {
-    archives sourcesJar, javadocJar
-}
-
 tasks.withType(JavaCompile) {
-    options.compilerArgs << '-Xlint:all,-fallthrough'
+    options.fork = true
+    options.forkOptions.jvmArgs += ['-Duser.language=en','-Duser.country=US']
+    options.compilerArgs.add('-Xlint:-requires-transitive-automatic')
+    options.compilerArgs.add('-Xlint:deprecation')
+    options.encoding = 'UTF-8'
 }
 
-javadoc {
+tasks.withType(Javadoc) {
     options.addStringOption('Xdoclint:none', '-quiet')
+    options.encoding = 'UTF-8'
 }

gradle/documentation/asciidoc.gradle

@@ -24,7 +24,7 @@ asciidoctor {
             sectanchors: true,
             linkattrs: true,
             imagesdir: 'img',
-            stylesheet: "${projectDir}/src/docs/asciidoc/css/foundation.css"
+            stylesheet: "${rootProject.projectDir}/docs/asciidoc/css/foundation.css"
 }
 
 

gradle/ide/idea.gradle

@@ -1,13 +0,0 @@
-apply plugin: 'idea'
-
-idea {
-    module {
-        outputDir file('build/classes/java/main')
-        testOutputDir file('build/classes/java/test')
-    }
-}
-
-if (project.convention.findPlugin(JavaPluginConvention)) {
-    //sourceSets.main.output.classesDirs = file("build/classes/java/main")
-    //sourceSets.test.output.classesDirs = file("build/classes/java/test")
-}

gradle/publish/hbz/artifactory.gradle

@@ -0,0 +1,27 @@
+if (project.hasProperty('artifactoryUser')) {
+    artifactory {
+        publish {
+            contextUrl = project.property('artifactoryUrl')
+            repository {
+                repoKey = project.property('artifactoryRepoKey')
+                username = project.property('artifactoryUser')
+                password = project.property('artifactoryPassword')
+            }
+            defaults {
+                publications("${project.name}")
+                publishBuildInfo = false
+                publishArtifacts = true
+                publishPom = true
+            }
+        }
+    }
+}
+
+if (project.hasProperty("signing.keyId")) {
+        pluginManager.withPlugin('maven-publish') {
+            apply plugin: 'signing'
+            signing {
+                sign publishing.publications."${project.name}"
+            }
+        }
+}

gradle/publish/maven-central/sonatype.gradle

@@ -0,0 +1,19 @@
+
+if (project.hasProperty("signing.keyId")) {
+    apply plugin: 'signing'
+    signing {
+        sign publishing.publications."${project.name}"
+    }
+}
+
+if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
+    nexusPublishing {
+        repositories {
+            sonatype {
+                username = project.property('ossrhUsername')
+                password = project.property('ossrhPassword')
+                packageGroup = "org.xbib"
+            }
+        }
+    }
+}

gradle/publish/maven.gradle

@@ -1,13 +1,10 @@
 
-apply plugin: "de.marcphilipp.nexus-publish"
-
 publishing {
     publications {
-        mavenJava(MavenPublication) {
+        "${project.name}"(MavenPublication) {
             from components.java
-            artifact sourcesJar
-            artifact javadocJar
             pom {
+                artifactId = project.name
                 name = project.name
                 description = rootProject.ext.description
                 url = rootProject.ext.url
@@ -22,7 +19,7 @@ publishing {
                         id = 'jprante'
                         name = 'Jörg Prante'
                         email = 'joergprante@gmail.com'
-                        url = 'https://github.com/jprante'
+                        url = 'https://xbib.org/joerg'
                     }
                 }
                 scm {
@@ -45,20 +42,3 @@ publishing {
         }
     }
 }
-
-if (project.hasProperty("signing.keyId")) {
-    apply plugin: 'signing'
-    signing {
-        sign publishing.publications.mavenJava
-    }
-}
-
-nexusPublishing {
-    repositories {
-        sonatype {
-            username = project.property('ossrhUsername')
-            password = project.property('ossrhPassword')
-            packageGroup = "org.xbib"
-        }
-    }
-}

gradle/publish/xbib/forgejo.gradle

@@ -0,0 +1,16 @@
+if (project.hasProperty('forgeJoToken')) {
+    publishing {
+        repositories {
+            maven {
+                url 'https://xbib.org/api/packages/joerg/maven'
+                credentials(HttpHeaderCredentials) {
+                    name = "Authorization"
+                    value = "token ${project.property('forgeJoToken')}"
+                }
+                authentication {
+                    header(HttpHeaderAuthentication)
+                }
+            }
+        }
+    }
+}

gradle/publishing/sonatype.gradle

@@ -1,11 +0,0 @@
-
-if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
-
-    apply plugin: 'io.codearte.nexus-staging'
-
-    nexusStaging {
-        username = project.property('ossrhUsername')
-        password = project.property('ossrhPassword')
-        packageGroup = "org.xbib"
-    }
-}

gradle/quality/checkstyle.gradle

@@ -0,0 +1,19 @@
+
+apply plugin: 'checkstyle'
+
+tasks.withType(Checkstyle) {
+    ignoreFailures = true
+    reports {
+        xml.getRequired().set(true)
+        html.getRequired().set(true)
+    }
+}
+
+checkstyle {
+    configFile = rootProject.file('gradle/quality/checkstyle.xml')
+    ignoreFailures = true
+    showViolations = true
+    checkstyleMain {
+        source = sourceSets.main.allSource
+    }
+}

gradle/quality/checkstyle.xml

@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!-- This is a checkstyle configuration file. For descriptions of
+what the following rules do, please see the checkstyle configuration
+page at http://checkstyle.sourceforge.net/config.html -->
+
+<module name="Checker">
+
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value=".*(Example|Test|module-info)(\$.*)?"/>
+    </module>
+
+    <module name="FileTabCharacter">
+        <!-- Checks that there are no tab characters in the file.
+        -->
+    </module>
+
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
+
+    <module name="RegexpSingleline">
+        <!-- Checks that FIXME is not used in comments.  TODO is preferred.
+        -->
+        <property name="format" value="((//.*)|(\*.*))FIXME" />
+        <property name="message" value='TODO is preferred to FIXME.  e.g. "TODO(johndoe): Refactor when v2 is released."' />
+    </module>
+
+    <module name="RegexpSingleline">
+        <!-- Checks that TODOs are named.  (Actually, just that they are followed
+             by an open paren.)
+        -->
+        <property name="format" value="((//.*)|(\*.*))TODO[^(]" />
+        <property name="message" value='All TODOs should be named.  e.g. "TODO(johndoe): Refactor when v2 is released."' />
+    </module>
+
+    <module name="JavadocPackage">
+        <!-- Checks that each Java package has a Javadoc file used for commenting.
+          Only allows a package-info.java, not package.html. -->
+    </module>
+
+    <!-- All Java AST specific tests live under TreeWalker module. -->
+    <module name="TreeWalker">
+
+        <!--
+
+        IMPORT CHECKS
+
+        -->
+
+        <module name="RedundantImport">
+            <!-- Checks for redundant import statements. -->
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="ImportOrder">
+            <!-- Checks for out of order import statements. -->
+
+            <property name="severity" value="warning"/>
+            <!-- <property name="tokens" value="IMPORT, STATIC_IMPORT"/> -->
+            <property name="separated" value="false"/>
+            <property name="groups" value="*"/>
+            <!-- <property name="option" value="above"/> -->
+            <property name="sortStaticImportsAlphabetically" value="true"/>
+        </module>
+
+        <module name="CustomImportOrder">
+            <!-- <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/> -->
+            <!-- <property name="specialImportsRegExp" value="^javax\."/> -->
+            <!-- <property name="standardPackageRegExp" value="^java\."/> -->
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+            <property name="separateLineBetweenGroups" value="false"/>
+        </module>
+
+        <!--
+
+        JAVADOC CHECKS
+
+        -->
+
+        <!-- Checks for Javadoc comments.                     -->
+        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+        <module name="JavadocMethod">
+            <property name="accessModifiers" value="protected"/>
+            <property name="severity" value="warning"/>
+            <property name="allowMissingParamTags" value="true"/>
+            <property name="allowMissingReturnTag" value="true"/>
+        </module>
+
+        <module name="JavadocType">
+            <property name="scope" value="protected"/>
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="JavadocStyle">
+            <property name="severity" value="warning"/>
+        </module>
+
+        <!--
+
+        NAMING CHECKS
+
+        -->
+
+        <!-- Item 38 - Adhere to generally accepted naming conventions -->
+
+        <module name="PackageName">
+            <!-- Validates identifiers for package names against the
+              supplied expression. -->
+            <!-- Here the default checkstyle rule restricts package name parts to
+              seven characters, this is not in line with common practice at Google.
+            -->
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]{1,})*$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="TypeNameCheck">
+            <!-- Validates static, final fields against the
+            expression "^[A-Z][a-zA-Z0-9]*$". -->
+            <metadata name="altname" value="TypeName"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="ConstantNameCheck">
+            <!-- Validates non-private, static, final fields against the supplied
+            public/package final fields "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$". -->
+            <metadata name="altname" value="ConstantName"/>
+            <property name="applyToPublic" value="true"/>
+            <property name="applyToProtected" value="true"/>
+            <property name="applyToPackage" value="true"/>
+            <property name="applyToPrivate" value="false"/>
+            <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*|FLAG_.*)$"/>
+            <message key="name.invalidPattern"
+                     value="Variable ''{0}'' should be in ALL_CAPS (if it is a constant) or be private (otherwise)."/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="StaticVariableNameCheck">
+            <!-- Validates static, non-final fields against the supplied
+            expression "^[a-z][a-zA-Z0-9]*_?$". -->
+            <metadata name="altname" value="StaticVariableName"/>
+            <property name="applyToPublic" value="true"/>
+            <property name="applyToProtected" value="true"/>
+            <property name="applyToPackage" value="true"/>
+            <property name="applyToPrivate" value="true"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*_?$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="MemberNameCheck">
+            <!-- Validates non-static members against the supplied expression. -->
+            <metadata name="altname" value="MemberName"/>
+            <property name="applyToPublic" value="true"/>
+            <property name="applyToProtected" value="true"/>
+            <property name="applyToPackage" value="true"/>
+            <property name="applyToPrivate" value="true"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="MethodNameCheck">
+            <!-- Validates identifiers for method names. -->
+            <metadata name="altname" value="MethodName"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*(_[a-zA-Z0-9]+)*$"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="ParameterName">
+            <!-- Validates identifiers for method parameters against the
+              expression "^[a-z][a-zA-Z0-9]*$". -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="LocalFinalVariableName">
+            <!-- Validates identifiers for local final variables against the
+              expression "^[a-z][a-zA-Z0-9]*$". -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="LocalVariableName">
+            <!-- Validates identifiers for local variables against the
+              expression "^[a-z][a-zA-Z0-9]*$". -->
+            <property name="severity" value="warning"/>
+        </module>
+
+
+        <!--
+
+        LENGTH and CODING CHECKS
+
+        -->
+
+
+        <module name="LeftCurly">
+            <!-- Checks for placement of the left curly brace ('{'). -->
+            <property name="severity" value="warning"/>
+        </module>
+
+        <module name="RightCurly">
+            <!-- Checks right curlies on CATCH, ELSE, and TRY blocks are on
+            the same line. e.g., the following example is fine:
+            <pre>
+              if {
+                ...
+              } else
+            </pre>
+            -->
+            <!-- This next example is not fine:
+            <pre>
+              if {
+                ...
+              }
+              else
+            </pre>
+            -->
+            <property name="option" value="same"/>
+            <property name="severity" value="warning"/>
+        </module>
+
+        <!-- Checks for braces around if and else blocks -->
+        <module name="NeedBraces">
+            <property name="severity" value="warning"/>
+            <property name="tokens" value="LITERAL_IF, LITERAL_ELSE, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO"/>
+        </module>
+
+        <module name="UpperEll">
+            <!-- Checks that long constants are defined with an upper ell.-->
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="FallThrough">
+            <!-- Warn about falling through to the next case statement.  Similar to
+            javac -Xlint:fallthrough, but the check is suppressed if a single-line comment
+            on the last non-blank line preceding the fallen-into case contains 'fall through' (or
+            some other variants which we don't publicized to promote consistency).
+            -->
+            <property name="reliefPattern"
+                      value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
+            <property name="severity" value="error"/>
+        </module>
+
+
+        <!--
+
+        MODIFIERS CHECKS
+
+        -->
+
+        <module name="ModifierOrder">
+            <!-- Warn if modifier order is inconsistent with JLS3 8.1.1, 8.3.1, and
+                 8.4.3.  The prescribed order is:
+                 public, protected, private, abstract, static, final, transient, volatile,
+                 synchronized, native, strictfp
+              -->
+        </module>
+
+
+        <!--
+
+        WHITESPACE CHECKS
+
+        -->
+
+        <module name="WhitespaceAround">
+            <!-- Checks that various tokens are surrounded by whitespace.
+                 This includes most binary operators and keywords followed
+                 by regular or curly braces.
+            -->
+            <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR,
+        BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
+        EQUAL, GE, GT, LAND, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+        LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+        LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
+        MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION,
+        SL, SL_ASSIGN, SR_ASSIGN, STAR, STAR_ASSIGN"/>
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="WhitespaceAfter">
+            <!-- Checks that commas, semicolons and typecasts are followed by
+                 whitespace.
+            -->
+            <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
+        </module>
+
+        <module name="NoWhitespaceAfter">
+            <!-- Checks that there is no whitespace after various unary operators.
+                 Linebreaks are allowed.
+            -->
+            <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS,
+        UNARY_PLUS"/>
+            <property name="allowLineBreaks" value="true"/>
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="NoWhitespaceBefore">
+            <!-- Checks that there is no whitespace before various unary operators.
+                 Linebreaks are allowed.
+            -->
+            <property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/>
+            <property name="allowLineBreaks" value="true"/>
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="ParenPad">
+            <!-- Checks that there is no whitespace before close parens or after
+                 open parens.
+            -->
+            <property name="severity" value="warning"/>
+        </module>
+
+    </module>
+
+    <module name="LineLength">
+        <!-- Checks if a line is too long. -->
+        <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="128"/>
+        <property name="severity" value="error"/>
+
+        <!--
+          The default ignore pattern exempts the following elements:
+            - import statements
+            - long URLs inside comments
+        -->
+
+        <property name="ignorePattern"
+                  value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
+                  default="^(package .*;\s*)|(import .*;\s*)|( *(\*|//).*https?://.*)$"/>
+    </module>
+</module>
+

gradle/quality/cyclonedx.gradle

@@ -0,0 +1,11 @@
+cyclonedxBom {
+    includeConfigs = [ 'runtimeClasspath' ]
+    skipConfigs = [ 'compileClasspath', 'testCompileClasspath' ]
+    projectType = "library"
+    schemaVersion = "1.5"
+    destination = file("build/reports")
+    outputName = "bom"
+    outputFormat = "json"
+    includeBomSerialNumber = true
+    componentVersion = "2.0.0"
+}

gradle/quality/osv-scanner.gradle

@@ -0,0 +1,11 @@
+apply plugin: 'com.fizzpod.osv-scanner'
+
+osvScanner {
+    sbom = rootProject.file('build/reports/bom.json')
+    format = "json"
+    location = 'reports'
+    failOn = 'count'
+    failOnThreshold = 100000
+}
+
+osvSbom.dependsOn(cyclonedxBom)

gradle/quality/pmd.gradle

@@ -0,0 +1,17 @@
+
+apply plugin: 'pmd'
+
+tasks.withType(Pmd) {
+    ignoreFailures = true
+    reports {
+        xml.getRequired().set(true)
+        html.getRequired().set(true)
+    }
+}
+
+pmd {
+    ignoreFailures = true
+    consoleOutput = false
+    toolVersion = "7.3.0"
+    ruleSetFiles = rootProject.files('gradle/quality/pmd/category/java/bestpractices.xml')
+}

gradle/quality/pmd/category/java/categories.properties

@@ -0,0 +1,10 @@
+
+rulesets.filenames=\
+    category/java/bestpractices.xml,\
+    category/java/codestyle.xml,\
+    category/java/design.xml,\
+    category/java/documentation.xml,\
+    category/java/errorprone.xml,\
+    category/java/multithreading.xml,\
+    category/java/performance.xml,\
+    category/java/security.xml

gradle/quality/pmd/category/java/documentation.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+
+<ruleset name="Documentation"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+        Rules that are related to code documentation.
+    </description>
+
+    <rule name="CommentContent"
+          since="5.0"
+          message="Invalid words or phrases found"
+          class="net.sourceforge.pmd.lang.java.rule.documentation.CommentContentRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_documentation.html#commentcontent">
+        <description>
+            A rule for the politically correct... we don't want to offend anyone.
+        </description>
+        <priority>3</priority>
+        <example>
+            <![CDATA[
+//OMG, this is horrible, Bob is an idiot !!!
+]]>
+        </example>
+    </rule>
+
+    <rule name="CommentRequired"
+          since="5.1"
+          message="Comment is required"
+          class="net.sourceforge.pmd.lang.java.rule.documentation.CommentRequiredRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_documentation.html#commentrequired">
+        <description>
+            Denotes whether comments are required (or unwanted) for specific language elements.
+        </description>
+        <priority>3</priority>
+        <example>
+            <![CDATA[
+/**
+*
+*
+* @author Jon Doe
+*/
+]]>
+        </example>
+    </rule>
+
+    <rule name="CommentSize"
+          since="5.0"
+          message="Comment is too large"
+          class="net.sourceforge.pmd.lang.java.rule.documentation.CommentSizeRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_documentation.html#commentsize">
+        <description>
+            Determines whether the dimensions of non-header comments found are within the specified limits.
+        </description>
+        <priority>3</priority>
+        <example>
+            <![CDATA[
+/**
+*
+*   too many lines!
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*/
+]]>
+        </example>
+    </rule>
+
+    <rule name="UncommentedEmptyConstructor"
+          language="java"
+          since="3.4"
+          message="Document empty constructor"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          typeResolution="true"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_documentation.html#uncommentedemptyconstructor">
+        <description>
+            Uncommented Empty Constructor finds instances where a constructor does not
+            contain statements, but there is no comment. By explicitly commenting empty
+            constructors it is easier to distinguish between intentional (commented)
+            and unintentional empty constructors.
+        </description>
+        <priority>3</priority>
+        <properties>
+            <property name="xpath">
+                <value>
+                    <![CDATA[
+//ConstructorDeclaration[@Private='false']
+                        [count(BlockStatement) = 0 and ($ignoreExplicitConstructorInvocation = 'true' or not(ExplicitConstructorInvocation)) and @containsComment = 'false']
+                        [not(../Annotation/MarkerAnnotation/Name[pmd-java:typeIs('javax.inject.Inject')])]
+]]>
+                </value>
+            </property>
+            <property name="ignoreExplicitConstructorInvocation" type="Boolean" description="Ignore explicit constructor invocation when deciding whether constructor is empty or not" value="false"/>
+        </properties>
+        <example>
+            <![CDATA[
+public Foo() {
+  // This constructor is intentionally empty. Nothing special is needed here.
+}
+]]>
+        </example>
+    </rule>
+
+    <rule name="UncommentedEmptyMethodBody"
+          language="java"
+          since="3.4"
+          message="Document empty method body"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_documentation.html#uncommentedemptymethodbody">
+        <description>
+            Uncommented Empty Method Body finds instances where a method body does not contain
+            statements, but there is no comment. By explicitly commenting empty method bodies
+            it is easier to distinguish between intentional (commented) and unintentional
+            empty methods.
+        </description>
+        <priority>3</priority>
+        <properties>
+            <property name="xpath">
+                <value>
+                    <![CDATA[
+//MethodDeclaration/Block[count(BlockStatement) = 0 and @containsComment = 'false']
+]]>
+                </value>
+            </property>
+        </properties>
+        <example>
+            <![CDATA[
+public void doSomething() {
+}
+]]>
+        </example>
+    </rule>
+
+</ruleset>

gradle/quality/pmd/category/java/multithreading.xml

@@ -0,0 +1,393 @@
+<?xml version="1.0"?>
+
+<ruleset name="Multithreading"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+        Rules that flag issues when dealing with multiple threads of execution.
+    </description>
+
+    <rule name="AvoidSynchronizedAtMethodLevel"
+          language="java"
+          since="3.0"
+          message="Use block level rather than method level synchronization"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_multithreading.html#avoidsynchronizedatmethodlevel">
+        <description>
+            Method-level synchronization can cause problems when new code is added to the method.
+            Block-level synchronization helps to ensure that only the code that needs synchronization
+            gets it.
+        </description>
+        <priority>3</priority>
+        <properties>
+            <property name="xpath">
+                <value>//MethodDeclaration[@Synchronized='true']</value>
+            </property>
+        </properties>
+        <example>
+            <![CDATA[
+public class Foo {
+  // Try to avoid this:
+  synchronized void foo() {
+  }
+  // Prefer this:
+  void bar() {
+    synchronized(this) {
+    }
+  }
+
+  // Try to avoid this for static methods:
+  static synchronized void fooStatic() {
+  }
+
+  // Prefer this:
+  static void barStatic() {
+    synchronized(Foo.class) {
+    }
+  }
+}
+]]>
+        </example>
+    </rule>
+
+    <rule name="AvoidThreadGroup"
+          language="java"
+          since="3.6"
+          message="Avoid using java.lang.ThreadGroup; it is not thread safe"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          typeResolution="true"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_multithreading.html#avoidthreadgroup">
+        <description>
+            Avoid using java.lang.ThreadGroup; although it is intended to be used in a threaded environment
+            it contains methods that are not thread-safe.
+        </description>
+        <priority>3</priority>
+        <properties>
+            <property name="xpath">
+                <value>
+                    <![CDATA[
+//AllocationExpression/ClassOrInterfaceType[pmd-java:typeIs('java.lang.ThreadGroup')]|
+//PrimarySuffix[contains(@Image, 'getThreadGroup')]
+]]>
+                </value>
+            </property>
+        </properties>
+        <example>
+            <![CDATA[
+public class Bar {
+    void buz() {
+        ThreadGroup tg = new ThreadGroup("My threadgroup");
+        tg = new ThreadGroup(tg, "my thread group");
+        tg = Thread.currentThread().getThreadGroup();
+        tg = System.getSecurityManager().getThreadGroup();
+    }
+}
+]]>
+        </example>
+    </rule>
+
+    <rule name="AvoidUsingVolatile"
+          language="java"
+          since="4.1"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          message="Use of modifier volatile is not recommended."
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_multithreading.html#avoidusingvolatile">
+        <description>
+            Use of the keyword 'volatile' is generally used to fine tune a Java application, and therefore, requires
+            a good expertise of the Java Memory Model. Moreover, its range of action is somewhat misknown. Therefore,
+            the volatile keyword should not be used for maintenance purpose and portability.
+        </description>
+        <priority>2</priority>
+        <properties>
+            <property name="xpath">
+                <value>//FieldDeclaration[contains(@Volatile,'true')]</value>
+            </property>
+        </properties>
+        <example>
+            <![CDATA[
+public class ThrDeux {
+  private volatile String var1; // not suggested
+  private          String var2; // preferred
+}
+]]>
+        </example>
+    </rule>
+
+    <rule name="DoNotUseThreads"
+          language="java"
+          since="4.1"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          message="To be compliant to J2EE, a webapp should not use any thread."
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_multithreading.html#donotusethreads">
+        <description>
+            The J2EE specification explicitly forbids the use of threads.
+        </description>
+        <priority>3</priority>
+        <properties>
+            <property name="xpath">
+                <value>//ClassOrInterfaceType[@Image = 'Thread' or @Image = 'Runnable']</value>
+            </property>
+        </properties>
+        <example>
+            <![CDATA[
+// This is not allowed
+public class UsingThread extends Thread {
+
+}
+
+// Neither this,
+public class OtherThread implements Runnable {
+    // Nor this ...
+    public void methode() {
+        Runnable thread = new Thread(); thread.run();
+    }
+}
+]]>
+        </example>
+    </rule>
+
+    <rule name="DontCallThreadRun"
+          language="java"
+          since="4.3"
+          message="Don't call Thread.run() explicitly, use Thread.start()"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          typeResolution="true"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_multithreading.html#dontcallthreadrun">
+        <description>
+            Explicitly calling Thread.run() method will execute in the caller's thread of control.  Instead, call Thread.start() for the intended behavior.
+        </description>
+        <priority>4</priority>
+        <properties>
+            <property name="xpath">
+                <value>
+                    <![CDATA[
+//StatementExpression/PrimaryExpression
+[
+    PrimaryPrefix
+    [
+        ./Name[ends-with(@Image, '.run') or @Image = 'run']
+        and substring-before(Name/@Image, '.') =//VariableDeclarator/VariableDeclaratorId/@Image
+            [../../../Type/ReferenceType/ClassOrInterfaceType[pmd-java:typeIs('java.lang.Thread')]]
+        or (./AllocationExpression/ClassOrInterfaceType[pmd-java:typeIs('java.lang.Thread')]
+        and ../PrimarySuffix[@Image = 'run'])
+    ]
+]
+]]>
+                </value>
+            </property>
+        </properties>
+        <example>
+            <![CDATA[
+Thread t = new Thread();
+t.run();            // use t.start() instead
+new Thread().run(); // same violation
+]]>
+        </example>
+    </rule>
+
+    <rule name="DoubleCheckedLocking"
+          language="java"
+          since="1.04"
+          message="Double checked locking is not thread safe in Java."
+          class="net.sourceforge.pmd.lang.java.rule.multithreading.DoubleCheckedLockingRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_multithreading.html#doublecheckedlocking">
+        <description>
+            Partially created objects can be returned by the Double Checked Locking pattern when used in Java.
+            An optimizing JRE may assign a reference to the baz variable before it calls the constructor of the object the
+            reference points to.
+
+            Note: With Java 5, you can make Double checked locking work, if you declare the variable to be `volatile`.
+
+            For more details refer to: &lt;http://www.javaworld.com/javaworld/jw-02-2001/jw-0209-double.html>
+            or &lt;http://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html>
+        </description>
+        <priority>1</priority>
+        <example>
+            <![CDATA[
+public class Foo {
+    /*volatile */ Object baz = null; // fix for Java5 and later: volatile
+    Object bar() {
+        if (baz == null) { // baz may be non-null yet not fully created
+            synchronized(this) {
+                if (baz == null) {
+                    baz = new Object();
+                }
+              }
+        }
+        return baz;
+    }
+}
+]]>
+        </example>
+    </rule>
+
+    <rule name="NonThreadSafeSingleton"
+          since="3.4"
+          message="Singleton is not thread safe"
+          class="net.sourceforge.pmd.lang.java.rule.multithreading.NonThreadSafeSingletonRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_multithreading.html#nonthreadsafesingleton">
+        <description>
+            Non-thread safe singletons can result in bad state changes. Eliminate
+            static singletons if possible by instantiating the object directly. Static
+            singletons are usually not needed as only a single instance exists anyway.
+            Other possible fixes are to synchronize the entire method or to use an
+            [initialize-on-demand holder class](https://en.wikipedia.org/wiki/Initialization-on-demand_holder_idiom).
+
+            Refrain from using the double-checked locking pattern. The Java Memory Model doesn't
+            guarantee it to work unless the variable is declared as `volatile`, adding an uneeded
+            performance penalty. [Reference](http://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html)
+
+            See Effective Java, item 48.
+        </description>
+        <priority>3</priority>
+        <example>
+            <![CDATA[
+private static Foo foo = null;
+
+//multiple simultaneous callers may see partially initialized objects
+public static Foo getFoo() {
+    if (foo==null) {
+        foo = new Foo();
+    }
+    return foo;
+}
+]]>
+        </example>
+    </rule>
+
+    <rule name="UnsynchronizedStaticDateFormatter"
+          since="3.6"
+          deprecated="true"
+          message="Static DateFormatter objects should be accessed in a synchronized manner"
+          class="net.sourceforge.pmd.lang.java.rule.multithreading.UnsynchronizedStaticDateFormatterRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_multithreading.html#unsynchronizedstaticdateformatter">
+        <description>
+            SimpleDateFormat instances are not synchronized. Sun recommends using separate format instances
+            for each thread. If multiple threads must access a static formatter, the formatter must be
+            synchronized either on method or block level.
+
+            This rule has been deprecated in favor of the rule {% rule UnsynchronizedStaticFormatter %}.
+        </description>
+        <priority>3</priority>
+        <example>
+            <![CDATA[
+public class Foo {
+    private static final SimpleDateFormat sdf = new SimpleDateFormat();
+    void bar() {
+        sdf.format(); // poor, no thread-safety
+    }
+    synchronized void foo() {
+        sdf.format(); // preferred
+    }
+}
+]]>
+        </example>
+    </rule>
+
+    <rule name="UnsynchronizedStaticFormatter"
+          since="6.11.0"
+          message="Static Formatter objects should be accessed in a synchronized manner"
+          class="net.sourceforge.pmd.lang.java.rule.multithreading.UnsynchronizedStaticFormatterRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_multithreading.html#unsynchronizedstaticformatter">
+        <description>
+            Instances of `java.text.Format` are generally not synchronized.
+            Sun recommends using separate format instances for each thread.
+            If multiple threads must access a static formatter, the formatter must be
+            synchronized either on method or block level.
+        </description>
+        <priority>3</priority>
+        <example>
+            <![CDATA[
+public class Foo {
+    private static final SimpleDateFormat sdf = new SimpleDateFormat();
+    void bar() {
+        sdf.format(); // poor, no thread-safety
+    }
+    synchronized void foo() {
+        sdf.format(); // preferred
+    }
+}
+]]>
+        </example>
+    </rule>
+
+    <rule name="UseConcurrentHashMap"
+          language="java"
+          minimumLanguageVersion="1.5"
+          since="4.2.6"
+          message="If you run in Java5 or newer and have concurrent access, you should use the ConcurrentHashMap implementation"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_multithreading.html#useconcurrenthashmap">
+        <description>
+            Since Java5 brought a new implementation of the Map designed for multi-threaded access, you can
+            perform efficient map reads without blocking other threads.
+        </description>
+        <priority>3</priority>
+        <properties>
+            <property name="xpath">
+                <value>
+                    <![CDATA[
+//Type[../VariableDeclarator/VariableInitializer//AllocationExpression/ClassOrInterfaceType[@Image != 'ConcurrentHashMap']]
+/ReferenceType/ClassOrInterfaceType[@Image = 'Map']
+]]>
+                </value>
+            </property>
+        </properties>
+        <example>
+            <![CDATA[
+public class ConcurrentApp {
+  public void getMyInstance() {
+    Map map1 = new HashMap();           // fine for single-threaded access
+    Map map2 = new ConcurrentHashMap(); // preferred for use with multiple threads
+
+    // the following case will be ignored by this rule
+    Map map3 = someModule.methodThatReturnMap(); // might be OK, if the returned map is already thread-safe
+  }
+}
+]]>
+        </example>
+    </rule>
+
+    <rule name="UseNotifyAllInsteadOfNotify"
+          language="java"
+          since="3.0"
+          message="Call Thread.notifyAll() rather than Thread.notify()"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_multithreading.html#usenotifyallinsteadofnotify">
+        <description>
+            Thread.notify() awakens a thread monitoring the object. If more than one thread is monitoring, then only
+            one is chosen.  The thread chosen is arbitrary; thus its usually safer to call notifyAll() instead.
+        </description>
+        <priority>3</priority>
+        <properties>
+            <property name="xpath">
+                <value>
+                    <![CDATA[
+//StatementExpression/PrimaryExpression
+[PrimarySuffix/Arguments[@ArgumentCount = '0']]
+[
+    PrimaryPrefix[
+        ./Name[@Image='notify' or ends-with(@Image,'.notify')]
+        or ../PrimarySuffix/@Image='notify'
+        or (./AllocationExpression and ../PrimarySuffix[@Image='notify'])
+    ]
+]
+]]>
+                </value>
+            </property>
+        </properties>
+        <example>
+            <![CDATA[
+  void bar() {
+    x.notify();
+    // If many threads are monitoring x, only one (and you won't know which) will be notified.
+    // use instead:
+    x.notifyAll();
+  }
+]]>
+        </example>
+    </rule>
+
+</ruleset>

gradle/quality/pmd/category/java/security.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<ruleset name="Security" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+        Rules that flag potential security flaws.
+    </description>
+
+    <rule name="HardCodedCryptoKey"
+          since="6.4.0"
+          message="Do not use hard coded encryption keys"
+          class="net.sourceforge.pmd.lang.java.rule.security.HardCodedCryptoKeyRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_security.html#hardcodedcryptokey">
+        <description>
+            Do not use hard coded values for cryptographic operations. Please store keys outside of source code.
+        </description>
+        <priority>3</priority>
+        <example>
+            <![CDATA[
+public class Foo {
+    void good() {
+        SecretKeySpec secretKeySpec = new SecretKeySpec(Properties.getKey(), "AES");
+    }
+
+    void bad() {
+        SecretKeySpec secretKeySpec = new SecretKeySpec("my secret here".getBytes(), "AES");
+    }
+}
+]]>
+        </example>
+    </rule>
+
+    <rule name="InsecureCryptoIv"
+          since="6.3.0"
+          message="Do not use hard coded initialization vector in crypto operations"
+          class="net.sourceforge.pmd.lang.java.rule.security.InsecureCryptoIvRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_security.html#insecurecryptoiv">
+        <description>
+            Do not use hard coded initialization vector in cryptographic operations. Please use a randomly generated IV.
+        </description>
+        <priority>3</priority>
+        <example>
+            <![CDATA[
+public class Foo {
+    void good() {
+        SecureRandom random = new SecureRandom();
+        byte iv[] = new byte[16];
+        random.nextBytes(bytes);
+    }
+
+    void bad() {
+        byte[] iv = new byte[] { 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, };
+    }
+
+    void alsoBad() {
+        byte[] iv = "secret iv in here".getBytes();
+    }
+}
+]]>
+        </example>
+    </rule>
+
+</ruleset>

gradle/quality/snyk.gradle

@@ -0,0 +1,14 @@
+
+apply plugin: 'io.snyk.gradle.plugin.snykplugin'
+
+if (project.hasProperty('snykToken')) {
+
+    snyk {
+        arguments = '--all-sub-projects'
+        severity = 'low'
+        api = project.property('snykToken')
+        autoDownload = true
+        autoUpdate = true
+    }
+
+}

gradle/quality/spotbugs.gradle

@@ -0,0 +1,19 @@
+apply plugin: "com.github.spotbugs"
+
+spotbugs {
+    ignoreFailures = true
+}
+
+spotbugsMain {
+    enabled = false
+    reports {
+        html {
+            enabled = true
+            destination = file("$buildDir/reports/spotbugs/main/spotbugs.html")
+        }
+    }
+}
+
+spotbugsTest {
+    enabled = false
+}

gradle/repositories/artifactory.gradle

@@ -0,0 +1,7 @@
+/*
+repositories {
+    maven {
+        url = 'https://repo.hbz-nrw.de/artifactory/gradle-dev/'
+    }
+}
+*/

gradle/repositories/forgejo.gradle

@@ -0,0 +1,5 @@
+repositories {
+    maven {
+        url = 'https://xbib.org/api/packages/joerg/maven'
+    }
+}

gradle/repositories/maven.gradle

@@ -0,0 +1,4 @@
+repositories {
+    mavenLocal()
+    mavenCentral()
+}

gradle/test/junit5.gradle

@@ -1,21 +1,18 @@
-
-def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.7.0'
-def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
-
 dependencies {
-    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
+    testImplementation testLibs.junit.jupiter.api
-    testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
+    testImplementation testLibs.junit.jupiter.params
-    testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"
+    testImplementation testLibs.hamcrest
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
+    testRuntimeOnly testLibs.junit.jupiter.engine
+    testRuntimeOnly testLibs.junit.jupiter.platform.launcher
 }
 
 test {
     useJUnitPlatform()
-    systemProperty 'jna.debug_load', 'true'
+    failFast = false
-    failFast = true
+    ignoreFailures = true
     testLogging {
-        showStandardStreams = true
         events 'STARTED', 'PASSED', 'FAILED', 'SKIPPED'
+        showStandardStreams = true
     }
     afterSuite { desc, result ->
         if (!desc.parent) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
+fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
+
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-#     shell script including quotes and variable substitutions, so put them in
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-#     double quotes to make sure that they get re-expanded; and
+
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

log4j-systemd-journal/build.gradle

@@ -1,8 +1,6 @@
 
-version = "${project.property('log4j.version')}.0"
-
 dependencies {
-    implementation "net.java.dev.jna:jna:${project.property('jna.version')}"
+    implementation libs.jna
-    implementation "org.apache.logging.log4j:log4j-core:${project.property('log4j.version')}"
+    implementation libs.log4j2
-    testImplementation "org.mockito:mockito-junit-jupiter:${project.property('mockito.version')}"
+    testImplementation testLibs.mockito
 }

log4j-systemd-journal/src/main/java/org/xbib/log4j/systemd/SystemdLibraryAPI.java

@@ -2,13 +2,10 @@ package org.xbib.log4j.systemd;
 
 import com.sun.jna.Native;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.List;
 
 /**
  * The systemd library API, loaded by Java Native Access (JNA).
- *
  * The native library is loaded only once, so this class is a singleton.
  */
 public class SystemdLibraryAPI {
@@ -35,7 +32,7 @@ public class SystemdLibraryAPI {
 
     private static SystemdLibrary loadLibrary() {
         try {
-            return (SystemdLibrary) AccessController.doPrivileged((PrivilegedAction<Object>) () -> Native.load("systemd", SystemdLibrary.class));
+            return Native.load("systemd", SystemdLibrary.class);
         } catch (UnsatisfiedLinkError e) {
             throw new RuntimeException("Failed to load systemd library." +
                     " Please note that JNA requires an executable temporary folder." +

settings.gradle

@@ -1,3 +1,37 @@
+pluginManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral {
+            metadataSources {
+                mavenPom()
+                artifact()
+                ignoreGradleMetadataRedirection()
+            }
+        }
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        libs {
+            version('gradle', '8.7')
+            library('jna', 'net.java.dev.jna', 'jna').version('5.16.0')
+            library('log4j2', 'org.apache.logging.log4j', 'log4j-core').version('2.24.3')
+            library('bridj', 'com.nativelibs4java', 'bridj').version('0.7.0')
+        }
+        testLibs {
+            version('junit', '5.11.4')
+            library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
+            library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
+            library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
+            library('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.11.4')
+            library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
+            library('mockito', 'org.mockito', 'mockito-junit-jupiter').version('5.15.2')
+        }
+    }
+}
+
 include 'log4j-systemd-journal'
 include 'systemd-journal-bridj'
 include 'systemd-journal-jna'

systemd-journal-bridj/build.gradle

@@ -1,5 +1,5 @@
 
 dependencies {
-    implementation "com.nativelibs4java:bridj:${project.property('bridj.version')}"
+    implementation libs.bridj
-    testImplementation "org.mockito:mockito-junit-jupiter:${project.property('mockito.version')}"
+    testImplementation testLibs.mockito
 }

systemd-journal-bridj/src/main/java/org/xbib/systemd/journal/DefaultJournalEntry.java

@@ -1,5 +1,8 @@
 package org.xbib.systemd.journal;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class DefaultJournalEntry implements JournalEntry {
 
     private String message;
@@ -76,6 +79,16 @@ public class DefaultJournalEntry implements JournalEntry {
 
     private String lineBreak;
 
+    private String runtimeScope;
+
+    private String tid;
+
+    private String userInvocationId;
+
+    private String userUnit;
+
+    private String cpuUsageNsec;
+
     public void setMessage(String message) {
         this.message = message;
     }
@@ -409,6 +422,50 @@ public class DefaultJournalEntry implements JournalEntry {
         return lineBreak;
     }
 
+    public void setRuntimeScope(String runtimeScope) {
+        this.runtimeScope = runtimeScope;
+    }
+
+    @Override
+    public String getRuntimeScope() {
+        return runtimeScope;
+    }
+
+    public void setTid(String tid) {
+        this.tid = tid;
+    }
+
+    @Override
+    public String getTid() {
+        return tid;
+    }
+
+    public void setUserInvocationId(String userInvocationId) {
+        this.userInvocationId = userInvocationId;
+    }
+
+    @Override
+    public String getUserInvocationId() {
+        return userInvocationId;
+    }
+
+    public void setUserUnit(String userUnit) {
+        this.userUnit = userUnit;
+    }
+
+    @Override
+    public String getUserUnit() {
+        return userUnit;
+    }
+
+    public void setCpuUsageNsec(String cpuUsageNsec) {
+        this.cpuUsageNsec = cpuUsageNsec;
+    }
+
+    public String getCpuUsageNsec() {
+        return cpuUsageNsec;
+    }
+
     @Override
     public String getFieldValue(String fieldName) {
         return null;
@@ -416,6 +473,43 @@ public class DefaultJournalEntry implements JournalEntry {
 
     @Override
     public String toString() {
-        return "priority=" + this.priority + ",message=" + this.message;
+        Map<String, Object> map = new HashMap<>();
+        map.put("message", message);
+        map.put("messageId", messageId);
+        map.put("priority", priority);
+        map.put("codefile", codeFile);
+        map.put("codefunc", codeFunc);
+        map.put("codeline", codeLine);
+        map.put("errno", errno);
+        map.put("syslogfacility", syslogFacility);
+        map.put("syslogidentifier", syslogIdentifier);
+        map.put("syslogpid", syslogPid);
+        map.put("syslograw", syslogRaw);
+        map.put("syslogtimestamp", syslogTimestamp);
+        map.put("pid", pid);
+        map.put("uid", uid);
+        map.put("gid", gid);
+        map.put("comm", comm);
+        map.put("exe", exe);
+        map.put("cmdline", cmdLine);
+        map.put("capeffective", capEffective);
+        map.put("auditsession", auditSession);
+        map.put("auditloginuid", auditLoginUid);
+        map.put("systemdcgroup", systemdCgroup);
+        map.put("systemduserslice", systemdUserSlice);
+        map.put("systemduserunit", systemdUserUnit);
+        map.put("systemdsession", systemdSession);
+        map.put("systemdowneruid", systemdOwnerUid);
+        map.put("selinuxcontext", selinuxContext);
+        map.put("sourcerealtimetimestamp", sourceRealtimeTimestamp);
+        map.put("bootid", bootId);
+        map.put("machineid", machineId);
+        map.put("systemdinvocationid", systemdInvocationId);
+        map.put("hostname", hostname);
+        map.put("transport", transport);
+        map.put("streamid", streamId);
+        map.put("linebreak", lineBreak);
+        map.put("runtimescope", runtimeScope);
+        return map.toString();
     }
 }

systemd-journal-bridj/src/main/java/org/xbib/systemd/journal/JournalEntry.java

@@ -58,6 +58,8 @@ public interface JournalEntry {
 
     String getSystemdOwnerUid();
 
+    String getSystemdInvocationId();
+
     String getSelinuxContext();
 
     String getSourceRealtimeTimestamp();
@@ -66,8 +68,6 @@ public interface JournalEntry {
 
     String getMachineId();
 
-    String getSystemdInvocationId();
-
     String getHostname();
 
     String getTransport();
@@ -76,5 +76,13 @@ public interface JournalEntry {
 
     String getLineBreak();
 
+    String getRuntimeScope();
+
+    String getTid();
+
+    String getUserInvocationId();
+
+    String getUserUnit();
+
     String getFieldValue(String fieldName);
 }

systemd-journal-bridj/src/main/java/org/xbib/systemd/journal/SystemdJournalConsumer.java

@@ -100,104 +100,56 @@ public class SystemdJournalConsumer implements Runnable {
     }
 
     private JournalEntry makeEntry(List<String> list) {
-        DefaultJournalEntry journalEntry = new DefaultJournalEntry();
+        DefaultJournalEntry entry = new DefaultJournalEntry();
         for (String string : list) {
-            if (string.startsWith("MESSAGE=")) {
+            int pos = string.indexOf('=');
-                journalEntry.setMessage(string.substring(8));
+            String fieldname = pos > 0 ? string.substring(0, pos) : string;
-                continue;
+            String fieldvalue = pos > 0 ? string.substring(pos + 1) : string;
-            }
+            switch (fieldname) {
-            if (string.startsWith("MESSAGE_ID=")) {
+                case "MESSAGE" -> entry.setMessage(fieldvalue);
-                journalEntry.setMessageId(string.substring(11));
+                case "MESSAGE_ID" -> entry.setMessageId(fieldvalue);
-                continue;
+                case "PRIORITY" -> entry.setPriority(Integer.parseInt(fieldvalue));
-            }
+                case "CODE_FILE" -> entry.setCodeFile(fieldvalue);
-            if (string.startsWith("PRIORITY=")) {
+                case "CODE_LINE" -> entry.setCodeLine(fieldvalue);
-                journalEntry.setPriority(Integer.parseInt(string.substring(9)));
+                case "CODE_FUNC" -> entry.setCodeFunc(fieldvalue);
-                continue;
+                case "ERRNO" -> entry.setErrno(fieldvalue);
-            }
+                case "SYSLOG_FACILITY" -> entry.setSyslogFacility(fieldvalue);
-            if (string.startsWith("CODE_FILE=")) {
+                case "SYSLOG_IDENTIFIER" -> entry.setSyslogIdentifier(fieldvalue);
-                journalEntry.setCodeFile(string.substring(10));
+                case "SYSLOG_PID" -> entry.setSyslogPid(fieldvalue);
-                continue;
+                case "SYSLOG_TIMESTAMP" -> entry.setSyslogTimestamp(fieldvalue);
-            }
+                case "SYSLOG_RAW" -> entry.setSyslogRaw(fieldvalue);
-            if (string.startsWith("CODE_LINE=")) {
+                case "TID" -> entry.setTid(fieldvalue);
-                journalEntry.setCodeLine(string.substring(10));
+                case "USER_UNIT" -> entry.setUserUnit(fieldvalue);
-                continue;
+                case "USER_INVOCATION_ID" -> entry.setUserInvocationId(fieldvalue);
-            }
+                case "CPU_USAGE_NSEC" -> entry.setCpuUsageNsec(fieldvalue);
-            if (string.startsWith("CODE_FUNC=")) {
+                case "_PID" -> entry.setPid(fieldvalue);
-                journalEntry.setCodeFunc(string.substring(10));
+                case "_UID" -> entry.setUid(fieldvalue);
-                continue;
+                case "_GID" -> entry.setGid(fieldvalue);
-            }
+                case "_COMM" -> entry.setComm(fieldvalue);
-            if (string.startsWith("ERRNO=")) {
+                case "_EXE" -> entry.setExe(fieldvalue);
-                journalEntry.setErrno(string.substring(6));
+                case "_CMDLINE" -> entry.setCmdLine(fieldvalue);
-                continue;
+                case "_CAP_EFFECTIVE" -> entry.setCapEffective(fieldvalue);
-            }
+                case "_TRANSPORT" -> entry.setTransport(fieldvalue);
-            if (string.startsWith("SYSLOG_FACILITY=")) {
+                case "_SYSTEMD_OWNER_UID" -> entry.setSystemdOwnerUid(fieldvalue);
-                journalEntry.setSyslogFacility(string.substring(16));
+                case "_SYSTEMD_CGROUP" -> entry.setSystemdCgroup(fieldvalue);
-                continue;
+                case "_SYSTEMD_UNIT" -> entry.setSystemdUnit(fieldvalue);
-            }
+                case "_SYSTEMD_SLICE" -> entry.setSystemdSlice(fieldvalue);
-            if (string.startsWith("SYSLOG_IDENTIFIER=")) {
+                case "_SYSTEMD_USER_SLICE" -> entry.setSystemdUserSlice(fieldvalue);
-                journalEntry.setSyslogIdentifier(string.substring(18));
+                case "_SYSTEMD_USER_UNIT" -> entry.setSystemdUserUnit(fieldvalue);
-                continue;
+                case "_SYSTEMD_INVOCATION_ID" -> entry.setSystemdInvocationId(fieldvalue);
-            }
+                case "_AUDIT_SESSION" -> entry.setAuditSession(fieldvalue);
-            if (string.startsWith("SYSLOG_PID=")) {
+                case "_AUDIT_LOGINUID" -> entry.setAuditLoginUid(fieldvalue);
-                journalEntry.setSyslogPid(string.substring(11));
+                case "_BOOT_ID" -> entry.setBootId(fieldvalue);
-                continue;
+                case "_MACHINE_ID" -> entry.setMachineId(fieldvalue);
-            }
+                case "_SELINUX_CONTEXT" -> entry.setSelinuxContext(fieldvalue);
-            if (string.startsWith("SYSLOG_TIMESTAMP=")) {
+                case "_STREAM_ID" -> entry.setStreamId(fieldvalue);
-                journalEntry.setSyslogTimestamp(string.substring(17));
+                case "_SOURCE_REALTIME_TIMESTAMP" -> entry.setSourceRealtimeTimestamp(fieldvalue);
-                continue;
+                case "_RUNTIME_SCOPE" -> entry.setRuntimeScope(fieldvalue);
-            }
+                case "_HOSTNAME" -> entry.setHostname(fieldvalue);
-            if (string.startsWith("SYSLOG_RAW=")) {
+                case "_LINEBREAK" -> entry.setLineBreak(fieldvalue);
-                journalEntry.setSyslogRaw(string.substring(11));
+                default -> logger.log(Level.INFO, "unprocessed field: " + fieldname);
-                continue;
-            }
-            if (string.startsWith("_PID=")) {
-                journalEntry.setPid(string.substring(5));
-                continue;
-            }
-            if (string.startsWith("_UID=")) {
-                journalEntry.setUid(string.substring(5));
-                continue;
-            }
-            if (string.startsWith("_GID=")) {
-                journalEntry.setGid(string.substring(5));
-                continue;
-            }
-            if (string.startsWith("_COMM=")) {
-                journalEntry.setComm(string.substring(6));
-                continue;
-            }
-            if (string.startsWith("_EXE=")) {
-                journalEntry.setExe(string.substring(5));
-                continue;
-            }
-            if (string.startsWith("_CMDLINE=")) {
-                journalEntry.setCmdLine(string.substring(9));
-                continue;
-            }
-            if (string.startsWith("_CAP_EFFECTIVE=")) {
-                journalEntry.setCapEffective(string.substring(15));
-                continue;
-            }
-            if (string.startsWith("_TRANSPORT=")) {
-                journalEntry.setTransport(string.substring(11));
-                continue;
-            }
-            if (string.startsWith("_SYSTEMD_OWNER_UID=")) {
-                journalEntry.setSystemdOwnerUid(string.substring(19));
-                continue;
-            }
-            if (string.startsWith("_SYSTEMD_UNIT=")) {
-                journalEntry.setSystemdUnit(string.substring(13));
-                continue;
-            }
-            if (string.startsWith("_SYSTEMD_USER_SLICE=")) {
-                journalEntry.setSystemdUserSlice(string.substring(19));
-                continue;
-            }
-            if (string.startsWith("_SYSTEMD_USER_UNIT=")) {
-                journalEntry.setSystemdUserUnit(string.substring(18));
             }
         }
-        return journalEntry;
+        return entry;
     }
 }

systemd-journal-bridj/src/main/java/org/xbib/systemd/journal/SystemdJournalLibrary.java

@@ -389,7 +389,5 @@ public class SystemdJournalLibrary {
     protected native static int sd_journal_get_catalog_for_message_id(sd_id128 id, @Ptr long ret);
 
     public interface sdJournal {
-
     }
-
 }

systemd-journal-bridj/src/test/java/org/xbib/systemd/journal/SystemdJournalReaderTest.java

@@ -1,5 +1,6 @@
 package org.xbib.systemd.journal;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 import org.junit.jupiter.api.condition.OS;
@@ -8,6 +9,7 @@ import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+@Disabled
 @EnabledOnOs({OS.LINUX})
 class SystemdJournalReaderTest {
 
@@ -15,7 +17,8 @@ class SystemdJournalReaderTest {
 
     @Test
     void testConsumer() throws InterruptedException {
-        SystemdJournalConsumer consumer = new SystemdJournalConsumer("SYSLOG_IDENTIFIER=su",
+        // "SYSLOG_IDENTIFIER=su"
+        SystemdJournalConsumer consumer = new SystemdJournalConsumer(null,
                 entry -> logger.log(Level.INFO, entry.toString()));
         Executors.newSingleThreadExecutor().submit(consumer);
         //  consuming for some seconds

systemd-journal-jna/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation "net.java.dev.jna:jna:${project.property('jna.version')}"
+    implementation libs.jna
-    testImplementation "org.mockito:mockito-junit-jupiter:${project.property('mockito.version')}"
+    testImplementation testLibs.mockito
 }

systemd-journal-jna/src/main/java/org/xbib/systemd/journal/SystemdJournalConsumer.java

@@ -14,6 +14,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import static org.xbib.systemd.journal.SystemdLibraryInstance.SD_JOURNAL_LOCAL_ONLY;
+import static org.xbib.systemd.journal.SystemdLibraryInstance.SD_JOURNAL_SYSTEM;
 
 public class SystemdJournalConsumer implements Runnable {
 
@@ -45,46 +46,46 @@ public class SystemdJournalConsumer implements Runnable {
     }
 
     private void loop() throws IOException {
-        SystemdLibraryInstance api = SystemdLibraryInstance.getInstance();
+        SystemdLibraryInstance instance = SystemdLibraryInstance.getInstance();
         SystemdLibrary.SdJournal sdJournal = new SystemdLibrary.SdJournal();
-        logger.log(Level.INFO, "opening");
+        logger.log(Level.INFO, "opening journal");
-        int rc = api.sd_journal_open(sdJournal, SD_JOURNAL_LOCAL_ONLY);
+        int rc = instance.sd_journal_open(sdJournal, 0); // SD_JOURNAL_LOCAL_ONLY + SD_JOURNAL_SYSTEM
-        logger.log(Level.INFO, "open: " + rc);
+        logger.log(Level.INFO, "open returns: " + rc);
         if (rc != 0) {
             logger.log(Level.WARNING, "error opening journal for read: " + rc);
             return;
         }
         if (match != null) {
-            rc = api.sd_journal_add_match(sdJournal, match, match.length());
+            rc = instance.sd_journal_add_match(sdJournal, match, match.length());
             logger.log(Level.INFO, "add_match: " + rc);
             if (rc != 0) {
                 logger.log(Level.WARNING, "error in add_match: " + rc);
                 return;
             }
         }
-        rc = api.sd_journal_get_fd(sdJournal);
+        rc = instance.sd_journal_get_fd(sdJournal);
         logger.log(Level.INFO, "get_fd: " + rc);
-        rc = api.sd_journal_seek_tail(sdJournal);
+        rc = instance.sd_journal_seek_tail(sdJournal);
         logger.log(Level.INFO, "seek_tail: " + rc);
-        rc = api.sd_journal_previous(sdJournal);
+        rc = instance.sd_journal_previous(sdJournal);
         logger.log(Level.INFO, "previous: " + rc);
-        rc = api.sd_journal_next(sdJournal);
+        rc = instance.sd_journal_next(sdJournal);
         logger.log(Level.INFO, "next: " + rc);
         String[] strings = new String[1];
         StringArray cursor = new StringArray(strings);
-        rc = api.sd_journal_get_cursor(sdJournal, cursor);
+        rc = instance.sd_journal_get_cursor(sdJournal, cursor);
         logger.log(Level.INFO, "get_cursor: " + rc);
         while (true) {
             do {
-                rc = api.sd_journal_wait(sdJournal, -1);
+                logger.log(Level.INFO, "waiting");
-                logger.log(Level.INFO, "wait: " + rc);
+                rc = instance.sd_journal_wait(sdJournal, -1);
             } while (rc == 0); // NOP
-            while ((rc = api.sd_journal_next(sdJournal)) > 0) {
+            while ((rc = instance.sd_journal_next(sdJournal)) > 0) {
                 logger.log(Level.INFO, "next: " + rc);
                 if (field != null) {
                     Pointer dataPointer = new Memory(Native.POINTER_SIZE);
                     Pointer sizePointer = new Memory(Native.POINTER_SIZE);
-                    rc = api.sd_journal_get_data(sdJournal, field, dataPointer, sizePointer);
+                    rc = instance.sd_journal_get_data(sdJournal, field, dataPointer, sizePointer);
                     logger.log(Level.INFO, "get_data: " + rc);
                     if (rc != 0) {
                         throw new IOException("error in get_data: " + rc);
@@ -98,21 +99,21 @@ public class SystemdJournalConsumer implements Runnable {
                 } else {
                     String[] strings2 = new String[1];
                     StringArray nextCursor = new StringArray(strings2);
-                    rc = api.sd_journal_get_cursor(sdJournal, nextCursor);
+                    rc = instance.sd_journal_get_cursor(sdJournal, nextCursor);
                     logger.log(Level.INFO, "get_cursor: " + rc);
                     if (!cursor.getString(0).equals(nextCursor.getString(0))) {
                         cursor = nextCursor;
                         Pointer dataPointer = new Memory(Native.POINTER_SIZE);
                         Pointer sizePointer = new Memory(Native.POINTER_SIZE);
                         List<String> list = new ArrayList<>();
-                        while ((rc = api.sd_journal_enumerate_data(sdJournal, dataPointer, sizePointer)) > 0) {
+                        while ((rc = instance.sd_journal_enumerate_data(sdJournal, dataPointer, sizePointer)) > 0) {
                             logger.log(Level.INFO, "enumerate_data: " + rc);
                             int size = sizePointer.getInt(0);
                             byte[] b = dataPointer.getByteArray(0, size);
                             String s = new String(b, StandardCharsets.UTF_8);
                             list.add(s);
                         }
-                        rc = api.sd_journal_restart_data(sdJournal);
+                        rc = instance.sd_journal_restart_data(sdJournal);
                         logger.log(Level.INFO, "restart_data: " + rc);
                         if (listener != null) {
                             listener.handleEntry(makeEntry(list));

systemd-journal-jna/src/test/java/org/xbib/systemd/journal/SystemdJournalReaderTest.java

@@ -1,17 +1,16 @@
 package org.xbib.systemd.journal;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 import org.junit.jupiter.api.condition.OS;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+@Disabled
 @EnabledOnOs({OS.LINUX})
-@ExtendWith(MockitoExtension.class)
 public class SystemdJournalReaderTest {
 
     private static final Logger logger = Logger.getLogger(SystemdJournalReaderTest.class.getName());

systemd-journal-jna/src/test/resources/logging.properties

@@ -1,8 +1,5 @@
-handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+handlers=java.util.logging.ConsoleHandler
 .level=ALL
 java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
 java.util.logging.ConsoleHandler.level=ALL
 java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
-java.util.logging.FileHandler.level=ALL
-java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
-java.util.logging.FileHandler.pattern=build/test.log