Merge branch 'main' into docker-improvements

.github/actions/connectivitytests-action/action.yml

@@ -20,7 +20,7 @@ runs:
     - name: Set up Java
       uses: actions/setup-java@v4
       with:
-        java-version: 11
+        java-version: 17
         distribution: zulu
     - name: Build with Maven
       run: |

.github/actions/connectivitytests-action/conntest/pom.xml

@@ -7,8 +7,8 @@
     <version>1.0</version>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>

.github/actions/startserver-action/action.yml

@@ -25,10 +25,10 @@ runs:
     - name: Set up Java
       uses: actions/setup-java@v4
       with:
-        java-version: 11
+        java-version: 17
         distribution: zulu
-    - name: Set JAVA_HOME to use Java 11
-      run: echo "JAVA_HOME=$(echo $JAVA_HOME_11_X64)" >> $GITHUB_ENV
+    - name: Set JAVA_HOME to use Java 17
+      run: echo "JAVA_HOME=$(echo $JAVA_HOME_17_X64)" >> $GITHUB_ENV
       shell: bash
     - run: startCIServer.sh -i ${{ inputs.ip }} -h ${{ inputs.domain }} -b ${{ inputs.distBaseDir }}
       shell: bash

.github/workflows/codeql-analysis.yml

@@ -37,10 +37,10 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: 11
+        java-version: 17
         distribution: zulu
         cache: maven
 

.github/workflows/continuous-integration-workflow.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 11, 17 ]
+        java: [ 17, 21 ]
         distribution: [ zulu ] # We could add more here: temurin, adopt, liberica, microsoft, corretto
 
     steps:
@@ -46,13 +46,13 @@ jobs:
           name: distribution-java${{ matrix.java }}
           path: distribution-artifact.tar
       - name: Upload coverage report for 'xmppserver' module
-        if: ${{ matrix.distribution == 'zulu' && matrix.java == 11 && github.ref_name == 'main'}}
+        if: ${{ matrix.distribution == 'zulu' && matrix.java == 17 && github.ref_name == 'main'}}
         uses: actions/upload-artifact@v4
         with:
           name: Coverage Report for 'xmppserver' module
           path: xmppserver/target/site/jacoco/
       - name: Temporarily stash openfire artifacts from the mvn repo for later jobs
-        if: ${{ matrix.distribution == 'zulu' && matrix.java == 11 }}
+        if: ${{ matrix.distribution == 'zulu' && matrix.java == 17 }}
         uses: actions/upload-artifact@v4
         with:
           name: mvn-repo
@@ -75,7 +75,7 @@ jobs:
       - name: Download distribution artifact from build job.
         uses: actions/download-artifact@v4
         with:
-          name: distribution-java11
+          name: distribution-java17
           path: .
       - name: untar distribution # sharing artifacts that consist of many files can be slow. Share one file instead.
         run: tar -xf distribution-artifact.tar
@@ -171,7 +171,7 @@ jobs:
       - name: Download distribution artifact from build job.
         uses: actions/download-artifact@v4
         with:
-          name: distribution-java11
+          name: distribution-java17
           path: .
       - name: untar distribution # sharing artifacts that consist of many files can be slow. Share one file instead.
         run: tar -xf distribution-artifact.tar
@@ -198,7 +198,7 @@ jobs:
       - name: Download distribution artifact from build job.
         uses: actions/download-artifact@v4
         with:
-          name: distribution-java11
+          name: distribution-java17
           path: .
       - name: untar distribution # sharing artifacts that consist of many files can be slow. Share one file instead.
         run: tar -xf distribution-artifact.tar
@@ -257,10 +257,10 @@ jobs:
     steps:
       - name: Checkout Openfire
         uses: actions/checkout@v4
-      - name: Set up JDK 11 Zulu
+      - name: Set up JDK 17 Zulu
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
           cache: maven
       - name: Restore mvn repo artifacts from build job
@@ -276,7 +276,7 @@ jobs:
           echo "CONNECTION_PASSWORD=SecurePa55w0rd" >> $GITHUB_ENV
           OPENFIREVSN=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo "OPENFIREVSN=$OPENFIREVSN" >> $GITHUB_ENV
-          echo "JAVA_HOME=$(echo $JAVA_HOME_11_X64)" >> $GITHUB_ENV
+          echo "JAVA_HOME=$(echo $JAVA_HOME_17_X64)" >> $GITHUB_ENV
       - name: Download old Openfire database script
         run: |
           mkdir olddb
@@ -298,10 +298,10 @@ jobs:
     steps:
       - name: Checkout Openfire
         uses: actions/checkout@v4
-      - name: Set up JDK 11 Zulu
+      - name: Set up JDK 17 Zulu
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
           cache: maven
       - name: Restore mvn repo artifacts from build job
@@ -317,7 +317,7 @@ jobs:
           echo "CONNECTION_PASSWORD=SecurePa55w0rd" >> $GITHUB_ENV
           OPENFIREVSN=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo "OPENFIREVSN=$OPENFIREVSN" >> $GITHUB_ENV
-          echo "JAVA_HOME=$(echo $JAVA_HOME_11_X64)" >> $GITHUB_ENV
+          echo "JAVA_HOME=$(echo $JAVA_HOME_17_X64)" >> $GITHUB_ENV
       - name: Download old Openfire database script
         run: |
           mkdir olddb
@@ -339,10 +339,10 @@ jobs:
     steps:
       - name: Checkout Openfire
         uses: actions/checkout@v4
-      - name: Set up JDK 11 Zulu
+      - name: Set up JDK 17 Zulu
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
           cache: maven
       - name: Restore mvn repo artifacts from build job
@@ -358,7 +358,7 @@ jobs:
           echo "CONNECTION_PASSWORD=SecurePa55w0rd" >> $GITHUB_ENV
           OPENFIREVSN=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo "OPENFIREVSN=$OPENFIREVSN" >> $GITHUB_ENV
-          echo "JAVA_HOME=$(echo $JAVA_HOME_11_X64)" >> $GITHUB_ENV
+          echo "JAVA_HOME=$(echo $JAVA_HOME_17_X64)" >> $GITHUB_ENV
       - name: Download old Openfire database script
         run: |
           mkdir olddb
@@ -386,7 +386,7 @@ jobs:
       - name: Set up Java for publishing
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
           cache: maven
           server-id: igniterealtime
@@ -447,7 +447,7 @@ jobs:
       - name: Download distribution artifact from build job.
         uses: actions/download-artifact@v4
         with:
-          name: distribution-java11
+          name: distribution-java17
           path: distribution/target/distribution-base
 
       - name: Fix file permissions
@@ -523,3 +523,25 @@ jobs:
           done
           echo "Openfire Admin is reachable."
           docker logs openfire
+
+  build-deb-artifact:
+    name: Generate DEB artifact
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          # Defend against another commit quickly following the first
+          # We want the one that's been tested, rather than the head of main
+          ref: ${{ github.event.push.after }}
+      - name: Download distribution artifact from build job.
+        uses: actions/download-artifact@v4
+        with:
+          name: distribution-java17
+          path: .
+      - name: untar distribution # sharing artifacts that consist of many files can be slow. Share one file instead.
+        run: tar -xf distribution-artifact.tar
+      - name: Install build deps
+        run: sudo apt-get install -y debhelper-compat=13
+      - name: Run build script
+        run: bash build/debian/build_debs.sh

.github/workflows/macos-release-artifact.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        java: [ 11 ]
+        java: [ 17 ]
 
     steps:
       - uses: actions/checkout@v4

Makefile

@@ -5,16 +5,16 @@ all: build-openfire
 # Can not use 'build' as target name, because there is a
 # directory called build
 build-openfire:
-	./mvnw package
+	./mvnw package --batch-mode --no-transfer-progress
 
 clean:
 	./mvnw clean
 
 dist:
-	./mvnw package
+	./mvnw package --batch-mode --no-transfer-progress -DskipTests=true
 
 plugins:
-	./mvnw package
+	./mvnw package --batch-mode --no-transfer-progress
 
 eclipse: .settings .classpath .project
 

README.md

@@ -4,9 +4,11 @@ Openfire ![alt tag](https://raw.githubusercontent.com/igniterealtime/IgniteRealt
 
 About
 -----
-[Openfire] is a real time collaboration (RTC) server licensed under the Open Source Apache License. It uses the only widely adopted open protocol for instant messaging, XMPP (also called Jabber). Openfire is incredibly easy to setup and administer, but offers rock-solid security and performance.
+[Openfire] is a real time collaboration (RTC) server licensed under the Open Source Apache License.
+It uses the only widely adopted open protocol for instant messaging, XMPP (also called Jabber).
+Openfire is incredibly easy to set up and administer, but offers rock-solid security and performance.
 
-[Openfire] is a XMPP server licensed under the Open Source Apache License.
+[Openfire] is an XMPP server licensed under the Open Source Apache License.
 
 [Openfire] - an [Ignite Realtime] community project.
 
@@ -26,10 +28,11 @@ Please search for your issues in the bug tracker before reporting.
 Resources
 ---------
 
-- Documentation: http://www.igniterealtime.org/projects/openfire/documentation.jsp
+- Documentation: https://www.igniterealtime.org/projects/openfire/documentation.jsp
 - Community: https://discourse.igniterealtime.org/c/openfire
 - Bug Tracker: https://igniterealtime.atlassian.net/browse/OF
-- Nightly Builds: http://www.igniterealtime.org/downloads/nightly_openfire.jsp
+- Nightly Builds: https://www.igniterealtime.org/downloads/nightly_openfire.jsp
+- Translations: https://explore.transifex.com/search/?q=openfire
 
 Ignite Realtime
 ===============
@@ -39,9 +42,9 @@ are interested in applying innovative, open-standards-based Real Time Collaborat
 We're aimed at disrupting proprietary, non-open standards-based systems and invite you to participate in what's already one 
 of the biggest and most active Open Source communities.
 
-[Openfire]: http://www.igniterealtime.org/projects/openfire/index.jsp
-[Ignite Realtime]: http://www.igniterealtime.org
-[XMPP (Jabber)]: http://xmpp.org/
+[Openfire]: https://www.igniterealtime.org/projects/openfire/
+[Ignite Realtime]: https://www.igniterealtime.org
+[XMPP (Jabber)]: https://xmpp.org/
 
 Making changes
 ==============
@@ -78,7 +81,7 @@ Testing your changes
 2. fill in following values
     1. Name: Openfire
     2. Use classpath of module: starter
-    3. Main class: org.jivesoftware.openfire.starter.ServerStarter
+    3. Main class: `org.jivesoftware.openfire.starter.ServerStarter`
     4. VM options (adapt accordingly):
         ````
         -DopenfireHome="-absolute path to your project folder-\distribution\target\distribution-base" 

build/ci/updater/pom.xml

@@ -14,8 +14,8 @@
 
   <properties>
     <application.entrypoint>com.igniterealtime.openfire.updaterunner.Main</application.entrypoint>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <build>

build/debian/build_debs.sh

@@ -5,13 +5,14 @@
 pushd .
 # This allows us to pass in the Openfire version from the command-line.
 if [ $1 ]; then
-    export OPENFIRE_FULLVERSION=$1
+    OPENFIRE_FULLVERSION=$1
 else
-    export OPENFIRE_FULLVERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+    # extract version from pom.xml
+    OPENFIRE_FULLVERSION=$(grep -oP "<version>(.*)</version>" -m 1 pom.xml | cut -d ">" -f 2 | cut -d "<" -f 1)
 fi
-export OPENFIRE_VERSION=$(echo "${OPENFIRE_FULLVERSION}" | cut -d'-' -f1)
-export DEBIAN_BUILDDATE="$(date +'%a, %d %b %Y %H:%M:%S %z')"
-export WORKDIR=tmp/debian/openfire-${OPENFIRE_VERSION}
+OPENFIRE_VERSION=$(echo "${OPENFIRE_FULLVERSION}" | cut -d'-' -f1)
+DEBIAN_BUILDDATE="$(date +'%a, %d %b %Y %H:%M:%S %z')"
+WORKDIR=tmp/debian/openfire-${OPENFIRE_VERSION}
 
 if [ -d "tmp/debian" ]; then
     echo "Removing previous workdir tmp/debian"
@@ -22,12 +23,7 @@ mkdir -p $WORKDIR
 cp -r distribution/target/distribution-base/. $WORKDIR/
 
 mkdir -p $WORKDIR/debian
-cp build/debian/* $WORKDIR/debian/
-# HACK remove out this actual script
-rm -f $WORKDIR/debian/build_debs.sh
-
-# make rules executable
-chmod 755 $WORKDIR/debian/rules
+cp -r build/debian/* $WORKDIR/debian/
 
 cd $WORKDIR/debian
 # Do some needed replacements

build/debian/changelog

@@ -1,5 +1,6 @@
-openfire (@version@) unstable; urgency=medium
+openfire (@version@) stable; urgency=medium
 
-  * For full changelog, see http://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html
+  * For full changelog, see
+    https://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html
 
- -- Jive Software <[email protected]>  @builddate@
+ -- Ignite Realtime Community <[email protected]>  @builddate@

build/debian/control

@@ -2,21 +2,23 @@ Source: openfire
 Section: net
 Priority: optional
 Maintainer: Ignite Realtime Community <[email protected]>
-Build-Depends: debhelper (>= 5), cdbs, patchutils, default-jdk (>= 11)
+Build-Depends: debhelper-compat (= 13), default-jdk (>= 11)
+Rules-Requires-Root: no
 Standards-Version: 3.7.2
-Homepage: http://www.igniterealtime.org
+Homepage: https://www.igniterealtime.org
+Vcs-Git: https://github.com/igniterealtime/Openfire.git
+Vcs-Browser: https://github.com/igniterealtime/Openfire
+Bugs: https://igniterealtime.atlassian.net/browse/OF
 
 Package: openfire
-Section: net
-Priority: optional
-Pre-Depends: default-jre-headless (>= 11) | java11-runtime-headless | java11-runtime | java13-runtime-headless | java13-runtime | java16-runtime-headless | java16-runtime | java17-runtime-headless | java17-runtime
+Pre-Depends: adduser
+Depends: default-jre-headless (>= 11) | java-runtime (>= 11)
 Architecture: all
-Description: A high performance XMPP (Jabber) server.
+Description: High performance XMPP (Jabber) server.
  Openfire is an instant messaging server that implements the XMPP
  (Jabber) protocol. It features high performance, a robust
  administration console, and a full plugin system. The server
  is 100% Java.
  .
- Openfire is a professional Open Source project, led by the Ignite Realtime Foundation.
-Homepage: http://www.igniterealtime.org
-
+ Openfire is a professional Open Source project, led by
+ the Ignite Realtime Foundation.

build/debian/copyright

@@ -1,12 +1,6 @@
-This package was debianized by Jive Software 
-<[email protected]> on March 12, 2007.
-The source was downloaded from http://www.igniterealtime.org.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
-Upstream author: Jive Software <[email protected]>
-
-This software is copyright (c) 2010 by Jive Software
-
-You are free to distribute this software under the terms of
-the Apache License, Version 2.0. On Debian systems, the complete
-text of the Apache License can be found in the file
-'/usr/share/common-licenses/Apache-2.0'.
+Files: *
+Copyright: 2004-2008 Jive Software
+           2017-2024 Ignite Realtime Foundation
+License:   Apache-2.0

build/debian/lintian-overrides

@@ -0,0 +1,2 @@
+codeless-jar
+jar-contains-source