Skip to content

Fix minor issues#56

Merged
guusdk merged 9 commits intoigniterealtime:mainfrom
stokito:upgrade
Apr 1, 2026
Merged

Fix minor issues#56
guusdk merged 9 commits intoigniterealtime:mainfrom
stokito:upgrade

Conversation

@stokito
Copy link
Copy Markdown
Member

@stokito stokito commented Mar 15, 2026

No description provided.

dependabot Bot and others added 3 commits March 15, 2026 22:13
Bumps commons-fileupload:commons-fileupload from 1.5 to 1.6.0.

---
updated-dependencies:
- dependency-name: commons-fileupload:commons-fileupload
  dependency-version: 1.6.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Copy link
Copy Markdown
Member

@akrherz akrherz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems sensible to me...

@akrherz
Copy link
Copy Markdown
Member

akrherz commented Mar 15, 2026

Of course, now I see that it doesn't compile... :)

@stokito
Copy link
Copy Markdown
Member Author

stokito commented Mar 15, 2026

Sorry, I squashed wrongly. I'll recheck tomorrow

@stokito
Copy link
Copy Markdown
Member Author

stokito commented Mar 30, 2026

Sorry for the delay. I wanted to add an ability to download .deb and .rpm, but don't have a time anymore. I fixed that compile error. Also I added aTalk and Kaidan to clients list

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the Client Control plugin to refresh client metadata (including permitted clients UI assets), improve Spark updater UX, and modernize a dependency/versioning footprint.

Changes:

  • Fix Spark Version form selection logic for macOS and Linux builds.
  • Refresh permitted clients list (new client entries + icons, updated URLs).
  • Bump plugin/dependency versions and apply various small Java/Javadoc cleanup changes (e.g., @Override, Javadoc tag updates).

Reviewed changes

Copilot reviewed 10 out of 18 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
src/web/spark-form.jsp Fixes client build selection checks for macOS/Linux.
src/web/permitted-clients.jsp Updates permitted client enumeration, URLs, and icon references.
src/web/images/client-icon_atalk.png Adds icon asset for aTalk.
src/web/images/client-icon_conversations.png Adds icon asset for Conversations.
src/web/images/client-icon_gajim.png Adds icon asset for Gajim.
src/web/images/client-icon_kaidan.png Adds icon asset for Kaidan.
src/java/org/jivesoftware/openfire/plugin/spark/TaskEngine.java Javadoc HTML tag modernization (<tt><code>).
src/java/org/jivesoftware/openfire/plugin/spark/SparkUtil.java Removes unused legacy utility class.
src/java/org/jivesoftware/openfire/plugin/spark/SparkManager.java Adds @Override annotations for interface implementations.
src/java/org/jivesoftware/openfire/plugin/spark/manager/SparkVersionManager.java Improves error responses (adds type/text) and minor Javadoc formatting.
src/java/org/jivesoftware/openfire/plugin/spark/manager/SparkDownloadServlet.java Updates Spark link and fixes spelling in a comment.
src/java/org/jivesoftware/openfire/plugin/ClientControlPlugin.java Adds @Override annotations and minor formatting cleanup.
pom.xml Bumps plugin version and commons-fileupload dependency version.
changelog.html Adds a 2.2.0 entry describing the updates in this release.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/java/org/jivesoftware/openfire/plugin/spark/manager/SparkVersionManager.java Outdated
Comment thread changelog.html
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 10 out of 18 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/java/org/jivesoftware/openfire/plugin/spark/manager/SparkDownloadServlet.java Outdated
@stokito
Copy link
Copy Markdown
Member Author

stokito commented Apr 1, 2026

rebased

@guusdk guusdk merged commit e05839d into igniterealtime:main Apr 1, 2026
3 checks passed
@guusdk
Copy link
Copy Markdown
Member

guusdk commented Apr 1, 2026

Thank you!

@stokito stokito deleted the upgrade branch April 1, 2026 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants