From 41dc2c069468d1ad50904c7771bae3629c47f040 Mon Sep 17 00:00:00 2001
From: Prashant Ramcharan <info@prashant-ramcharan.co.uk>
Date: Thu, 26 Sep 2024 08:00:56 +0100
Subject: [PATCH] Prepare release 6.17.0

---
 CHANGELOG.md                                       |  6 ++++++
 README.md                                          | 14 +++++++-------
 build.gradle                                       |  4 ++--
 gradle.properties                                  |  2 --
 .../courgette/runtime/CourgetteReportOptions.java  |  6 +++++-
 .../java/courgette/runtime/utils/FileUtils.java    |  4 ++--
 src/main/resources/report/templates/index.mustache |  4 ++--
 7 files changed, 24 insertions(+), 16 deletions(-)
 delete mode 100755 gradle.properties

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a01d6c1..ba61d68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+CHANGES IN VERSION 6.17.0
+=================================
+* [FIX] NullPointerException when resolving classpath feature URIs
+* [FIX] Unable to create parent directories that are needed for the Courgette Json reporter
+* [MAINTENANCE] Upgrade to Cucumber version 7.19.0
+
 CHANGES IN VERSION 6.16.0
 =================================
 * [ENHANCEMENT] Include the number of scenarios in the results table of the Courgette html report.
diff --git a/README.md b/README.md
index 2f05a8d..3e974ef 100644
--- a/README.md
+++ b/README.md
@@ -35,21 +35,21 @@ Courgette-JVM is an extension of Cucumber-JVM with added capabilities to **run c
 <dependency>
   <groupId>io.github.prashant-ramcharan</groupId>
   <artifactId>courgette-jvm</artifactId>
-  <version>6.16.0</version>
+  <version>6.17.0</version>
 </dependency>
 ````
 
 #### Gradle
 ````gradle
-implementation group: 'io.github.prashant-ramcharan', name: 'courgette-jvm', version: '6.16.0'
+implementation group: 'io.github.prashant-ramcharan', name: 'courgette-jvm', version: '6.17.0'
 ````
 
 #### Included Cucumber Dependencies
-* cucumber-core 7.18.1
-* cucumber-java 7.18.1
-* cucumber-java8 7.18.1
-* cucumber-junit 7.18.1
-* cucumber-testng 7.18.1
+* cucumber-core 7.19.0
+* cucumber-java 7.19.0
+* cucumber-java8 7.19.0
+* cucumber-junit 7.19.0
+* cucumber-testng 7.19.0
 
 
 ## Usage
diff --git a/build.gradle b/build.gradle
index 4f2bee4..96988c0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 group 'io.github.prashant-ramcharan'
-version '6.16.0'
+version '6.17.0'
 
 apply plugin: 'java'
 apply plugin: 'maven-publish'
@@ -12,7 +12,7 @@ compileJava {
 }
 
 ext {
-    cucumberVersion = '7.18.1'
+    cucumberVersion = '7.19.0'
     testNGVersion = '7.9.0'
     jacksonVersion = '2.17.0'
     httpcomponentsVersion = '4.5.13'
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100755
index e460146..0000000
--- a/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-ossrhUsername=
-ossrhPassword=
\ No newline at end of file
diff --git a/src/main/java/courgette/runtime/CourgetteReportOptions.java b/src/main/java/courgette/runtime/CourgetteReportOptions.java
index 90e909a..c18ce13 100644
--- a/src/main/java/courgette/runtime/CourgetteReportOptions.java
+++ b/src/main/java/courgette/runtime/CourgetteReportOptions.java
@@ -51,7 +51,11 @@ public Optional<String> getRerunFile() {
     }
 
     public String getFeatureId() {
-        return Arrays.stream(feature.getUri().getPath().split("/")).reduce((x, y) -> y)
+        String featureUri = feature.getUri().getPath() == null ?
+                feature.getUri().toString() :
+                feature.getUri().getPath();
+
+        return Arrays.stream(featureUri.split("/")).reduce((x, y) -> y)
                 .orElse("").replace(".feature", "")
                 .toLowerCase();
     }
diff --git a/src/main/java/courgette/runtime/utils/FileUtils.java b/src/main/java/courgette/runtime/utils/FileUtils.java
index ef8ede0..8cdd237 100644
--- a/src/main/java/courgette/runtime/utils/FileUtils.java
+++ b/src/main/java/courgette/runtime/utils/FileUtils.java
@@ -111,7 +111,7 @@ public static boolean createDirectory(File file) {
         if (file.exists() && file.isDirectory()) {
             return true;
         }
-        return file.mkdir();
+        return file.mkdirs();
     }
 
     public static boolean createFile(File file) {
@@ -119,7 +119,7 @@ public static boolean createFile(File file) {
             return true;
         }
         try {
-            file.getParentFile().mkdir();
+            createDirectory(file.getParentFile());
             file.createNewFile();
             return true;
         } catch (IOException e) {
diff --git a/src/main/resources/report/templates/index.mustache b/src/main/resources/report/templates/index.mustache
index 0fc682f..7d49393 100644
--- a/src/main/resources/report/templates/index.mustache
+++ b/src/main/resources/report/templates/index.mustache
@@ -184,13 +184,13 @@
                             <div class="col-sm-7">
                                 Cucumber Version:
                             </div>
-                            <div>7.18.1</div>
+                            <div>7.19.0</div>
                         </div>
                         <div class="row mt-4">
                             <div class="col-sm-7">
                                 Courgette Version:
                             </div>
-                            <div>6.16.0</div>
+                            <div>6.17.0</div>
                         </div>
                         <div class="row mt-4">
                             <div><a href class="col-sm-9" data-toggle="modal" data-target="#environment_info">Additional