Merge pull request #2219 from jlawyerorg/feature/wildfly-26-ee

Feature/wildfly 26 ee

.github/workflows/pullrequests.yml

@@ -28,7 +28,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - uses: actions/setup-java@v1
         with:
-          java-version: '11' # The JDK version to make available on the path.
+          java-version: '17' # The JDK version to make available on the path.
           java-package: jdk+fx # (jre, jdk, or jdk+fx) - defaults to jdk
           architecture: x64 # (x64 or x86) - defaults to x64
 
@@ -48,13 +48,13 @@ jobs:
           wget -O /home/runner/j-lawyer-backup/backups.tar.gz https://www.j-lawyer.org/downloads/travisci/backups/backups.tar.gz
           tar -m -xvzf /home/runner/j-lawyer-backup/backups.tar.gz -C /home/runner/j-lawyer-backup
           
-      - name: Set up JDK8
+      - name: Set up JDK17
         uses: AdoptOpenJDK/install-jdk@v1
         with:
-          version: '8'
+          version: '17'
           architecture: x64
 
-      - name: Build server with JDK8
+      - name: Build server with JDK17
         # ejb tests fail for some reason...
         # run: ant -buildfile j-lawyer-fax/build.xml default && ant -buildfile j-lawyer-server-common/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xml default && ant -buildfile j-lawyer-server-api/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml default test && ant -buildfile j-lawyer-io-common/build.xml default
         # run j-lawyer-fax without tests, does not need to access the real account
@@ -73,17 +73,17 @@ jobs:
           datadirectory: /home/runner/j-lawyer-data
           encryptionpwd:  
 
-      - name: Set up JDK11
+      - name: Set up JDK17
         uses: AdoptOpenJDK/install-jdk@v1
         with:
-          version: '11'
+          version: '17'
           architecture: x64
-          targets: 'JDK_11'
+          targets: 'JDK_17'
 
-      - name: populate JAVA_HOME to Java 11
-        run: echo "JAVA_HOME=$(echo $JDK_11)" >> $GITHUB_ENV
+      - name: populate JAVA_HOME to Java 17
+        run: echo "JAVA_HOME=$(echo $JDK_17)" >> $GITHUB_ENV
 
-      - name: Build client with JDK11
+      - name: Build client with JDK17
         run: ant -buildfile j-lawyer-client/build.xml default
         # removed temporarily:  && mvn -f j-lawyer-backupmgr/pom.xml clean package test
         env:
@@ -106,9 +106,9 @@ jobs:
             -Dsonar.organization=jlawyerorg
             -Dsonar.projectKey=jlawyerorg_j-lawyer-org
             -Dsonar.projectName=j-lawyer-org
-            -Dsonar.projectVersion=2.2.0
+            -Dsonar.projectVersion=2.6.0
             -Dsonar.java.binaries=.
-            -Dsonar.java.source=8
+            -Dsonar.java.source=11
             
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any

deploy.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-cp j-lawyer-server/dist/j-lawyer-server.ear ~/bin/wildfly-16.0.0.Final//standalone/deployments/j-lawyer-server.ear
+cp j-lawyer-server/dist/j-lawyer-server.ear ~/bin/wildfly-26.1.3.Final/standalone/deployments/j-lawyer-server.ear

docker/getversion.sh

@@ -21,5 +21,5 @@ jlversion=`echo "$jlversion" | tr _ .`
 
 # tadaaa! 
 # echo $jlversion
-echo 2.6.0.5
+echo 2.6.0.6
 

docker/mysql/README.md

@@ -1,4 +1,4 @@
-Docker + Ubuntu-16.04 + Mysql-5.7
+Docker + Ubuntu + Mysql-5.7
 
 #### parameter
 

docker/wildfly/Dockerfile

@@ -1,9 +1,9 @@
 # Use latest jboss/base-jdk:11 image as the base
-FROM jboss/base-jdk:8
+FROM jboss/base-jdk:17
 MAINTAINER j-dimension "[email protected]"
 
 # Set the WILDFLY_VERSION env variable
-ENV WILDFLY_VERSION 16.0.0.Final
+ENV WILDFLY_VERSION 26.1.3.Final
 ENV WILDFLY_SHA1 287c21b069ec6ecd80472afec01384093ed8eb7d
 ENV JBOSS_HOME /opt/jboss/wildfly
 
@@ -27,7 +27,7 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8
 # Add the WildFly distribution to /opt, and make wildfly the owner of the extracted tar content
 # Make sure the distribution is available from a well-known place
 RUN cd $HOME \
-    && curl -O https://download.jboss.org/wildfly/$WILDFLY_VERSION/wildfly-$WILDFLY_VERSION.tar.gz \
+    && curl -O https://github.com/wildfly/wildfly/releases/download/26.1.3.Final/wildfly-26.1.3.Final.tar.gz \
     && sha1sum wildfly-$WILDFLY_VERSION.tar.gz | grep $WILDFLY_SHA1 \
     && tar xf wildfly-$WILDFLY_VERSION.tar.gz \
     && mv $HOME/wildfly-$WILDFLY_VERSION $JBOSS_HOME \
@@ -54,7 +54,7 @@ COPY j-lawyer-data/ /opt/jboss/j-lawyer-data/
 
 COPY ./standalone.xml /opt/jboss/wildfly/standalone/configuration/standalone.xml
 COPY ./j-lawyer-server.ear /opt/jboss/wildfly/standalone/deployments/j-lawyer-server.ear
-COPY ./mysql/main/* /opt/jboss/wildfly/modules/system/layers/base/com/mysql/main/
+COPY ./mysql/driver8/main/* /opt/jboss/wildfly/modules/system/layers/base/com/mysql/driver8/main/
 
 
 # Expose the ports we're interested in

docker/wildfly/mysql/driver8/main/module.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<module name="com.mysql.driver8" xmlns="urn:jboss:module:1.9">
+
+    <resources>
+        <resource-root path="mysql-connector-java-8.0.33.jar"/>
+    </resources>
+
+    <dependencies>
+        <!-- module name="java.compiler"/>
+        <module name="java.desktop"/>
+        <module name="java.instrument"/>
+        <module name="java.logging"/>
+        <module name="java.management"/>
+        <module name="java.naming"/>
+        <module name="java.scripting"/>
+        <module name="java.sql"/>
+        <module name="java.transaction.xa"/>
+        <module name="org.slf4j"/ -->
+        <module name="javax.api"/>
+        <module name="javax.transaction.api"/>
+    </dependencies>
+</module>