Skip to content

Commit 8a42938

Browse files
jangalinskijangalinski
committed
Merge branch 'release/1.3.1.0'
2 parents ca11586 + bc27075 commit 8a42938

File tree

10 files changed

+67
-33
lines changed

10 files changed

+67
-33
lines changed

‎.github/release-notes.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
changelog:
2+
sections:
3+
- title: ":rocket: Enhancements & Features"
4+
labels: [ "Type: enhancement", "Type: documentation", "Type: example" ]
5+
- title: ":bug: Bug Fixes"
6+
labels: [ "Type: bug" ]
7+
- title: ":hammer_and_wrench: Chore"
8+
labels: [ "Type: dependencies" ]
9+
issues:
10+
exclude:
11+
labels: [ "Type: Incorrect Repository", "Type: question" ]
12+
contributors:
13+
exclude:
14+
names: [ "dependabot[bot]", "codacy-badger" ]

‎.github/workflows/default.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ jobs:
2626
${{ runner.os }}-maven
2727
2828
# Setup JDK and Maven
29-
- name: Set up JDK 11
30-
uses: actions/setup-java@v1
29+
- name: Set up JDK 17
30+
uses: actions/setup-java@v4
3131
with:
32-
java-version: 11.0.5
32+
distribution: 'temurin'
33+
java-version-file: ./.java-version
3334

3435
- name: Prepare Maven Wrapper
3536
run: chmod +x ./mvnw

‎.github/workflows/master.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ jobs:
2929
run: echo ${{ secrets.GPG_SECRET_KEYS }} | base64 --decode | gpg --import --no-tty --batch --yes
3030

3131
# Setup JDK and Maven
32-
- name: Set up JDK 11
33-
uses: actions/setup-java@v1
32+
- name: Set up JDK 17
33+
uses: actions/setup-java@v4
3434
with:
35-
java-version: 11.0.5
35+
distribution: 'temurin'
36+
java-version-file: ./.java-version
3637
server-id: ossrh
3738
server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central
3839
server-password: OSS_CENTRAL_PASSWORD # env variable for Maven Central

‎.github/workflows/release-notes.yaml‎

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,33 @@
1-
changelog:
2-
sections:
3-
- title: ":rocket: Enhancements & Features"
4-
labels: [ "Type: enhancement", "Type: documentation", "Type: example" ]
5-
- title: ":bug: Bug Fixes"
6-
labels: [ "Type: bug" ]
7-
- title: ":hammer_and_wrench: Chore"
8-
labels: [ "Type: dependencies", "Type: build", "Type: codacy" ]
9-
issues:
10-
exclude:
11-
labels: [ "Type: question" ]
12-
contributors:
13-
exclude:
14-
names: [ "dependabot[bot]" ]
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: ${{ env.VERSION }}
31+
release_name: ${{ env.VERSION }}
32+
body_path: ${{ env.RELEASE_NOTES_FILE }}
33+
draft: true

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ _tmp
1818
.project
1919
.settings/
2020
.meta-data/
21-
.java-version
2221
.DS_Store
2322

2423
# java mem

‎.java-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
17.0

‎core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.toolisticon.testing</groupId>
77
<artifactId>jgiven-kotlin-parent</artifactId>
8-
<version>1.3.0.0</version>
8+
<version>1.3.1.0</version>
99
</parent>
1010

1111
<artifactId>jgiven-kotlin</artifactId>
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>ch.qos.logback</groupId>
4949
<artifactId>logback-classic</artifactId>
50-
<version>1.4.11</version>
50+
<version>1.4.14</version>
5151
<scope>test</scope>
5252
</dependency>
5353
</dependencies>

‎junit5/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.toolisticon.testing</groupId>
77
<artifactId>jgiven-kotlin-parent</artifactId>
8-
<version>1.3.0.0</version>
8+
<version>1.3.1.0</version>
99
</parent>
1010

1111
<name>JGiven Kotlin - JUnit5</name>
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>ch.qos.logback</groupId>
4747
<artifactId>logback-classic</artifactId>
48-
<version>1.4.11</version>
48+
<version>1.4.14</version>
4949
<scope>test</scope>
5050
</dependency>
5151
</dependencies>

‎pom.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>io.toolisticon.maven.parent</groupId>
77
<artifactId>maven-parent-kotlin-base</artifactId>
8-
<version>2023.9.1</version>
8+
<version>2024.1.0</version>
99
<relativePath/>
1010
</parent>
1111

1212
<groupId>io.toolisticon.testing</groupId>
1313
<artifactId>jgiven-kotlin-parent</artifactId>
14-
<version>1.3.0.0</version>
14+
<version>1.3.1.0</version>
1515

1616
<name>JGiven Kotlin - Parent</name>
1717
<description>jgiven kotlin extension - parent</description>
@@ -27,11 +27,10 @@
2727

2828
<properties>
2929
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
30-
<jgiven.version>1.3.0</jgiven.version>
31-
<spring-boot.version>2.7.15</spring-boot.version>
30+
<jgiven.version>1.3.1</jgiven.version>
3231

3332
<!-- TEST -->
34-
<assertj.version>3.24.2</assertj.version>
33+
<assertj.version>3.25.2</assertj.version>
3534
</properties>
3635

3736
<dependencyManagement>
@@ -65,7 +64,7 @@
6564
<plugin>
6665
<groupId>org.jetbrains.dokka</groupId>
6766
<artifactId>dokka-maven-plugin</artifactId>
68-
<version>1.9.0</version>
67+
<version>1.9.10</version>
6968
<executions>
7069
<execution>
7170
<id>attach-javadocs</id>

‎spring-junit5/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.toolisticon.testing</groupId>
77
<artifactId>jgiven-kotlin-parent</artifactId>
8-
<version>1.3.0.0</version>
8+
<version>1.3.1.0</version>
99
</parent>
1010

1111
<name>JGiven Kotlin - Spring-JUnit5</name>
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>ch.qos.logback</groupId>
4747
<artifactId>logback-classic</artifactId>
48-
<version>1.4.11</version>
48+
<version>1.4.14</version>
4949
<scope>test</scope>
5050
</dependency>
5151
</dependencies>

0 commit comments

Comments
 (0)