Skip to content

Commit 8114aed

Browse files
rozenshteynrozenshteyn
authored
Merge branch 'cucumber:main' into main
2 parents 01e8b25 + 04281f2 commit 8114aed

File tree

38 files changed

+66
-54
lines changed

38 files changed

+66
-54
lines changed

Diff for: ‎CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1717

1818
### Fixed
1919

20+
## [7.2.3] (2022-01-13)
21+
22+
### Fixed
23+
* [Core] Uncaught TypeError: e.git is undefined ([#2466](https://github.com/cucumber/cucumber-jvm/pull/2466) M.P. Korstanje)
24+
2025
## [7.2.2] (2022-01-07)
2126

2227
### Fixed
@@ -1735,7 +1740,8 @@ in `cucumber.api` stable from now on, with proper deprecation warnings in case s
17351740
* First proper release
17361741
17371742
<!-- Releases -->
1738-
[Unreleased]: https://github.com/cucumber/cucumber-jvm/compare/v7.2.2...main
1743+
[Unreleased]: https://github.com/cucumber/cucumber-jvm/compare/v7.2.3...main
1744+
[7.2.3]: https://github.com/cucumber/cucumber-jvm/compare/v7.2.2-RC1...v7.2.3
17391745
[7.2.2]: https://github.com/cucumber/cucumber-jvm/compare/v7.2.1-RC1...v7.2.2
17401746
[7.2.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.2.0-RC1...v7.2.1
17411747
[7.2.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.1.0-RC1...v7.2.0

Diff for: ‎archetype/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.cucumber</groupId>
77
<artifactId>cucumber-jvm</artifactId>
8-
<version>7.2.3-SNAPSHOT</version>
8+
<version>7.2.4-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>cucumber-archetype</artifactId>
@@ -58,6 +58,7 @@
5858
<artifactId>maven-resources-plugin</artifactId>
5959
<configuration>
6060
<escapeString>\</escapeString>
61+
<propertiesEncoding>UTF-8</propertiesEncoding>
6162
</configuration>
6263
</plugin>
6364
</plugins>

Diff for: ‎archetype/src/main/resources/archetype-resources/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<plugin>
6464
<groupId>org.apache.maven.plugins</groupId>
6565
<artifactId>maven-compiler-plugin</artifactId>
66-
<version>3.8.1</version>
66+
<version>3.9.0</version>
6767
<configuration>
6868
<encoding>UTF-8</encoding>
6969
<source>1.8</source>

Diff for: ‎archetype/src/test/resources/projects/should-generate-project/reference/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<plugin>
6464
<groupId>org.apache.maven.plugins</groupId>
6565
<artifactId>maven-compiler-plugin</artifactId>
66-
<version>3.8.1</version>
66+
<version>3.9.0</version>
6767
<configuration>
6868
<encoding>UTF-8</encoding>
6969
<source>1.8</source>

Diff for: ‎bom/pom.xml

+15-15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>cucumber-jvm</artifactId>
55
<groupId>io.cucumber</groupId>
6-
<version>7.2.3-SNAPSHOT</version>
6+
<version>7.2.4-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<packaging>pom</packaging>
@@ -45,12 +45,12 @@
4545
<dependency>
4646
<groupId>io.cucumber</groupId>
4747
<artifactId>datatable</artifactId>
48-
<version>7.2.3-SNAPSHOT</version>
48+
<version>7.2.4-SNAPSHOT</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>io.cucumber</groupId>
5252
<artifactId>datatable-matchers</artifactId>
53-
<version>7.2.3-SNAPSHOT</version>
53+
<version>7.2.4-SNAPSHOT</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>io.cucumber</groupId>
@@ -66,62 +66,62 @@
6666
<dependency>
6767
<groupId>io.cucumber</groupId>
6868
<artifactId>docstring</artifactId>
69-
<version>7.2.3-SNAPSHOT</version>
69+
<version>7.2.4-SNAPSHOT</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>io.cucumber</groupId>
7373
<artifactId>cucumber-plugin</artifactId>
74-
<version>7.2.3-SNAPSHOT</version>
74+
<version>7.2.4-SNAPSHOT</version>
7575
</dependency>
7676
<dependency>
7777
<groupId>io.cucumber</groupId>
7878
<artifactId>cucumber-core</artifactId>
79-
<version>7.2.3-SNAPSHOT</version>
79+
<version>7.2.4-SNAPSHOT</version>
8080
</dependency>
8181
<dependency>
8282
<groupId>io.cucumber</groupId>
8383
<artifactId>cucumber-java</artifactId>
84-
<version>7.2.3-SNAPSHOT</version>
84+
<version>7.2.4-SNAPSHOT</version>
8585
</dependency>
8686
<dependency>
8787
<groupId>io.cucumber</groupId>
8888
<artifactId>cucumber-java8</artifactId>
89-
<version>7.2.3-SNAPSHOT</version>
89+
<version>7.2.4-SNAPSHOT</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>io.cucumber</groupId>
9393
<artifactId>cucumber-spring</artifactId>
94-
<version>7.2.3-SNAPSHOT</version>
94+
<version>7.2.4-SNAPSHOT</version>
9595
</dependency>
9696
<dependency>
9797
<groupId>io.cucumber</groupId>
9898
<artifactId>cucumber-junit</artifactId>
99-
<version>7.2.3-SNAPSHOT</version>
99+
<version>7.2.4-SNAPSHOT</version>
100100
</dependency>
101101
<dependency>
102102
<groupId>io.cucumber</groupId>
103103
<artifactId>cucumber-testng</artifactId>
104-
<version>7.2.3-SNAPSHOT</version>
104+
<version>7.2.4-SNAPSHOT</version>
105105
</dependency>
106106
<dependency>
107107
<groupId>io.cucumber</groupId>
108108
<artifactId>cucumber-picocontainer</artifactId>
109-
<version>7.2.3-SNAPSHOT</version>
109+
<version>7.2.4-SNAPSHOT</version>
110110
</dependency>
111111
<dependency>
112112
<groupId>io.cucumber</groupId>
113113
<artifactId>cucumber-gherkin</artifactId>
114-
<version>7.2.3-SNAPSHOT</version>
114+
<version>7.2.4-SNAPSHOT</version>
115115
</dependency>
116116
<dependency>
117117
<groupId>io.cucumber</groupId>
118118
<artifactId>cucumber-gherkin-messages</artifactId>
119-
<version>7.2.3-SNAPSHOT</version>
119+
<version>7.2.4-SNAPSHOT</version>
120120
</dependency>
121121
<dependency>
122122
<groupId>io.cucumber</groupId>
123123
<artifactId>cucumber-junit-platform-engine</artifactId>
124-
<version>7.2.3-SNAPSHOT</version>
124+
<version>7.2.4-SNAPSHOT</version>
125125
</dependency>
126126
</dependencies>
127127
</dependencyManagement>

Diff for: ‎cdi2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>io.cucumber</groupId>
1616
<artifactId>cucumber-jvm</artifactId>
17-
<version>7.2.3-SNAPSHOT</version>
17+
<version>7.2.4-SNAPSHOT</version>
1818
</parent>
1919

2020
<artifactId>cucumber-cdi2</artifactId>

Diff for: ‎compatibility/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>cucumber-jvm</artifactId>
55
<groupId>io.cucumber</groupId>
6-
<version>7.2.3-SNAPSHOT</version>
6+
<version>7.2.4-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

Diff for: ‎core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-core</artifactId>

Diff for: ‎core/src/main/java/io/cucumber/core/runtime/CucumberExecutionContext.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,16 @@ private Ci createCi() {
7474
return null;
7575
}
7676

77+
Git git = createGit(ciEnvironment.getGit());
78+
if (git == null) {
79+
return null;
80+
}
81+
7782
return new Ci(
7883
ciEnvironment.getName(),
7984
ciEnvironment.getUrl(),
8085
ciEnvironment.getBuildNumber(),
81-
createGit(ciEnvironment.getGit()));
86+
git);
8287
}
8388

8489
private Git createGit(CiEnvironment.Git ciGit) {

Diff for: ‎datatable-matchers/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.cucumber</groupId>
77
<artifactId>cucumber-jvm</artifactId>
8-
<version>7.2.3-SNAPSHOT</version>
8+
<version>7.2.4-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>datatable-matchers</artifactId>

Diff for: ‎datatable/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.cucumber</groupId>
77
<artifactId>cucumber-jvm</artifactId>
8-
<version>7.2.3-SNAPSHOT</version>
8+
<version>7.2.4-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>datatable</artifactId>

Diff for: ‎deltaspike/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.cucumber</groupId>
77
<artifactId>cucumber-jvm</artifactId>
8-
<version>7.2.3-SNAPSHOT</version>
8+
<version>7.2.4-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>cucumber-deltaspike</artifactId>

Diff for: ‎docstring/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>cucumber-jvm</artifactId>
55
<groupId>io.cucumber</groupId>
6-
<version>7.2.3-SNAPSHOT</version>
6+
<version>7.2.4-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

Diff for: ‎examples/calculator-java-cli/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java-cli</artifactId>

Diff for: ‎examples/calculator-java-junit4/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java-junit4</artifactId>

Diff for: ‎examples/calculator-java-junit5/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java-junit5</artifactId>

Diff for: ‎examples/calculator-java-testng/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java-testng</artifactId>

Diff for: ‎examples/calculator-java8-cli/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java8-cli</artifactId>

Diff for: ‎examples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-examples</artifactId>

Diff for: ‎examples/spring-java-junit5/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>spring-java-junit5</artifactId>

Diff for: ‎examples/wicket-java-junit4/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.cucumber</groupId>
55
<artifactId>cucumber-examples</artifactId>
6-
<version>7.2.3-SNAPSHOT</version>
6+
<version>7.2.4-SNAPSHOT</version>
77
</parent>
88
<artifactId>wicket-java-junit4</artifactId>
99
<packaging>pom</packaging>

Diff for: ‎examples/wicket-java-junit4/wicket-main/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.cucumber</groupId>
55
<artifactId>wicket-java-junit4</artifactId>
6-
<version>7.2.3-SNAPSHOT</version>
6+
<version>7.2.4-SNAPSHOT</version>
77
</parent>
88
<artifactId>wicket-main</artifactId>
99
<name>Examples: Wicket application</name>

Diff for: ‎examples/wicket-java-junit4/wicket-test/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.cucumber</groupId>
55
<artifactId>wicket-java-junit4</artifactId>
6-
<version>7.2.3-SNAPSHOT</version>
6+
<version>7.2.4-SNAPSHOT</version>
77
</parent>
88
<artifactId>wicket-test</artifactId>
99
<name>Examples: Wicket application tested with Selenium</name>

Diff for: ‎gherkin-messages/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<properties>

Diff for: ‎gherkin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<properties>

Diff for: ‎guice/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-guice</artifactId>

Diff for: ‎jakarta-cdi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>io.cucumber</groupId>
1818
<artifactId>cucumber-jvm</artifactId>
19-
<version>7.2.3-SNAPSHOT</version>
19+
<version>7.2.4-SNAPSHOT</version>
2020
</parent>
2121

2222
<artifactId>cucumber-jakarta-cdi</artifactId>

Diff for: ‎java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-java</artifactId>

Diff for: ‎java8/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-java8</artifactId>

Diff for: ‎junit-platform-engine/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-junit-platform-engine</artifactId>

Diff for: ‎junit/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm</artifactId>
7-
<version>7.2.3-SNAPSHOT</version>
7+
<version>7.2.4-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-junit</artifactId>

0 commit comments

Comments
 (0)