Skip to content

Commit 61de9a6

Browse files
authored
Merge branch 'master' into feature/pom_improvements
2 parents 1c7db45 + 7f15f08 commit 61de9a6

File tree

9 files changed

+98
-13
lines changed

9 files changed

+98
-13
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ everybody, we've set up a number of guidelines to follow.
55

66
There are different ways in which you can contribute to the framework:
77

8-
1. You can report any bugs, feature requests or ideas about improvements on GitHub: https://github.com/AxonFramework/AxonFramework/issues/.
8+
1. You can report any bugs, feature requests or ideas about improvements on GitHub: https://github.com/AxonFramework/extension-kotlin/issues/.
99
All ideas are welcome. Please be as exact as possible when reporting bugs. This will help us reproduce and thus solve
1010
the problem faster.
1111
2. If you have created a component for your own application that you think might be useful to include in the

.github/ISSUE_TEMPLATE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Please use one of the following templates:
2+
3+
https://github.com/AxonFramework/extension-kotlin/issues/new/choose
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: 'Bug report'
3+
about: 'Report a bug in Axon Framework - Extension Kotlin'
4+
title:
5+
labels: 'type: bug :bug:'
6+
assignees:
7+
8+
---
9+
10+
### Steps to reproduce
11+
12+
* extension-kotlin version:
13+
* Axon Framework version:
14+
* JDK version:
15+
* Complete executable reproducer: (e.g. GitHub Repo)
16+
* Steps: (what exactly are you doing with the above reproducer?)
17+
18+
### Expected behaviour
19+
20+
### Actual behaviour
21+
22+
(In case of exceptions please provide full stack trace)
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: 'Feature request'
3+
about: 'Suggest a feature for Axon Framework - Extension Kotlin'
4+
title:
5+
labels: 'type: feature'
6+
7+
---
8+
9+
### Scenario
10+
11+
* extension-kotlin version:
12+
* Axon Framework version:
13+
* Description of your use case: (detailed description or executable reproducer, e.g. GitHub repo)
14+
15+
### Current Behaviour
16+
17+
### Wanted Behaviour
18+
19+
### Possible Workarounds
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: 'Enhancement request'
3+
about: 'Suggest an enhancement to an existing feature for Axon Framework - Extension Kotlin'
4+
title:
5+
labels: 'type: enhancement'
6+
7+
---
8+
9+
### Scenario
10+
11+
* extension-kotlin version:
12+
* Axon Framework version:
13+
* Description of your use case: (detailed description or executable reproducer, e.g. GitHub repo)
14+
15+
### Current Behaviour
16+
17+
### Wanted Behaviour
18+
19+
### Possible Workarounds

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: maven
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10

.github/workflows/maven.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,25 @@ jobs:
88
strategy:
99
matrix:
1010
java: [ 8, 11 ]
11+
1112
name: Build and tests on JDK ${{ matrix.java }}
13+
1214
steps:
13-
- uses: actions/checkout@v2
14-
- name: Set up JDK
15+
- name: Checkout code
16+
uses: actions/checkout@v2
17+
18+
- name: Set up JDK ${{ matrix.java }}
1519
uses: actions/setup-java@v1
1620
with:
1721
java-version: ${{ matrix.java }}
22+
23+
- name: Cache .m2
24+
uses: actions/cache@v1
25+
with:
26+
path: ~/.m2/repository
27+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
28+
restore-keys: |
29+
${{ runner.os }}-maven
30+
1831
- name: Build and verify
1932
run: mvn clean verify

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
[![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)
44
[![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)
56

67
_Note:_ This extension is still in an experimental stage.
78

pom.xml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
</modules>
3232

3333
<properties>
34-
<axon.version>4.4.1</axon.version>
34+
<axon.version>4.4.2</axon.version>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36-
<kotlin.version>1.3.61</kotlin.version>
37-
<kotlin-logging.version>1.7.7</kotlin-logging.version>
36+
<kotlin.version>1.4.10</kotlin.version>
37+
<kotlin-logging.version>1.12.0</kotlin-logging.version>
3838
<jackson-kotlin.version>2.10.0</jackson-kotlin.version>
3939
<mockk.version>1.10.0</mockk.version>
4040
<junit.jupiter.version>5.5.2</junit.jupiter.version>
4141
<slf4j.version>1.7.30</slf4j.version>
4242
<log4j.version>2.13.3</log4j.version>
43-
<dokka.version>1.4.0</dokka.version>
43+
<dokka.version>1.4.10</dokka.version>
4444
</properties>
4545

4646
<dependencyManagement>
@@ -130,7 +130,7 @@
130130
<!-- Not pat of Java 8 by default. Adding it as a dependency makes it compatible with Java 8 -->
131131
<groupId>javax.xml.bind</groupId>
132132
<artifactId>jaxb-api</artifactId>
133-
<version>2.3.0</version>
133+
<version>2.3.1</version>
134134
<scope>test</scope>
135135
</dependency>
136136

@@ -216,6 +216,7 @@
216216
<plugin>
217217
<groupId>org.jacoco</groupId>
218218
<artifactId>jacoco-maven-plugin</artifactId>
219+
<version>0.8.6</version>
219220
<executions>
220221
<execution>
221222
<goals>
@@ -246,7 +247,7 @@
246247
<plugins>
247248
<plugin>
248249
<artifactId>maven-clean-plugin</artifactId>
249-
<version>3.0.0</version>
250+
<version>3.1.0</version>
250251
</plugin>
251252
<plugin>
252253
<artifactId>maven-install-plugin</artifactId>
@@ -271,11 +272,11 @@
271272
<plugin>
272273
<groupId>org.jacoco</groupId>
273274
<artifactId>jacoco-maven-plugin</artifactId>
274-
<version>0.8.5</version>
275-
</plugin>
275+
<version>0.8.6</version>
276+
</plugin>
276277
<plugin>
277278
<artifactId>maven-compiler-plugin</artifactId>
278-
<version>3.5.1</version>
279+
<version>3.8.1</version>
279280
<configuration>
280281
<source>1.8</source>
281282
<target>1.8</target>
@@ -385,7 +386,7 @@
385386
<plugin>
386387
<!-- just to make sure deployed artifacts are always built (and tested) using JDK 8+ -->
387388
<artifactId>maven-enforcer-plugin</artifactId>
388-
<version>1.4.1</version>
389+
<version>1.4.2.jenkins-1</version>
389390
<executions>
390391
<execution>
391392
<id>enforce-java</id>

0 commit comments

Comments
 (0)