Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 6.13.0 #403

Merged
merged 2 commits into from
Mar 31, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Prepare release 6.13.0
  • Loading branch information
Prashant Ramcharan committed Mar 30, 2024
commit ab5a0f12253928f126447b4f09c4b4581fd58f86
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
CHANGES IN VERSION 6.13.0
=================================
* [MAINTENANCE] Upgrade to Cucumber version 7.16.1
* [MAINTENANCE] Upgrade to Jackson version 2.17.0
* [MAINTENANCE] Upgrade to TestNG version 7.9.0


CHANGES IN VERSION 6.12.0
=================================
* [NEW] Add new Courgette option `generateCourgetteRunLog` to support in debugging parallel runs.
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.0</version>
<version>6.13.0</version>
</dependency>
````

#### Gradle
````gradle
implementation group: 'io.github.prashant-ramcharan', name: 'courgette-jvm', version: '6.12.0'
implementation group: 'io.github.prashant-ramcharan', name: 'courgette-jvm', version: '6.13.0'
````

#### Included Cucumber Dependencies
* cucumber-core 7.15.0
* cucumber-java 7.15.0
* cucumber-java8 7.15.0
* cucumber-junit 7.15.0
* cucumber-testng 7.15.0
* cucumber-core 7.16.1
* cucumber-java 7.16.1
* cucumber-java8 7.16.1
* cucumber-junit 7.16.1
* cucumber-testng 7.16.1


## Usage
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group 'io.github.prashant-ramcharan'
version '6.12.0'
version '6.13.0'

apply plugin: 'java'
apply plugin: 'maven-publish'
Expand All @@ -10,9 +10,9 @@ compileJava {
}

ext {
cucumberVersion = '7.15.0'
testNGVersion = '7.1.0'
jacksonVersion = '2.13.3'
cucumberVersion = '7.16.1'
testNGVersion = '7.9.0'
jacksonVersion = '2.17.0'
httpcomponentsVersion = '4.5.13'
extentreportVersion = '5.0.3'
mustacheVersion = '0.9.6'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/courgette/runtime/CucumberNdJsonReporter.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package courgette.runtime;

import courgette.runtime.utils.FileUtils;
import io.cucumber.messages.types.Envelope;
import org.testng.reporters.Files;

import java.io.File;
import java.io.FileInputStream;
Expand Down Expand Up @@ -35,7 +35,7 @@ static void copyReport(String ndJsonReportFile, String destinationNdJsonFile) {
try {
InputStream sourceNdJsonFile = new FileInputStream(ndJsonReportFile);

Files.copyFile(sourceNdJsonFile, new File(destinationNdJsonFile));
FileUtils.copyInputStreamToFile(sourceNdJsonFile, new File(destinationNdJsonFile));

} catch (Exception e) {
printExceptionStackTrace(e);
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/courgette/runtime/utils/FileUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ public static void writeFile(String file, String contents) {
fileStringWriter.accept(file, contents);
}

public static void copyInputStreamToFile(InputStream inputStream, File file) throws IOException {
try (FileOutputStream outputStream = new FileOutputStream(file, false)) {
int read;
byte[] bytes = new byte[8192];
while ((read = inputStream.read(bytes)) != -1) {
outputStream.write(bytes, 0, read);
}
}
}

public static List<File> getParentFiles(String path) {
return Arrays.asList(new File(path).getParentFile().listFiles());
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/report/templates/index.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,13 @@
<div class="col-sm-7">
Cucumber Version:
</div>
<div>7.15.0</div>
<div>7.16.1</div>
</div>
<div class="row mt-4">
<div class="col-sm-7">
Courgette Version:
</div>
<div>6.12.0</div>
<div>6.13.0</div>
</div>
<div class="row mt-4">
<div><a href class="col-sm-9" data-toggle="modal" data-target="#environment_info">Additional
Expand Down