Skip to content

Conversation

@p-louis
Copy link
Collaborator

@p-louis p-louis commented Apr 16, 2025

Purpose

This PR intends to lift the plugin for use with Confluence 9+.
In the process I figured I might as well get rid of that pesky java-code and replace it with kotlin.

Major changes

  • Converted Java-code to Kotlin
  • Replaced the spring-scanner plugin with spring java configuration as described here
  • Introduced a velocity-allowlist as it's required by confluence 9 (see here)
  • Removed mockito as test-dependency and replaced it with anonymous objects mocking the same behavior.
  • Removed certain checks from test-cases that relied changing the mockito-config mid-test
  • Removed test-cases testing velocity (why they were present in the first place, I don't know...)
  • Replaced certain checks from tests that relied on a particular ordering of attributes in JSON-serialization

Minor changes

  • Various dependency updates - in particular: confluence was updated to version 9.2.3
  • Rewriting of some code to improve testability or to make it more idiomatic Kotlin

p-louis added 2 commits April 15, 2025 11:04
ADD velocity-allowlist for signature2

This is the first state in which the plugin builds and performs as
expected.
@p-louis p-louis self-assigned this Apr 16, 2025
@p-louis p-louis marked this pull request as ready for review May 2, 2025 05:17
@p-louis p-louis requested a review from weickmanna May 2, 2025 05:17
@weickmanna
Copy link
Member

weickmanna commented May 7, 2025

Can we activate GitHub Actions to also build on branches and make it use mvn confluence:run, so we can verify that the plugin builds and starts up within the expected environment?

@p-louis p-louis merged commit b3223ee into main Jun 25, 2025
2 checks passed
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.

3 participants