Skip to content

Commit be0c48e

Browse files
author
Justin Abrahms
authored
Merge branch 'main' into client-provider-mappings
2 parents 811d52b + 434da5a commit be0c48e

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: mvn --batch-mode --update-snapshots verify
5050

5151
- name: Upload coverage to Codecov
52-
uses: codecov/codecov-action@894ff025c7b54547a9a2a1e9f228beae737ad3c2
52+
uses: codecov/codecov-action@5bf250470ea3e4bf9456e73127015eb78ce4c280
5353
with:
5454
flags: unittests # optional
5555
name: coverage # optional

.github/workflows/pullrequest.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
cache: maven
2727

2828
- name: Initialize CodeQL
29-
uses: github/codeql-action/init@dcf71cf79bcf5f35de270a5eaece62a77b559094
29+
uses: github/codeql-action/init@8ca5570701137b67af3d8ae3d6452f4cee6579da
3030
with:
3131
languages: java
3232

@@ -38,11 +38,11 @@ jobs:
3838
restore-keys: |
3939
${{ runner.os }}-maven-
4040
41-
- name: Build with Maven
42-
run: mvn --batch-mode --update-snapshots verify -P integration-test
41+
- name: Verify with Maven
42+
run: mvn --batch-mode --update-snapshots verify -P e2e-test
4343

4444
- name: Upload coverage to Codecov
45-
uses: codecov/codecov-action@894ff025c7b54547a9a2a1e9f228beae737ad3c2
45+
uses: codecov/codecov-action@5bf250470ea3e4bf9456e73127015eb78ce4c280
4646
with:
4747
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
4848
flags: unittests # optional
@@ -51,4 +51,4 @@ jobs:
5151
verbose: true # optional (default = false)
5252

5353
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@dcf71cf79bcf5f35de270a5eaece62a77b559094
54+
uses: github/codeql-action/analyze@8ca5570701137b67af3d8ae3d6452f4cee6579da

.github/workflows/static-code-scanning.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ jobs:
3333

3434
# Initializes the CodeQL tools for scanning.
3535
- name: Initialize CodeQL
36-
uses: github/codeql-action/init@dcf71cf79bcf5f35de270a5eaece62a77b559094
36+
uses: github/codeql-action/init@8ca5570701137b67af3d8ae3d6452f4cee6579da
3737
with:
3838
languages: java
3939

4040
- name: Autobuild
41-
uses: github/codeql-action/autobuild@dcf71cf79bcf5f35de270a5eaece62a77b559094
41+
uses: github/codeql-action/autobuild@8ca5570701137b67af3d8ae3d6452f4cee6579da
4242

4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@dcf71cf79bcf5f35de270a5eaece62a77b559094
44+
uses: github/codeql-action/analyze@8ca5570701137b67af3d8ae3d6452f4cee6579da

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ If you think we might be out of date with the spec, you can check that by invoki
1616

1717
If you're adding tests to cover something in the spec, use the `@Specification` annotation like you see throughout the test suites.
1818

19-
## Integration tests
19+
## End-to-End Tests
2020

21-
The continuous integration runs a set of [gherkin integration tests](https://github.com/open-feature/test-harness/blob/main/features/evaluation.feature) using [`flagd`](https://github.com/open-feature/flagd). These tests do not run with the default maven profile. If you'd like to run them locally, you can start the flagd testbed with
21+
The continuous integration runs a set of [gherkin e2e tests](https://github.com/open-feature/test-harness/blob/main/features/evaluation.feature) using [`flagd`](https://github.com/open-feature/flagd). These tests do not run with the default maven profile. If you'd like to run them locally, you can start the flagd testbed with
2222

2323
```
2424
docker run -p 8013:8013 ghcr.io/open-feature/flagd-testbed:latest
2525
```
2626
and then run
2727
```
28-
mvn test -P integration-test
28+
mvn test -P e2e-test
2929
```
3030

3131
## Releasing

pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1111
<maven.compiler.source>1.8</maven.compiler.source>
1212
<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
13-
<junit.jupiter.version>5.9.2</junit.jupiter.version>
14-
<!-- exclusion expression for integration tests -->
15-
<testExclusions>**/integration/*.java</testExclusions>
13+
<junit.jupiter.version>5.9.3</junit.jupiter.version>
14+
<!-- exclusion expression for e2e tests -->
15+
<testExclusions>**/e2e/*.java</testExclusions>
1616
<module-name>${groupId}.${artifactId}</module-name>
1717
</properties>
1818

@@ -109,7 +109,7 @@
109109
<dependency>
110110
<groupId>org.junit.platform</groupId>
111111
<artifactId>junit-platform-suite</artifactId>
112-
<version>1.9.2</version>
112+
<version>1.9.3</version>
113113
<scope>test</scope>
114114
</dependency>
115115

@@ -142,7 +142,7 @@
142142
<dependency>
143143
<groupId>dev.openfeature.contrib.providers</groupId>
144144
<artifactId>flagd</artifactId>
145-
<version>0.5.8</version>
145+
<version>0.5.9</version>
146146
<scope>test</scope>
147147
</dependency>
148148
</dependencies>
@@ -153,15 +153,15 @@
153153
<dependency>
154154
<groupId>io.cucumber</groupId>
155155
<artifactId>cucumber-bom</artifactId>
156-
<version>7.11.2</version>
156+
<version>7.12.0</version>
157157
<type>pom</type>
158158
<scope>import</scope>
159159
</dependency>
160160

161161
<dependency>
162162
<groupId>org.junit</groupId>
163163
<artifactId>junit-bom</artifactId>
164-
<version>5.9.2</version>
164+
<version>5.9.3</version>
165165
<type>pom</type>
166166
<scope>import</scope>
167167
</dependency>
@@ -279,7 +279,7 @@
279279
<plugin>
280280
<groupId>org.jacoco</groupId>
281281
<artifactId>jacoco-maven-plugin</artifactId>
282-
<version>0.8.9</version>
282+
<version>0.8.10</version>
283283

284284
<executions>
285285
<execution>
@@ -495,10 +495,10 @@
495495

496496
<profiles>
497497
<profile>
498-
<!-- this profile handles running the flagd integration tests -->
499-
<id>integration-test</id>
498+
<!-- this profile handles running the flagd e2e tests -->
499+
<id>e2e-test</id>
500500
<properties>
501-
<!-- run the integration tests by clearing the exclusions -->
501+
<!-- run the e2e tests by clearing the exclusions -->
502502
<testExclusions/>
503503
</properties>
504504
<build>

src/test/java/dev/openfeature/sdk/integration/RunCucumberTest.java renamed to src/test/java/dev/openfeature/sdk/e2e/RunCucumberTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.openfeature.sdk.integration;
1+
package dev.openfeature.sdk.e2e;
22

33
import org.junit.platform.suite.api.ConfigurationParameter;
44
import org.junit.platform.suite.api.IncludeEngines;

src/test/java/dev/openfeature/sdk/integration/StepDefinitions.java renamed to src/test/java/dev/openfeature/sdk/e2e/StepDefinitions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.openfeature.sdk.integration;
1+
package dev.openfeature.sdk.e2e;
22

33
import dev.openfeature.contrib.providers.flagd.FlagdProvider;
44
import dev.openfeature.sdk.Client;

0 commit comments

Comments
 (0)