Merge branch 'release/1.3.1.0'

toolisticon · Jan 25, 2024 · 8a42938 · 8a42938
2 parents ca11586 + bc27075
commit 8a42938
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 33 deletions.
diff --git a/.github/release-notes.yml b/.github/release-notes.yml
@@ -0,0 +1,14 @@
+changelog:
+  sections:
+    - title: ":rocket: Enhancements & Features"
+      labels: [ "Type: enhancement", "Type: documentation", "Type: example" ]
+    - title: ":bug: Bug Fixes"
+      labels: [ "Type: bug" ]
+    - title: ":hammer_and_wrench: Chore"
+      labels: [ "Type: dependencies" ]
+  issues:
+    exclude:
+      labels: [ "Type: Incorrect Repository", "Type: question" ]
+  contributors:
+    exclude:
+      names: [ "dependabot[bot]", "codacy-badger" ]
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -26,10 +26,11 @@ jobs:
             ${{ runner.os }}-maven
 
       # Setup JDK and Maven
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 11.0.5
+          distribution: 'temurin'
+          java-version-file: ./.java-version
 
       - name: Prepare Maven Wrapper
         run: chmod +x ./mvnw

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -29,10 +29,11 @@ jobs:
         run: echo ${{ secrets.GPG_SECRET_KEYS }} | base64 --decode | gpg --import --no-tty --batch --yes
 
       # Setup JDK and Maven
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 11.0.5
+          distribution: 'temurin'
+          java-version-file: ./.java-version
           server-id: ossrh
           server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central
           server-password: OSS_CENTRAL_PASSWORD # env variable for Maven Central

diff --git a/.github/workflows/release-notes.yaml b/.github/workflows/release-notes.yaml
@@ -1,14 +1,33 @@
-changelog:
-  sections:
-    - title: ":rocket: Enhancements & Features"
-      labels: [ "Type: enhancement", "Type: documentation", "Type: example" ]
-    - title: ":bug: Bug Fixes"
-      labels: [ "Type: bug" ]
-    - title: ":hammer_and_wrench: Chore"
-      labels: [ "Type: dependencies", "Type: build", "Type: codacy" ]
-  issues:
-    exclude:
-      labels: [ "Type: question" ]
-  contributors:
-    exclude:
-      names: [ "dependabot[bot]" ]
+# Trigger the workflow on milestone events
+on:
+  milestone:
+    types: [closed]
+name: Milestone Closure
+jobs:
+  create-release-notes:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@master
+      - name: Create Release Notes Markdown
+        uses: docker://decathlon/release-notes-generator-action:3.1.5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+          OUTPUT_FOLDER: temp_release_notes
+          USE_MILESTONE_TITLE: "true"
+      - name: Get the name of the created Release Notes file and extract Version
+        run: |
+          RELEASE_NOTES_FILE=$(ls temp_release_notes/*.md | head -n 1)
+          echo "RELEASE_NOTES_FILE=$RELEASE_NOTES_FILE" >> $GITHUB_ENV
+          VERSION=$(echo ${{ github.event.milestone.title }} | cut -d' ' -f2)
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+      - name: Create a Draft Release Notes on GitHub
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ env.VERSION }}
+          release_name:  ${{ env.VERSION }}
+          body_path: ${{ env.RELEASE_NOTES_FILE }}
+          draft: true
diff --git a/.gitignore b/.gitignore
@@ -18,7 +18,6 @@ _tmp
 .project
 .settings/
 .meta-data/
-.java-version
 .DS_Store
 
 # java mem

diff --git a/.java-version b/.java-version
@@ -0,0 +1 @@
+17.0
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.testing</groupId>
     <artifactId>jgiven-kotlin-parent</artifactId>
-    <version>1.3.0.0</version>
+    <version>1.3.1.0</version>
   </parent>
 
   <artifactId>jgiven-kotlin</artifactId>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.4.11</version>
+      <version>1.4.14</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/junit5/pom.xml b/junit5/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.testing</groupId>
     <artifactId>jgiven-kotlin-parent</artifactId>
-    <version>1.3.0.0</version>
+    <version>1.3.1.0</version>
   </parent>
 
   <name>JGiven Kotlin - JUnit5</name>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.4.11</version>
+      <version>1.4.14</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>io.toolisticon.maven.parent</groupId>
     <artifactId>maven-parent-kotlin-base</artifactId>
-    <version>2023.9.1</version>
+    <version>2024.1.0</version>
     <relativePath/>
   </parent>
 
   <groupId>io.toolisticon.testing</groupId>
   <artifactId>jgiven-kotlin-parent</artifactId>
-  <version>1.3.0.0</version>
+  <version>1.3.1.0</version>
 
   <name>JGiven Kotlin - Parent</name>
   <description>jgiven kotlin extension - parent</description>
@@ -27,11 +27,10 @@
 
   <properties>
     <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
-    <jgiven.version>1.3.0</jgiven.version>
-    <spring-boot.version>2.7.15</spring-boot.version>
+    <jgiven.version>1.3.1</jgiven.version>
 
     <!-- TEST -->
-    <assertj.version>3.24.2</assertj.version>
+    <assertj.version>3.25.2</assertj.version>
   </properties>
 
   <dependencyManagement>
@@ -65,7 +64,7 @@
         <plugin>
           <groupId>org.jetbrains.dokka</groupId>
           <artifactId>dokka-maven-plugin</artifactId>
-          <version>1.9.0</version>
+          <version>1.9.10</version>
           <executions>
             <execution>
               <id>attach-javadocs</id>

diff --git a/spring-junit5/pom.xml b/spring-junit5/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.testing</groupId>
     <artifactId>jgiven-kotlin-parent</artifactId>
-    <version>1.3.0.0</version>
+    <version>1.3.1.0</version>
   </parent>
 
   <name>JGiven Kotlin - Spring-JUnit5</name>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.4.11</version>
+      <version>1.4.14</version>
       <scope>test</scope>
     </dependency>
   </dependencies>