Skip to content

Commit 32d1b8e

Browse files
zambrovskizambrovski
authored
Merge branch 'AxonFramework:master' into master
2 parents 5c05225 + 871bbee commit 32d1b8e

File tree

26 files changed

+747
-103
lines changed

26 files changed

+747
-103
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ There are different ways in which you can contribute to the framework:
1212
framework, send us a pull request (or patch or a zip containing the source code). We will evaluate it and try to
1313
fit it in the framework. Please make sure code is properly documented using javadoc. This helps us to understand
1414
what is going on.
15-
3. If you know of any other way you think you can help us, do not hesitate to send a message to the
16-
[Axon Framework mailinglist](axonframework@googlegroups.com).
15+
3. If you know of any other way you think you can help us, do not hesitate to join and start a conversation on
16+
[AxonIQ's discussion platform](https://discuss.axoniq.io/).
1717

1818
## Code contributions
1919

‎.github/dependabot.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
version: 2
22
updates:
3+
- package-ecosystem: github-actions
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 5
8+
# Specify labels for pull requests
9+
labels:
10+
- "Type: Dependency Upgrade"
11+
- "Priority 1: Must"
12+
- "Status: In Progress"
13+
# Add reviewers
14+
reviewers:
15+
- "sandjelkovic"
16+
- "smcvb"
17+
milestone: 2
318
- package-ecosystem: maven
419
directory: "/"
520
schedule:

‎.github/release-notes.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
changelog:
2+
sections:
3+
- title: ":star: Features"
4+
labels: [ "Type: Feature" ]
5+
- title: ":chart_with_upwards_trend: Enhancements"
6+
labels: [ "Type: Enhancement" ]
7+
- title: ":beetle: Bug Fixes"
8+
labels: [ "Type: Bug" ]
9+
- title: ":hammer_and_wrench: Dependency Upgrade"
10+
labels: [ "Type: Dependency Upgrade" ]
11+
issues:
12+
exclude:
13+
labels: [ "Type: Incorrect Repository", "Type: Question" ]
14+
contributors:
15+
exclude:
16+
names: [ "dependabot" ]

‎.github/workflows/main.yml

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: Kotlin Extension
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
- axon-kotlin-*.*.x
9+
10+
jobs:
11+
build:
12+
name: Test and Build on JDK ${{ matrix.java-version }}
13+
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
include:
17+
- java-version: 8
18+
sonar-enabled: false
19+
- java-version: 11
20+
sonar-enabled: true
21+
22+
steps:
23+
- name: Checkout code
24+
uses: actions/checkout@v2
25+
26+
- name: Set up JDK ${{ matrix.java-version }}
27+
uses: actions/setup-java@v2.3.1
28+
with:
29+
distribution: 'zulu'
30+
java-version: ${{ matrix.java-version }}
31+
server-id: sonatype
32+
server-username: MAVEN_USERNAME
33+
server-password: MAVEN_PASSWORD
34+
35+
- name: Cache .m2
36+
uses: actions/cache@v2.1.6
37+
with:
38+
path: ~/.m2/repository
39+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
40+
restore-keys: |
41+
${{ runner.os }}-maven
42+
43+
- name: Maven operation with Sonar
44+
if: matrix.sonar-enabled
45+
run: |
46+
mvn -B -U -Pcoverage \
47+
clean verify \
48+
sonar:sonar \
49+
-Dsonar.projectKey=AxonFramework_extension-kotlin \
50+
-Dsonar.organization=axonframework \
51+
-Dsonar.host.url=https://sonarcloud.io \
52+
-Dsonar.login=${{ secrets.SONAR_TOKEN }}
53+
env:
54+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55+
56+
- name: Maven operation without Sonar
57+
if: matrix.sonar-enabled != true
58+
run: |
59+
mvn -B -U clean verify
60+
env:
61+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
62+
63+
- name: Deploy to Sonatype
64+
if: success()
65+
run: |
66+
./mvnw -B -U deploy -DskipTests=true
67+
env:
68+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
69+
MAVEN_USERNAME: ${{ secrets.SONATYPE_TOKEN_ID }}
70+
MAVEN_PASSWORD: ${{ secrets.SONATYPE_TOKEN_PASS }}
71+
72+
- name: Notify success to Slack
73+
if: success()
74+
env:
75+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
76+
uses: voxmedia/github-action-slack-notify-build@v1.1.2
77+
with:
78+
channel_id: CAGSEC92A
79+
status: SUCCESS
80+
color: good
81+
82+
- name: Notify failure to Slack
83+
if: failure()
84+
env:
85+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
86+
uses: voxmedia/github-action-slack-notify-build@v1.1.2
87+
with:
88+
channel_id: CAGSEC92A
89+
status: FAILED
90+
color: danger

‎.github/workflows/maven.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎.github/workflows/pullrequest.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Kotlin Extension
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
build:
8+
name: Test and Build on JDK ${{ matrix.java-version }}
9+
runs-on: ubuntu-latest
10+
strategy:
11+
matrix:
12+
include:
13+
- java-version: 8
14+
sonar-enabled: false
15+
- java-version: 11
16+
sonar-enabled: true
17+
18+
steps:
19+
- name: Checkout code
20+
uses: actions/checkout@v2
21+
22+
- name: Set up JDK ${{ matrix.java-version }}
23+
uses: actions/setup-java@v2.3.1
24+
with:
25+
distribution: 'zulu'
26+
java-version: ${{ matrix.java-version }}
27+
server-id: sonatype
28+
server-username: MAVEN_USERNAME
29+
server-password: MAVEN_PASSWORD
30+
31+
- name: Cache .m2
32+
uses: actions/cache@v2.1.6
33+
with:
34+
path: ~/.m2/repository
35+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
36+
restore-keys: |
37+
${{ runner.os }}-maven
38+
39+
- name: Maven operation with Sonar
40+
if: matrix.sonar-enabled
41+
run: |
42+
mvn -B -U -Pcoverage \
43+
clean verify \
44+
sonar:sonar \
45+
-Dsonar.projectKey=AxonFramework_extension-kotlin \
46+
-Dsonar.organization=axonframework \
47+
-Dsonar.host.url=https://sonarcloud.io \
48+
-Dsonar.login=${{ secrets.SONAR_TOKEN }}
49+
env:
50+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51+
52+
- name: Maven operation without Sonar
53+
if: matrix.sonar-enabled != true
54+
run: |
55+
mvn -B -U clean verify
56+
env:
57+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release-notes.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Trigger the workflow on milestone events
2+
on:
3+
milestone:
4+
types: [closed]
5+
name: Milestone Closure
6+
jobs:
7+
create-release-notes:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@master
12+
- name: Create Release Notes Markdown
13+
uses: docker://decathlon/release-notes-generator-action:3.1.5
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
16+
OUTPUT_FOLDER: temp_release_notes
17+
USE_MILESTONE_TITLE: "true"
18+
- name: Get the name of the created Release Notes file and extract Version
19+
run: |
20+
RELEASE_NOTES_FILE=$(ls temp_release_notes/*.md | head -n 1)
21+
echo "RELEASE_NOTES_FILE=$RELEASE_NOTES_FILE" >> $GITHUB_ENV
22+
VERSION=$(echo ${{ github.event.milestone.title }} | cut -d' ' -f2)
23+
echo "VERSION=$VERSION" >> $GITHUB_ENV
24+
- name: Create a Draft Release Notes on GitHub
25+
id: create_release
26+
uses: actions/create-release@v1
27+
env:
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
29+
with:
30+
tag_name: axon-kotlin-${{ env.VERSION }}
31+
release_name: Axon Kotlin Extension v${{ env.VERSION }}
32+
body_path: ${{ env.RELEASE_NOTES_FILE }}
33+
draft: true

‎.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
# Maven build artifacts can be ignored
2+
target/
3+
# ...but keep the wrapper jar
4+
!.mvn/wrapper/maven-wrapper.jar
5+
16
*.iml
27
axon.ipr
38
axon.iws
4-
target/
59
.idea/
610
**/*.iml
711
.classpath

‎CONTRIBUTING.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Contribution Guidelines
2+
3+
Thank you for your interest in contributing to the Axon Framework Kotlin Extension. To make sure using Axon is a smooth
4+
experience for everybody, we've set up a number of guidelines to follow.
5+
6+
There are different ways in which you can contribute to the framework:
7+
8+
1. You can report any bugs, feature requests or ideas about improvements on
9+
our [issue page](https://github.com/AxonFramework/extension-kotlin/issues/new/choose). All ideas are welcome. Please
10+
be as exact as possible when reporting bugs. This will help us reproduce and thus solve the problem faster.
11+
2. If you have created a component for your own application that you think might be useful to include in the framework,
12+
send us a pull request (or a patch / zip containing the source code). We will evaluate it and try to fit it in the
13+
framework. Please make sure code is properly documented using JavaDoc. This helps us to understand what is going on.
14+
3. If you know of any other way you think you can help us, do not hesitate to send a message to
15+
the [AxonIQ's discussion platform](https://discuss.axoniq.io/).
16+
17+
## Code Contributions
18+
19+
If you're contributing code, please take care of the following:
20+
21+
### Contributor Licence Agreement
22+
23+
To keep everyone out of trouble (both you and us), we require that all contributors (digitally) sign a Contributor
24+
License Agreement. Basically, the agreement says that we may freely use the code you contribute to the Axon Framework
25+
Kotlin Extension, and that we won't hold you liable for any unfortunate side effects that the code may cause.
26+
27+
To sign the CLA, visit: https://cla-assistant.io/AxonFramework/extension-kotlin
28+
29+
### Code Style
30+
31+
We're trying very hard to maintain a consistent style of coding throughout the code base. Think of things like indenting
32+
using 4 spaces, putting opening brackets (the '{') on the same line and putting proper JavaDoc on all non-private
33+
members.
34+
35+
If you're using IntelliJ IDEA, you can download the code style
36+
definition [here](https://github.com/AxonFramework/AxonFramework/blob/master/axon_code_style.xml). Simply import the XML
37+
file in under "Settings -> Code Style -> Scheme -> Import Scheme". Doing so should make the code style selectable
38+
immediately.

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Axon Framework - Kotlin Extension
2-
32
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.axonframework.extensions.kotlin/axon-kotlin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.axonframework.extensions.kotlin/axon-kotlin)
3+
![Build Status](https://github.com/AxonFramework/extension-kotlin/workflows/Kotlin%20Extension/badge.svg?branch=master)
4+
[![SonarCloud Status](https://sonarcloud.io/api/project_badges/measure?project=AxonFramework_extension-kotlin&metric=alert_status)](https://sonarcloud.io/dashboard?id=AxonFramework_extension-kotlin)
45
[![Open Source Helpers](https://www.codetriage.com/axonframework/extension-kotlin/badges/users.svg)](https://www.codetriage.com/axonframework/extension-kotlin)
5-
[![SonarCloud Gate Status](https://sonarcloud.io/api/project_badges/measure?project=AxonFramework_extension-kotlin&metric=alert_status)](https://sonarcloud.io/dashboard?id=AxonFramework_extension-kotlin)
66

77
_Note:_ This extension is still in an experimental stage.
88

@@ -48,7 +48,7 @@ Are you having trouble using the extension?
4848
We'd like to help you out the best we can!
4949
There are a couple of things to consider when you're traversing anything Axon:
5050

51-
* Checking the [reference guide](https://docs.axoniq.io/reference-guide/extensions/) should be your first stop,
51+
* Checking the [reference guide](https://docs.axoniq.io/reference-guide/extensions/kotlin) should be your first stop,
5252
as the majority of possible scenarios you might encounter when using Axon should be covered there.
5353
* If the Reference Guide does not cover a specific topic you would've expected,
5454
we'd appreciate if you could file an [issue](https://github.com/AxonIQ/reference-guide/issues) about it for us.

0 commit comments

Comments
 (0)