Merge pull request #144 from terry-norbraten/master

Minor edits

.github/workflows/ant.yml

@@ -60,10 +60,10 @@ jobs:
           sed -i "s|/home/theuser/workspace/sumo|$ONTOLOGYPORTAL_GIT/sumo|g" $SIGMA_HOME/KBs/config.xml
           sed -i "s|/home/theuser/E/bin/e_ltb_runner|/usr/local/bin/e_ltb_runner|g" $SIGMA_HOME/KBs/config.xml
 
-      - name: Set up JDK 11 for x64
+      - name: Set up JDK 21 for x64
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Build with Ant

README.md

@@ -247,7 +247,7 @@ mkdir /home/theuser/Programs
 cd Programs
 ```
 
-Install a Java Development Kit (JDK) from OpenJDK, at least version 11 or greater.
+Install a Java Development Kit (JDK) from OpenJDK, at least version 21 or greater.
 ** Avoid JDK 17 **
 
 The following command line version may work but you may need to update the name of the jdk zipfile
@@ -296,6 +296,17 @@ PS1=Vagrant:$PS1
 
 ## Linux Installation
 
+First, comply with System preparation on Linux above
+
+Clone SigmaKEE
+```sh
+git clone https://github.com/ontologyportal/sigmakee
+```
+
+Then,
+```sh
+cd sigmakee
+```
 ```sh
 ant install
 ```

build.xml

@@ -140,10 +140,13 @@
     </path>
 
     <target name="init" depends="init-ivy">
-        <available property="jdk11+" classname="java.net.http.HttpClient"/>
-        <fail message="Unsupported JDK version: ${ant.java.version}. Please use JDK version 11 or greater, but avoid JDK 17."
-              unless="jdk11+">
+        <condition property="jdk21+">
+            <javaversion atleast="21"/>
+        </condition>
+        <fail message="Unsupported JDK version: ${ant.java.version}. Please use JDK version 21 or greater."
+              unless="jdk21+">
         </fail>
+
         <echo message="Welcome to the ${product.Name} v${product.Version}"/>
         <echo message="Specification Vendor:     ${spec.vendor}"/>
         <echo message=""/>
@@ -358,7 +361,7 @@
     <!-- At this point we will assume you have already complied with the
          README.md under the heading "System preparation on Linux." This task
          will take over from the heading "Linux Installation."  -->
-    <target name="install" depends="init" description="Installs WordNetMappings and SUMO to ${sigma.home}/KBs">
+    <target name="install" depends="init" description="Clones Sigma tools, installs WordNetMappings and SUMO to ${sigma.home}/KBs and builds the E and Vampire Theorem provers">
         <mkdir dir="${workspace.dir}"/>
         <mkdir dir="${programs.dir}"/>
 
@@ -369,7 +372,7 @@
         <antcall target="retrieve.wordnet"/>
 
         <!-- Retrieve E prover -->
-        <antcall tareget="retrieve.E"/>
+        <antcall target="retrieve.E"/>
 
         <!-- Clone the sigma tools -->
         <antcall target="clone.sumo"/>

docker/sigma-ci/Dockerfile

@@ -1,4 +1,4 @@
-FROM tomcat:9.0.96-jdk11-temurin-jammy AS builder
+FROM tomcat:9.0.97-jdk21-temurin-jammy AS builder
 
 # Followed instructions from: https://github.com/vprover/vampire/wiki/Source-Build-for-Users
 # for buildling latest vampire w/ latest Z3
@@ -33,7 +33,7 @@ RUN apt update; \
 
 #################################################
 # runtime image.
-FROM tomcat:9.0.96-jdk11-temurin-jammy AS runtime
+FROM tomcat:9.0.97-jdk21-temurin-jammy AS runtime
 
 COPY --from=builder \
     /usr/local/tomcat/E/PROVER/e_ltb_runner /usr/local/bin/e_ltb_runner

docker/sigmakee/Dockerfile

@@ -3,7 +3,7 @@ FROM $IMAGE_ACCOUNT/sigma-ci:latest AS builder
 
 #################################################
 # runtime image.
-FROM tomcat:9.0.96-jdk11-temurin-jammy AS runtime
+FROM tomcat:9.0.97-jdk21-temurin-jammy AS runtime
 
 RUN apt update; \
     apt-get install -y --no-install-recommends \

docker/sigmakee2018/Dockerfile

@@ -19,7 +19,7 @@ WORKDIR $SIGMADIR
 
 # Install packages from apt
 RUN apt update &&\
-    apt -qq install -y ant git make gcc graphviz openjdk-11-jdk-headless &&\
+    apt -qq install -y ant git make gcc graphviz openjdk-21-jdk-headless &&\
     rm -rf /var/lib/apt/lists/* && \
     apt clean -y &&\
     apt autoclean -y &&\

docker/sigmakee2023/Dockerfile

@@ -34,7 +34,7 @@ RUN cd /root \
     && echo "export SIGMA_SRC=/root/workspace/sigmakee" >> .bashrc \
     && echo "export ONTOLOGYPORTAL_GIT=/root/workspace" >> .bashrc \
     && echo 'export CATALINA_OPTS="$CATALINA_OPTS -Xmx10g -Xss1m"' >> .bashrc \
-    && echo "export CATALINA_HOME=/root/Programs/apache-tomcat-9.0.96" >> .bashrc \
+    && echo "export CATALINA_HOME=/root/Programs/apache-tomcat-9.0.97" >> .bashrc \
     && source .bashrc
 
 # Setup Vampire
@@ -46,17 +46,17 @@ RUN cd /root/workspace \
 
 # Setup Apache, E and Wordnet
 RUN cd /root/Programs \
-    && wget 'https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.96/bin/apache-tomcat-9.0.96.zip' \
+    && wget 'https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.97/bin/apache-tomcat-9.0.97.zip' \
     && wget 'https://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz' \
     && wget 'http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_2.0/E.tgz' \
     && tar -xvzf E.tgz \
-    && unzip apache-tomcat-9.0.96.zip \
-    && rm apache-tomcat-9.0.96.zip
+    && unzip apache-tomcat-9.0.97.zip \
+    && rm apache-tomcat-9.0.97.zip
 
-RUN cd /root/Programs/apache-tomcat-9.0.96/bin \
+RUN cd /root/Programs/apache-tomcat-9.0.97/bin \
     && chmod 777 *
 
-RUN cd /root/Programs/apache-tomcat-9.0.96/webapps \
+RUN cd /root/Programs/apache-tomcat-9.0.97/webapps \
     && chmod 777 *
 
 # Setup E

docker/sumo-ci/Dockerfile

@@ -3,7 +3,7 @@ FROM $IMAGE_ACCOUNT/sigma-ci:latest AS builder
 
 #################################################
 # runtime image.
-FROM tomcat:9.0.96-jdk11-temurin-jammy AS runtime
+FROM tomcat:9.0.97-jdk21-temurin-jammy AS runtime
 
 RUN apt update; \
     apt-get install -y --no-install-recommends \