Migrate DL Query to Protégé 6

.github/workflows/build.yml

@@ -0,0 +1,28 @@
+name: Build
+
+on:
+  push:
+    branches: [protege-6]
+  pull_request:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: build-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the source
+        uses: actions/checkout@v5
+      - name: Set up Java and Maven
+        uses: actions/setup-java@v5
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build and test
+        run: mvn --batch-mode clean verify

.github/workflows/publish.yml

@@ -0,0 +1,47 @@
+name: Publish packages to the Maven Central Repository
+
+on:
+  release:
+    types: [released]
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the source
+        uses: actions/checkout@v5
+      # Release versions must match the GitHub tag. Manual runs leave the
+      # version unchanged and are intended for publishing snapshots.
+      - if: github.event_name == 'release'
+        name: Validate release tag
+        env:
+          RELEASE_TAG: ${{ github.event.release.tag_name }}
+        run: |
+          if [[ ! "$RELEASE_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z]+([.-][0-9A-Za-z]+)*)?$ ]]; then
+            echo "::error::Release tag '$RELEASE_TAG' must be a Maven version such as '5.0.0' or '5.0.0-beta-1' (without a 'v' prefix)."
+            exit 1
+          fi
+      - name: Set up Java and Maven
+        uses: actions/setup-java@v5
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          server-id: ossrh
+          server-username: OSSRH_USERNAME
+          server-password: OSSRH_TOKEN
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg-passphrase: GPG_PASSPHRASE
+      - if: github.event_name == 'release'
+        name: Set the release version
+        env:
+          RELEASE_VERSION: ${{ github.event.release.tag_name }}
+        run: mvn --batch-mode versions:set -DnewVersion="$RELEASE_VERSION" -DgenerateBackupPoms=false
+      # These OSSRH-named variables contain the Maven Central Portal token.
+      - name: Publish packages
+        run: mvn --batch-mode --activate-profiles release deploy
+
+env:
+  GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+  OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+  OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}

README.md

@@ -1,7 +1,11 @@
-dlquery
-=======
+# DL Query
 
-A [Protege](http://protege.stanford.edu/products.php#desktop-protege) plugin that provides an interface for querying
-OWL ontologies.
+A [Protégé](https://protege.stanford.edu/) plugin that provides an interface for querying OWL ontologies using the active reasoner.
 
-User's guide is [available](http://protegewiki.stanford.edu/wiki/DLQueryTab) on the Protege Wiki.
+The `5.x` development line targets Protégé 6 and OWL API 5. Build and run the tests with Java 11 or later:
+
+```shell
+mvn --batch-mode clean verify
+```
+
+The [user guide](https://protegewiki.stanford.edu/wiki/DLQueryTab) is available on the Protégé Wiki.

pom.xml

@@ -2,17 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
-
-
     <groupId>edu.stanford.protege</groupId>
     <artifactId>org.coode.dlquery</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>DL Query</name>
@@ -79,9 +71,9 @@
     </mailingLists>
 
     <scm>
-        <connection>scm:git:git@github.com:protegeproject/org.coode.dlquery.git</connection>
-        <developerConnection>scm:git:git@github.com:protegeproject/org.coode.dlquery.git</developerConnection>
-        <url>https://github.com/protegeproject/org.coode.dlquery</url>
+        <connection>scm:git:https://github.com/protegeproject/dlquery.git</connection>
+        <developerConnection>scm:git:git@github.com:protegeproject/dlquery.git</developerConnection>
+        <url>https://github.com/protegeproject/dlquery</url>
         <tag>HEAD</tag>
     </scm>
     <issueManagement>
@@ -91,10 +83,23 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <protege.version>5.0.0-beta-19</protege.version>
-        <owlapi.version>4.1.3</owlapi.version>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
+        <protege.version>6.0.0-alpha-1</protege.version>
+        <owlapi.version>5.5.1</owlapi.version>
     </properties>
 
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://central.sonatype.com</url>
+        </repository>
+    </distributionManagement>
+
     <dependencies>
 
         <dependency>
@@ -124,8 +129,9 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.12</version>
+            <version>1.7.36</version>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -139,25 +145,57 @@
 
         <plugins>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.4.1</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <propertiesEncoding>UTF-8</propertiesEncoding>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.14.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.5.2</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>3.1.4</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>3.1.4</version>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
                         <goals>
-                            <goal>jar</goal>
+                            <goal>jar-no-fork</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -166,7 +204,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>3.11.2</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -181,33 +219,23 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>5.1.9</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-Activator>org.protege.editor.owl.ProtegeOWL</Bundle-Activator>
                         <Bundle-ClassPath>.</Bundle-ClassPath>
                         <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
                         <Bundle-Vendor>The Protege Development Team</Bundle-Vendor>
                         <Import-Package>
-                            org.protege.editor.core.*;version="5.0.0",
-                            org.protege.editor.owl.*;version="5.0.0",
-                            org.semanticweb.owlapi.*;version="[4.1.3,5.0.0)",
+                            org.protege.editor.core.*;version="[6.0.0,7.0.0)",
+                            org.protege.editor.owl.*;version="[6.0.0,7.0.0)",
                             *
                         </Import-Package>
                         <Include-Resource>{maven-resources}</Include-Resource>
                         <Private-Package>${project.artifactId}</Private-Package>
                     </instructions>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <version>2.9</version>
-                <configuration>
-                    <pde>true</pde>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -222,7 +250,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
+                        <version>3.2.7</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -233,6 +261,17 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <version>0.9.0</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <publishingServerId>ossrh</publishingServerId>
+                            <autoPublish>true</autoPublish>
+                            <waitUntil>published</waitUntil>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

src/main/java/org/coode/dlquery/DLQueryResultsSection.java

@@ -2,7 +2,7 @@
 
 import org.protege.editor.core.ui.list.MListSectionHeader;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
 /*
  * Copyright (C) 2007, University of Manchester
  *
@@ -39,7 +39,7 @@ public class DLQueryResultsSection implements MListSectionHeader {
 
 
     public DLQueryResultsSection(String label) {
-        this.label = checkNotNull(label);
+        this.label = requireNonNull(label);
     }