Merge branch 'main' into refactor/update_ruby_ci

luke-hill · luke-hill · commit f339d7f88bf1 · 2025-10-03T18:00:01.000+01:00
diff --git a/.github/workflows/release-github.yaml b/.github/workflows/release-github.yaml
@@ -12,7 +12,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: cucumber/action-create-github-release@v1.1.1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release-mvn.yml b/.github/workflows/release-mvn.yml
@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     environment: Release
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
           cache: 'maven'
-      - uses: cucumber/action-publish-mvn@v2.0.0
+      - uses: cucumber/action-publish-mvn@v3.0.0
         with:
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          nexus-username: cukebot
+          nexus-username: ${{ secrets.SONATYPE_USERNAME }}
           nexus-password: ${{ secrets.SONATYPE_PASSWORD }}
           working-directory: java
diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
@@ -4,21 +4,24 @@ on:
   push:
     branches: [release/*]
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   publish-npm:
     name: Publish NPM module
     runs-on: ubuntu-latest
     environment: Release
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v5
         with:
-          node-version: '16'
+          node-version: '24.x'
           cache: 'npm'
           cache-dependency-path: javascript/package-lock.json
-      - run: npm install-test
+          registry-url: 'https://registry.npmjs.org'
+      - run: npm install-ci-test
+        working-directory: javascript
+      - run: npm publish
         working-directory: javascript
-      - uses: cucumber/action-publish-npm@v1.1.1
-        with:
-          npm-token: ${{ secrets.NPM_TOKEN }}
-          working-directory: javascript
diff --git a/.github/workflows/release-nuget.yaml b/.github/workflows/release-nuget.yaml
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     environment: Release
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - uses: cucumber/action-publish-nuget@v1.0.0
         with:
           nuget-api-key: ${{ secrets.NUGET_API_KEY }}
diff --git a/.github/workflows/release-pypi.yaml b/.github/workflows/release-pypi.yaml
@@ -16,11 +16,11 @@ jobs:
         working-directory: python
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set up Python 3.10
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
-          python-version: "3.10"
+          python-version: "3.13"
 
       - name: Show Python version
         run: python --version
diff --git a/.github/workflows/release-rubygem.yml b/.github/workflows/release-rubygem.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: Release
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.4'
diff --git a/.github/workflows/stryker-javascript.yml b/.github/workflows/stryker-javascript.yml
@@ -12,10 +12,10 @@ jobs:
   stryker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/checkout@v5
+    - uses: actions/setup-node@v5
       with:
-        node-version: '18'
+        node-version: '22'
         cache: 'npm'
         cache-dependency-path: javascript/package-lock.json
     - run: npm install
diff --git a/.github/workflows/test-dotnet.yml b/.github/workflows/test-dotnet.yml
@@ -14,11 +14,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: |
+            8.0.x
+            9.0.x
       - name: Restore dependencies
         run: dotnet restore
         working-directory: dotnet
diff --git a/.github/workflows/test-go.yml b/.github/workflows/test-go.yml
@@ -25,11 +25,12 @@ jobs:
             go: '1.18.x'
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         go-version: ${{ matrix.go }}
+        cache-dependency-path: go/go.sum
     - name: lint
       working-directory: go
       run: gofmt -w .
diff --git a/.github/workflows/test-java.yml b/.github/workflows/test-java.yml
@@ -13,20 +13,20 @@ jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         os:
           - ubuntu-latest
-        java: ['11', '17']
+        java: ['17', '21']
         include:
           - os: windows-latest
             java: '17'
           - os: macos-latest
             java: '17'
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
diff --git a/.github/workflows/test-javascript.yml b/.github/workflows/test-javascript.yml
@@ -17,24 +17,24 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-        node-version: ['18.x', '20.x']
+        node-version: ['18.x', '20.x', '22.x', '23.x']
         include:
           - os: windows-latest
-            node-version: '20.x'
+            node-version: '22.x'
           - os: macos-latest
-            node-version: '20.x'
+            node-version: '22.x'
 
     steps:
     - name: set git core.autocrlf to 'input'
       run: git config --global core.autocrlf input
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: with Node.js ${{ matrix.node-version }} on ${{ matrix.os }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v5
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
         cache-dependency-path: javascript/package-lock.json
     - run: npm install-test
       working-directory: javascript
-    - run: npm run eslint
+    - run: npm run lint
       working-directory: javascript
diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
@@ -22,9 +22,9 @@ jobs:
           - ubuntu-latest
         python-version: ["3.10"]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Linting
@@ -43,21 +43,21 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         include:
           - os: windows-latest
             python-version: "3.10"
           - os : macos-latest
             python-version: "3.10"
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Get full Python version
       id: full-python-version
-      run: echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")
+      run: echo "version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")" >> $GITHUB_OUTPUT
     - name: Bootstrap poetry
       run: |
         curl -sL https://install.python-poetry.org | python - -y ${{ matrix.bootstrap-args }}
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
@@ -25,7 +25,7 @@ jobs:
             ruby: '3.4'
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Changed
 - [Ruby] Minor cosmetic / CI changes for development (Nothing front-facing)
+- [Python] PEP 639 licence metadata specification ([#361](https://github.com/cucumber/cucumber-expressions/pull/361))
 
 ## [18.0.1] - 2024-10-28
 ### Fixed
diff --git a/dotnet/CucumberExpressions.Tests/CucumberExpressions.Tests.csproj b/dotnet/CucumberExpressions.Tests/CucumberExpressions.Tests.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
     <LangVersion>latest</LangVersion> 
     <IsPackable>false</IsPackable>
 	<SignAssembly>True</SignAssembly>
 	<AssemblyOriginatorKeyFile>..\CucucmberExpressions.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.12.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="FluentAssertions" Version="8.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="YamlDotNet" Version="16.2.1" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/go/go.mod b/go/go.mod
@@ -1,7 +1,7 @@
 module github.com/cucumber/cucumber-expressions/go/v18
 
 require (
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.11.1
 	gopkg.in/yaml.v3 v3.0.1
 )
 
diff --git a/go/go.sum b/go/go.sum
@@ -21,6 +21,10 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=
+github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/java/pom.xml b/java/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-parent</artifactId>
-        <version>4.2.0</version>
+        <version>4.4.0</version>
     </parent>
 
     <artifactId>cucumber-expressions</artifactId>
@@ -32,14 +32,14 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.11.3</version>
+                <version>6.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.18.2</version>
+                <version>2.20.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -71,17 +71,12 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>2.3</version>
+            <version>2.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/java/src/test/java/io/cucumber/cucumberexpressions/NumberParserTest.java b/java/src/test/java/io/cucumber/cucumberexpressions/NumberParserTest.java
@@ -1,6 +1,7 @@
 package io.cucumber.cucumberexpressions;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnJre;
 
 import java.math.BigDecimal;
 import java.util.Locale;
@@ -59,16 +60,21 @@ void can_parse_negative() {
     @Test
     void can_parse_exponents() {
         assertEquals(new BigDecimal("100"), english.parseBigDecimal("1.00E2"));
-        assertEquals(new BigDecimal("100"), canadian.parseBigDecimal("1.00e2"));
         assertEquals(new BigDecimal("100"), german.parseBigDecimal("1,00E2"));
         assertEquals(new BigDecimal("100"), canadianFrench.parseBigDecimal("1,00E2"));
         assertEquals(new BigDecimal("100"), norwegian.parseBigDecimal("1,00E2"));
 
         assertEquals(new BigDecimal("0.01"), english.parseBigDecimal("1E-2"));
-        assertEquals(new BigDecimal("0.01"), canadian.parseBigDecimal("1e-2"));
         assertEquals(new BigDecimal("0.01"), german.parseBigDecimal("1E-2"));
         assertEquals(new BigDecimal("0.01"), canadianFrench.parseBigDecimal("1E-2"));
         assertEquals(new BigDecimal("0.01"), norwegian.parseBigDecimal("1E-2"));
     }
 
+    @Test
+    @DisabledOnJre(versions = 17, disabledReason = "Locale information on JDK 17 uses lower case e for exponents")
+    void can_parse_exponents_canadian() {
+        assertEquals(new BigDecimal("100"), canadian.parseBigDecimal("1.00E2"));
+        assertEquals(new BigDecimal("0.01"), canadian.parseBigDecimal("1E-2"));
+    }
+
 }
diff --git a/javascript/.eslintrc.json b/javascript/.eslintrc.json
diff --git a/javascript/eslint.config.mjs b/javascript/eslint.config.mjs
diff --git a/javascript/package-lock.json b/javascript/package-lock.json
diff --git a/javascript/package.json b/javascript/package.json
diff --git a/javascript/src/CucumberExpressionGenerator.ts b/javascript/src/CucumberExpressionGenerator.ts
diff --git a/javascript/test/CustomParameterTypeTest.ts b/javascript/test/CustomParameterTypeTest.ts
diff --git a/python/poetry.lock b/python/poetry.lock
diff --git a/python/pyproject.toml b/python/pyproject.toml
