Skip to content

Fix merging desc.ref files#290

Merged
alexander-yevsyukov merged 7 commits intomasterfrom
prepare-when-option-extraction
Apr 24, 2026
Merged

Fix merging desc.ref files#290
alexander-yevsyukov merged 7 commits intomasterfrom
prepare-when-option-extraction

Conversation

@alexander-yevsyukov
Copy link
Copy Markdown
Collaborator

This PR fixes merging of desc.ref files when building a fat JAR for the java-bundle module.

Copilot AI review requested due to automatic review settings April 24, 2026 18:23
@alexander-yevsyukov alexander-yevsyukov self-assigned this Apr 24, 2026
Copy link
Copy Markdown
Contributor

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 aims to fix merging of desc.ref files during fat JAR construction for the java-bundle module by applying a shared ShadowJar configuration helper.

Changes:

  • Replace ad-hoc ShadowJar configuration (append("desc.ref") + targeted service merge) with io.spine.gradle.publish.setup() for consistent merging behavior.
  • Regenerate dependencies.md license report timestamps.

Reviewed changes

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

File Description
buildSrc/src/main/kotlin/fat-jar.gradle.kts Switches shadowJar configuration to the shared setup() helper to ensure desc.ref merging works correctly.
dependencies.md Updates generated license report timestamps.

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

Comment thread dependencies.md Outdated
@alexander-yevsyukov alexander-yevsyukov marked this pull request as ready for review April 24, 2026 19:23
Copilot AI review requested due to automatic review settings April 24, 2026 19:23
@alexander-yevsyukov alexander-yevsyukov merged commit 6e08bcd into master Apr 24, 2026
9 of 15 checks passed
@alexander-yevsyukov alexander-yevsyukov deleted the prepare-when-option-extraction branch April 24, 2026 19:23
Copy link
Copy Markdown
Contributor

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 Validation SDK snapshot version and adjusts the java-bundle fat-JAR build so descriptor references (desc.ref) and service files are merged via the shared ShadowJar.setup() configuration.

Changes:

  • Bump published snapshot version from 2.0.0-SNAPSHOT.412 to 2.0.0-SNAPSHOT.413 across Gradle, Maven, and docs.
  • Update fat-JAR (shadowJar) configuration to use io.spine.gradle.publish.setup() (intended to fix desc.ref merging).
  • Refresh dependencies.md for the new snapshot.

Reviewed changes

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

Show a summary per file
File Description
version.gradle.kts Bumps the SDK publish version to .413.
pom.xml Aligns Maven project version to .413.
docs/content/docs/validation/01-getting-started/adding-to-build.md Updates the plugin version in docs to .413.
dependencies.md Updates the generated dependency/license report for .413.
buildSrc/src/main/kotlin/fat-jar.gradle.kts Switches shadowJar configuration to shared setup() to handle merging (incl. desc.ref).

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

Comment thread dependencies.md
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Thu Apr 23 20:08:09 WEST 2026** using
This report was generated on **Fri Apr 24 19:11:43 WEST 2026** using
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