Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
version: 2

updates:
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
day: "sunday"
open-pull-requests-limit: 5
labels:
- "Type: Dependency Upgrade"
- "Priority 1: Must"
milestone: 112
groups:
github-dependencies:
update-types:
- "patch"
- "minor"
- "major"

- package-ecosystem: maven
directory: "/"
schedule:
interval: weekly
day: "sunday"
open-pull-requests-limit: 5
labels:
- "Type: Dependency Upgrade"
- "Priority 1: Must"
milestone: 112
groups:
maven-dependencies:
update-types:
- "patch"
- "minor"
- "major"
ignore:
- dependency-name: "com.github.kagkarlsson:db-scheduler"
versions: [ "[14.0.0,)" ] # TODO #3194 Remove ignore rule to auto-update to recent db-scheduler versions
42 changes: 42 additions & 0 deletions .github/workflows/dependabot-automation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Dependabot Automation
on: pull_request

permissions:
contents: write
pull-requests: write

jobs:
dependabot-approve:
name: Dependabot PR Automation

runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Retrieve Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v2
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Approve Pull Request
run: gh pr review --approve "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

dependabot-auto-merge:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Retrieve Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v2
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Auto-merge Pull Request
if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
3 changes: 1 addition & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ jobs:
strategy:
matrix:
axon-framework:
- version: 5.0.0-RC3
- version: 5.0.0-SNAPSHOT
- version: 5.0.0
fail-fast: false

steps:
Expand Down
19 changes: 11 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<project.build.sourceEncoding>${project.encoding}</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.encoding}</project.reporting.outputEncoding>

<kotlin.version>2.2.20</kotlin.version>
<kotlin.version>2.2.21</kotlin.version>
<kotlin.compiler.apiVersion>2.2</kotlin.compiler.apiVersion>
<kotlin.compiler.languageVersion>2.2</kotlin.compiler.languageVersion>

Expand All @@ -28,8 +28,8 @@
<!-- endregion [maven-plugins] -->

<!-- region [dependencies-main] -->
<spring-boot.version>3.5.6</spring-boot.version>
<axon.version>5.0.0-SNAPSHOT</axon.version>
<spring-boot.version>4.0.0-RC2</spring-boot.version>
<axon.version>5.0.0</axon.version>
<log4j.version>2.24.3</log4j.version>
<!-- endregion [dependencies-main] -->

Expand Down Expand Up @@ -59,6 +59,14 @@
<scope>import</scope>
<type>pom</type>
</dependency>

<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-framework-bom</artifactId>
<version>${axon.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -90,22 +98,18 @@
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-server-connector</artifactId>
<version>${axon.version}</version>
</dependency>
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-messaging</artifactId>
<version>${axon.version}</version>
</dependency>
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-modelling</artifactId>
<version>${axon.version}</version>
</dependency>
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-eventsourcing</artifactId>
<version>${axon.version}</version>
</dependency>
<!-- endregion [Axon Framework] -->

Expand Down Expand Up @@ -158,7 +162,6 @@
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-test</artifactId>
<version>${axon.version}</version>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import org.axonframework.eventsourcing.annotation.EventSourcedEntity
import org.axonframework.eventsourcing.annotation.EventSourcingHandler
import org.axonframework.eventsourcing.annotation.reflection.EntityCreator

/**
* Classic mutable entity-based command model.
*/
@EventSourcedEntity(tagKey = COURSE)
internal class CreateCourseState @EntityCreator constructor() {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.axoniq.demo.university.faculty.write.create_course_functional

import io.axoniq.demo.university.shared.ids.CourseId
import org.axonframework.messaging.commandhandling.annotation.Command
import org.axonframework.modelling.annotation.TargetEntityId

data class CreateCourse(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ import org.axonframework.modelling.annotation.InjectEntity

/**
* Pure function without enclosing type.
* The handler
*/
@CommandHandler(commandName = "CreateCourse", payloadType = CreateCourse::class, routingKey = CreateCourse.ID)
@CommandHandler(commandName = "faculty.CreateCourse", payloadType = CreateCourse::class, routingKey = CreateCourse.ID)
internal fun handle(command: CreateCourse, @InjectEntity(idProperty = CreateCourse.ID) state: CreateCourseState, eventAppender: EventAppender) {
eventAppender.append(state.decide(command))
}
Expand Down
5 changes: 2 additions & 3 deletions src/main/kotlin/faculty/write/enroll_student/config.kt
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package io.axoniq.demo.university.faculty.write.enroll_student

import io.axoniq.demo.university.faculty.FacultyTags
import io.axoniq.demo.university.shared.ids.StudentId
import org.axonframework.eventsourcing.configuration.EventSourcedEntityModule
import org.axonframework.eventsourcing.configuration.EventSourcingConfigurer
import org.axonframework.messaging.commandhandling.annotation.CommandHandler
import org.axonframework.messaging.commandhandling.configuration.CommandHandlingModule
import org.axonframework.messaging.eventhandling.gateway.EventAppender
import org.axonframework.eventsourcing.configuration.EventSourcedEntityModule
import org.axonframework.eventsourcing.configuration.EventSourcingConfigurer
import org.axonframework.modelling.annotation.InjectEntity

class EnrollStudentCommandHandler {
Expand Down