From 51579301b0cbf678676978b94bb8063d86ef8774 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 9 Apr 2020 16:16:12 +0200 Subject: [PATCH 1/2] manually pull in some master testing changes --- .travis.yml | 3 ++- runIntegrationTests | 25 +++++++++++++++++-------- test.gradle | 35 +++++++++++++++++++++++++---------- 3 files changed, 44 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb95d09966..315c6b644a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,8 @@ before_script: - gem install travis script: - mvn verify -P ci - - TERM="dumb" ./runIntegrationTests -gl + - JAVAC_MAJOR_VERSION=$(javac -version | sed -E 's/javac ([[:digit:]]+).*/\1/') + - if [[ ${JAVAC_MAJOR_VERSION} -gt 8 ]]; then ./runIntegrationTests -gl || true ; fi install: true deploy: provider: script diff --git a/runIntegrationTests b/runIntegrationTests index ec29f44fdb..3876cd7396 100755 --- a/runIntegrationTests +++ b/runIntegrationTests @@ -1,8 +1,8 @@ #!/usr/bin/env bash set -euo pipefail -SMACK_VERSION="4.4.0-alpha2" # master 22 Nov 2019 -GRADLE_VERSION="6.0.1" +SMACK_VERSION="4.4.0-alpha3-20200513.010448-11" +GRADLE_VERSION="6.3" FORCE_CUSTOM_GRADLE=false CURL_ARGS="--location --silent" DEBUG=false @@ -14,12 +14,12 @@ ADMINPASS='admin' usage() { - echo "Usage: $0 [-d] [-l] [-g] [-i IPADDRESS] [-s GITREF] [-h HOST] [-u USERNAME] [-p PASSWORD]" + echo "Usage: $0 [-d] [-l] [-g] [-i IPADDRESS] [-s SMACK_VERSION] [-h HOST] [-u USERNAME] [-p PASSWORD]" echo " -d: Enable debug mode. Prints commands, and preserves temp directories if used (default: off)" echo " -l: Launch a local Openfire. (default: off)" echo " -i: Set a hosts file for the given IP and host (or for example.com if running locally). Reverted at exit." echo " -g: Download and use a known-good Gradle, rather than use the system in-built (default: off)" - echo " -s: Set Smack to the given version (default: 4.4.0-alpha2)" + echo " -s: Set Smack to the given version (default: ${SMACK_VERSION})" echo " -h: The hostname for the Openfire under test (default: example.org)" echo " -u: Admin username for Openfire (default: admin)" echo " -p: Admin password for Openfire (default: admin)" @@ -155,8 +155,6 @@ function runTestsInGradle { echo "Starting Integration Tests (using Smack ${SMACK_VERSION})…" DISABLED_INTEGRATION_TESTS=() - #Fails only in Java8, only on Travis - DISABLED_INTEGRATION_TESTS+=(MoodIntegrationTest) #DISABLED_INTEGRATION_TESTS+=(MultiUserChatIntegrationTest) DISABLED_INTEGRATION_TESTS+=(StreamManagementTest) #DISABLED_INTEGRATION_TESTS+=(MultiUserChatLowLevelIntegrationTest) @@ -171,6 +169,9 @@ function runTestsInGradle { #OX tests use a removed dependency, and so don't compile on 4.4.0a2 DISABLED_INTEGRATION_TESTS+=(OXInstantMessagingIntegrationTest) DISABLED_INTEGRATION_TESTS+=(OXSecretKeyBackupIntegrationTest) + DISABLED_INTEGRATION_TESTS+=(WaitForClosingStreamElementTest) + DISABLED_INTEGRATION_TESTS+=(IoTControlIntegrationTest) + DISABLED_INTEGRATION_TESTS+=(ModularXmppClientToServerConnectionLowLevelIntegrationTest) SINTTEST_DISABLED_TESTS_ARGUMENT="-Dsinttest.disabledTests=" for disabledTest in "${DISABLED_INTEGRATION_TESTS[@]}"; do @@ -180,7 +181,13 @@ function runTestsInGradle { SINTTEST_DISABLED_TESTS_ARGUMENT="${SINTTEST_DISABLED_TESTS_ARGUMENT:0:$((${#SINTTEST_DISABLED_TESTS_ARGUMENT}-1))}" #SINTTEST_DISABLED_TESTS_ARGUMENT="-Dsinttest.enabledTests=EntityCapsTest" - $GRADLE --stacktrace run \ + $GRADLE --console=plain \ + --build-file test.gradle \ + -PsmackVersion="${SMACK_VERSION}" \ + -q dependencies + $GRADLE --console=plain \ + --stacktrace \ + run \ -b test.gradle \ -PsmackVersion="${SMACK_VERSION}" \ -Dsinttest.service="${HOST}" \ @@ -188,6 +195,8 @@ function runTestsInGradle { -Dsinttest.replyTimeout=60000 \ -Dsinttest.adminAccountUsername="${ADMINUSER}" \ -Dsinttest.adminAccountPassword="${ADMINPASS}" \ + -Dsinttest.enabledConnections=tcp \ + -Dsinttest.dnsResolver=javax \ ${SINTTEST_DISABLED_TESTS_ARGUMENT} } @@ -201,4 +210,4 @@ fi if [[ $LOCAL_RUN == true ]]; then launchOpenfire fi -runTestsInGradle \ No newline at end of file +runTestsInGradle diff --git a/test.gradle b/test.gradle index a4c04096eb..61f284fd11 100644 --- a/test.gradle +++ b/test.gradle @@ -5,22 +5,37 @@ applicationDefaultJvmArgs = ["-enableassertions"] repositories { mavenCentral() - maven { - url 'https://oss.sonatype.org/content/repositories/snapshots' - } + maven { + url 'https://oss.sonatype.org/content/repositories/snapshots' + } + maven { + url 'https://www.igniterealtime.org/archiva/repository/maven/' + } } dependencies { - compile group: 'org.igniterealtime.smack', name: 'smack-java7', version: smackVersion - compile group: 'org.igniterealtime.smack', name: 'smack-legacy', version: smackVersion - if (smackVersion.matches("(5|4.[45]).*")) { - compile group: 'org.igniterealtime.smack', name: 'smack-xmlparser-xpp3', version: smackVersion - compile group: 'org.igniterealtime.smack', name: 'smack-xmlparser-stax', version: smackVersion - } compile group: 'org.igniterealtime.smack', name: 'smack-integration-test', version: smackVersion + + // Workaround for https://discuss.gradle.org/t/unique-snapshot-dependencies-for-projects-own-subproject-in-pom-not-declared/35692?u=flow + // see https://discuss.gradle.org/t/how-to-force-a-dependency-version-while-also-substituting-a-transitive-dependency/26759/4?u=flow + components.all { + allVariants { + withDependencies { deps -> + deps.each { dep -> + if (dep.group == 'org.igniterealtime.smack') { + dep.version { + strictly smackVersion + } + } + } + } + } + } } +println "Sinttest with ${smackVersion}" + run { // Pass all system properties down to the "application" run systemProperties System.getProperties() -} \ No newline at end of file +} From d686757dbdf865906f05d316fab3cc62857ff013 Mon Sep 17 00:00:00 2001 From: akrherz Date: Mon, 18 May 2020 13:38:41 -0500 Subject: [PATCH 2/2] Denote Openfire 4.5.2 Release --- distribution/pom.xml | 2 +- i18n/pom.xml | 2 +- .../pom.xml | 2 +- plugins/pom.xml | 4 +- pom.xml | 2 +- starter/pom.xml | 2 +- xmppserver/changelog.html | 55 +++++++++++++++++++ xmppserver/pom.xml | 2 +- .../openfire/spi/XMPPServerInfoImpl.java | 2 +- 9 files changed, 64 insertions(+), 9 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index fdfaee028f..f37f18e0b2 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ parent org.igniterealtime.openfire - 4.5.2-SNAPSHOT + 4.5.2 4.0.0 diff --git a/i18n/pom.xml b/i18n/pom.xml index 77ae925457..26f9075420 100644 --- a/i18n/pom.xml +++ b/i18n/pom.xml @@ -4,7 +4,7 @@ parent org.igniterealtime.openfire - 4.5.2-SNAPSHOT + 4.5.2 i18n Internationalization files for Openfire diff --git a/plugins/openfire-plugin-assembly-descriptor/pom.xml b/plugins/openfire-plugin-assembly-descriptor/pom.xml index 2996f09a73..544fa63f8d 100644 --- a/plugins/openfire-plugin-assembly-descriptor/pom.xml +++ b/plugins/openfire-plugin-assembly-descriptor/pom.xml @@ -4,7 +4,7 @@ plugins org.igniterealtime.openfire - 4.5.2-SNAPSHOT + 4.5.2 org.igniterealtime.openfire.plugins openfire-plugin-assembly-descriptor diff --git a/plugins/pom.xml b/plugins/pom.xml index 3b7c5d520e..2b0ba90634 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.igniterealtime.openfire - 4.5.2-SNAPSHOT + 4.5.2 plugins pom Openfire Plugins @@ -120,7 +120,7 @@ ${project.artifactId} - 4.5.2-SNAPSHOT + 4.5.2 9.4.18.v20190429 diff --git a/pom.xml b/pom.xml index 16d7cee5bd..5653896037 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.igniterealtime.openfire parent - 4.5.2-SNAPSHOT + 4.5.2 Parent pom diff --git a/starter/pom.xml b/starter/pom.xml index 8904b8f71f..9e74061eb9 100644 --- a/starter/pom.xml +++ b/starter/pom.xml @@ -4,7 +4,7 @@ parent org.igniterealtime.openfire - 4.5.2-SNAPSHOT + 4.5.2 starter Starter for Openfire diff --git a/xmppserver/changelog.html b/xmppserver/changelog.html index ac3e3847d4..185e10395e 100644 --- a/xmppserver/changelog.html +++ b/xmppserver/changelog.html @@ -163,6 +163,61 @@

Openfire Changelog

+

4.5.2 -- May 18, 2020

+

Bug +

+
    +
  • [OF-963] - WebSocket keep-alive is not working as expected +
    • +
  • [OF-1963] - Cross Site Scripting (XSS) issues - CSW Document No: C1055 +
    • +
  • [OF-1964] - SystemProperty should load classes with Thread.getContextClassloader as fallback +
    • +
  • [OF-1970] - Undeliverable messages routed to unavailable full jid should be routed to other resources with prio 0 (not 1) or higher. +
    • +
  • [OF-1977] - Pubsub notifications should be sent to subscribers of parent nodes +
    • +
  • [OF-1999] - Prevent potential arithmetic overflow +
    • +
  • [OF-2013] - Fix detection of 'detached' state of a connection +
    • +
  • [OF-2014] - Reset ConnectionListener callback object on re-init +
    • +
  • [OF-2015] - Remove the session that was used for resumption immediately +
    • +
  • [OF-2017] - Update Jetty to 9.4.28.v20200408 +
    • +
  • [OF-2026] - Stable and Unique Stanza Identifier need not be UUID +
    • +
+ +

New Feature +

+
    +
  • [OF-158] - Set through the admin console the MUC room configuration form's default values +
    • +
  • [OF-1966] - Add Japanese translation +
    • +
+ +

Improvement +

+
    +
  • [OF-1969] - Log username when auth fails +
    • +
  • [OF-1974] - Openfire should not disclose Jetty version within HTTP header for websocket connections +
    • +
  • [OF-1976] - Allow any number of maximum MUC occupants to be configured. +
    • +
  • [OF-1979] - Guard against invalid SASL responses +
    • +
  • [OF-1997] - Bump Bouncy Castle version to v1.65 +
    • +
  • [OF-2019] - Allow Archiver to start polling only after work is produced. +
    • +
+ +

4.5.1 -- January 31, 2020

Bug

diff --git a/xmppserver/pom.xml b/xmppserver/pom.xml index 4e72d1591e..7046414f58 100644 --- a/xmppserver/pom.xml +++ b/xmppserver/pom.xml @@ -4,7 +4,7 @@ org.igniterealtime.openfire parent - 4.5.2-SNAPSHOT + 4.5.2 xmppserver Core XMPP Server diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java index edc4bfa175..549d339fe7 100644 --- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java +++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java @@ -39,7 +39,7 @@ public class XMPPServerInfoImpl implements XMPPServerInfo { private final Date startDate; - public static final Version VERSION = new Version(4, 5, 2, Version.ReleaseStatus.Alpha, -1 ); + public static final Version VERSION = new Version(4, 5, 2, Version.ReleaseStatus.Release, -1 ); /** * Simple constructor