From b52383f60f369ef2322c66c2ad9c83b631e5451a Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Fri, 14 Jul 2023 15:41:00 +0200 Subject: [PATCH 1/7] CI should generate javadoc Adding the 'ci' Maven profile to be used by the continuous integration build / Github flow. This intends to generate javadoc (and maybe source) artifacts that are uploaded to the Maven repo. --- .github/workflows/continuous-integration-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 5004633307..9c6fcb3fb5 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -24,7 +24,7 @@ jobs: distribution: ${{ matrix.distribution }} cache: maven - name: Build with Maven - run: ./mvnw -B package -Pcoverage --file pom.xml + run: ./mvnw -B package -Pcoverage,ci --file pom.xml - name: Upload distribution if: ${{ matrix.distribution == 'zulu' }} uses: actions/upload-artifact@v3 From 35947f4d5c30f006f5327cb45153539f6e98150a Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Fri, 14 Jul 2023 15:50:21 +0200 Subject: [PATCH 2/7] CI publish should not re-run tests, should include javadoc --- .github/workflows/continuous-integration-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 9c6fcb3fb5..ce70d2da02 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -191,7 +191,7 @@ jobs: server-username: IGNITE_REALTIME_MAVEN_USERNAME server-password: IGNITE_REALTIME_MAVEN_PASSWORD - name: Publish - run: ./mvnw -B deploy + run: ./mvnw -B deploy -Pci -Dmaven.test.skip=true env: IGNITE_REALTIME_MAVEN_USERNAME: ${{ secrets.IGNITE_REALTIME_MAVEN_USERNAME }} IGNITE_REALTIME_MAVEN_PASSWORD: ${{ secrets.IGNITE_REALTIME_MAVEN_PASSWORD }} From 5a973e852ee70d2f8de8a1292ca6a467aaeba00d Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Fri, 14 Jul 2023 15:57:20 +0200 Subject: [PATCH 3/7] Javadoc build should not be specific to one Java version This prevents successful compilation on other versions of Java. --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 61628315b7..23b3d9b2cd 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,6 @@ - 11 true none From d0bbc14a7f60bf8f15d17f109aabbca1af62ad90 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Fri, 14 Jul 2023 16:19:01 +0200 Subject: [PATCH 4/7] Fix javadoc in ClusteredCacheEntryListener --- .../openfire/cluster/ClusteredCacheEntryListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusteredCacheEntryListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusteredCacheEntryListener.java index 793cfef22a..9bedfac26f 100644 --- a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusteredCacheEntryListener.java +++ b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusteredCacheEntryListener.java @@ -26,7 +26,7 @@ * Generally speaking, event listener invocation will always include the key value. For performance optimizations, * the value can be omitted. The behavior is configured when registering the listener with a cache. * - * An instance can be registered with a cache using {@link Cache#addListener(org.jivesoftware.openfire.cluster.ClusteredCacheEntryListener, boolean)} + * An instance can be registered with a cache using {@link Cache#addClusteredCacheEntryListener(ClusteredCacheEntryListener, boolean, boolean)} * * Listeners are invoked in an asynchronous fashion. It is possible that invocations occur in a different order than in * which the cache was modified. From a5b52ac5ac221200220217b9de8e977ff2f05603 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Fri, 14 Jul 2023 16:21:40 +0200 Subject: [PATCH 5/7] Updating maven-javadoc-plugin from 3.1.0 to 3.5.0 --- plugins/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index c0d4e3398e..572b6538b4 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -146,7 +146,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.0 + 3.5.0 attach-javadocs diff --git a/pom.xml b/pom.xml index 23b3d9b2cd..cfee390d4d 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.0 + 3.5.0 attach-javadocs From d81aca02d909e76a517bce8510c14f22f4eced5e Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Fri, 14 Jul 2023 16:38:13 +0200 Subject: [PATCH 6/7] Generate Javadoc only with Java 11 For a reason beyond me, the CI-profile of Maven causes the unit tests to fail (with instrumentation errors) when running on Java 17. This removes the CI profile from the generic build phase. The CI profile (and thus, generation of Javadoc and Sources) is still active on the 'deploy' phase. In this phase, only Java 11 is used. --- .github/workflows/continuous-integration-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index ce70d2da02..5db20251e9 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -24,7 +24,7 @@ jobs: distribution: ${{ matrix.distribution }} cache: maven - name: Build with Maven - run: ./mvnw -B package -Pcoverage,ci --file pom.xml + run: ./mvnw -B package -Pcoverage --file pom.xml - name: Upload distribution if: ${{ matrix.distribution == 'zulu' }} uses: actions/upload-artifact@v3 From 7dba99aad83824016e16812ef77076a5aafa892f Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Fri, 14 Jul 2023 16:50:09 +0200 Subject: [PATCH 7/7] Bump jacoco-maven-plugin from 0.8.5 to 0.8.10 --- xmppserver/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmppserver/pom.xml b/xmppserver/pom.xml index 37844ce902..b37a510e5e 100644 --- a/xmppserver/pom.xml +++ b/xmppserver/pom.xml @@ -21,7 +21,7 @@ org.jacoco jacoco-maven-plugin - 0.8.5 + 0.8.10 **/*_jsp.class