Updated

Author: phax

.github/workflows/maven.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 21, 25 ]
+        java: [ 17, 21, 25 ]
     name: Java ${{ matrix.java }} build
 
     steps:
@@ -62,11 +62,11 @@ jobs:
           
     - name: Build and deploy with Maven
       run: mvn --batch-mode --update-snapshots -P release-snapshot deploy
-      if: matrix.java == 21
+      if: matrix.java == 17
       env:
         MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
         MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
 
     - name: Maven Build
       run: mvn --batch-mode --update-snapshots install
-      if: matrix.java != 21
+      if: matrix.java != 17

phoss-directory-client/findbugs-exclude.xml

@@ -99,7 +99,7 @@
           <instructions>
             <Automatic-Module-Name>com.helger.pd.client</Automatic-Module-Name>
             <Export-Package>com.helger.pd.client.*</Export-Package>
-            <Import-Package>!jakarta.annotation.*,*</Import-Package>
+            <Import-Package>!org.jspecify.annotations.*,*</Import-Package>
           </instructions>
         </configuration>
       </plugin>

phoss-directory-client/pom.xml

@@ -157,7 +157,7 @@
             <!-- To use the filtered resources -->
             <Automatic-Module-Name>com.helger.pd.indexer</Automatic-Module-Name>
             <Export-Package>com.helger.pd.indexer.*</Export-Package>
-            <Import-Package>!jakarta.annotation.*,*</Import-Package>
+            <Import-Package>!org.jspecify.annotations.*,*</Import-Package>
             <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
             <Provide-Capability>osgi.serviceloader; osgi.serviceloader=com.helger.xml.microdom.convert.IMicroTypeConverterRegistrarSPI</Provide-Capability>
             <!-- The latter one has precedence -->

phoss-directory-indexer/findbugs-exclude.xml

@@ -93,7 +93,7 @@
           <instructions>
             <Automatic-Module-Name>com.helger.pd.searchapi</Automatic-Module-Name>
             <Export-Package>com.helger.pd.searchapi.*</Export-Package>
-            <Import-Package>!jakarta.annotation.*,*</Import-Package>
+            <Import-Package>!org.jspecify.annotations.*,*</Import-Package>
           </instructions>
         </configuration>
       </plugin>