Merge branch 'snapshot' into stable

studio-idea-plugin/CHANGELOG.md

@@ -1,21 +1,28 @@
 # MidPoint Studio
 
-## 4.5.1
+## [Unreleased]
+### Added
+
+### Changed
+
+### Fixed
+
+## [4.5.1]
 ### Added
 - Support for IC 2022.2
 
 ### Changed
 - Removed support for IC 2020.3
 
-## 4.5.0
+## [4.5.0]
 ### Fixed
 - MID-7658 task upgrade action fix
 - MID-7691 console logging fixes, upload/test resource weren't logged correctly
 - MID-7695 namespace variants improvements
 - MID-7735 upload/recompute now recomputes all uploaded objects
 - MID-7810 encrypted credentials not expanded in diff now
 
-## 4.4.2
+## [4.4.2]
 ### Changed
 - Changed format of local/remote diff (internal XML file representation)
 
@@ -25,7 +32,7 @@
 - MID-7695 namespace variants missing fix
 - MID-7691 console logs didn't correspond with task being executed (upload/test resource)
 
-## 4.4.1
+## [4.4.1]
 ### Added
 - Model authorizations were added to list of possibilities when completion dialog is shown
 - Added partial AXIOM query support
@@ -42,7 +49,7 @@
 - Fixed defaults file includes when generating documentation
 - Fixed file including for documentation generator on Windows
 
-## 4.4.0
+## [4.4.0]
 ### Added
 - Xml autocompletion
     - OIDs for existing objects in workspace
@@ -69,7 +76,7 @@
 - REST actions cancelling
 - UI Freezes
 
-## 4.3
+## [4.3]
 ### Added
 - Bulk refresh predefined objects
 - Import/export encrypted properties
@@ -83,7 +90,7 @@
 - Xml diff simplified UI, multiple diff strategies available
 - Updated documentation generator
 
-## 4.2
+## [4.2]
 ### Added
 - Browse/Upload with raw options for both operations
 - Properties can be used to replace parts of xml. Properties can also be stored encrypted in keepass2 file within project

studio-idea-plugin/build.gradle.kts

@@ -156,7 +156,8 @@ intellij {
 changelog {
     version.set(properties("pluginVersion"))
     groups.set(emptyList())
-    headerParserRegex.set("\\d+(\\.\\d+){1,2}") // this can be removed when we'll start using semantic versioning (e.g. 4.4.0)
+    // this supports old versions like x.y as well as semantic version x.y.z
+    headerParserRegex.set("""(^(0|[1-9]\d*)(\.(0|[1-9]\d*)){1,2})""".toRegex())
 }
 
 // Configure detekt plugin.
@@ -203,8 +204,14 @@ tasks {
             }.joinToString("\n").run { markdownToHTML(this) }
         )
 
-        // Get the latest available change notes from the changelog file
-        changeNotes.set(provider { changelog.getLatest().toHTML() })
+        var hasChangelog = changelog.has(properties("pluginVersion"))
+        var changelogContent = ""
+        if (hasChangelog) {
+            changelogContent = changelog.get(properties("pluginVersion")).toHTML()
+        } else {
+            changelogContent = changelog.getUnreleased().toHTML()
+        }
+        changeNotes.set(changelogContent)
     }
 
     runPluginVerifier {