Skip to content

Commit db6cc86

Browse files
alexandraoberaigneralexandraoberaigner
authored
Merge branch 'main' into feat/hook-data-support
2 parents 3417827 + 07bda4a commit db6cc86

File tree

9 files changed

+33
-35
lines changed

9 files changed

+33
-35
lines changed

‎.github/workflows/lint-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
name: Validate PR title
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: amannn/action-semantic-pull-request@e7d011b07ef37e089bea6539210f6a0d360d8af9
21+
- uses: amannn/action-semantic-pull-request@e49f57ce06c1747542fce2243c7a98682384bc0e
2222
env:
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
server-password: ${{ secrets.CENTRAL_PASSWORD }}
3737

3838
- name: Cache local Maven repository
39-
uses: actions/cache@638ed79f9dc94c1de1baef91bcab5edaa19451f4
39+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
4040
with:
4141
path: ~/.m2/repository
4242
key: ${{ runner.os }}-17-maven-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/pullrequest.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232
cache: maven
3333

3434
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@12dda79905a80126f2c9e61d8c032085742e7893
35+
uses: github/codeql-action/init@80cb6b56b93de3e779c7d476d9100d06fb87c877
3636
with:
3737
languages: java
3838

3939
- name: Cache local Maven repository
40-
uses: actions/cache@638ed79f9dc94c1de1baef91bcab5edaa19451f4
40+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
4141
with:
4242
path: ~/.m2/repository
4343
key: ${{ runner.os }}${{ matrix.build.java }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -58,4 +58,4 @@ jobs:
5858
verbose: true # optional (default = false)
5959

6060
- name: Perform CodeQL Analysis
61-
uses: github/codeql-action/analyze@12dda79905a80126f2c9e61d8c032085742e7893
61+
uses: github/codeql-action/analyze@80cb6b56b93de3e779c7d476d9100d06fb87c877

‎.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@12dda79905a80126f2c9e61d8c032085742e7893
36+
uses: github/codeql-action/init@80cb6b56b93de3e779c7d476d9100d06fb87c877
3737
with:
3838
languages: java
3939

4040
- name: Autobuild
41-
uses: github/codeql-action/autobuild@12dda79905a80126f2c9e61d8c032085742e7893
41+
uses: github/codeql-action/autobuild@80cb6b56b93de3e779c7d476d9100d06fb87c877
4242

4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@12dda79905a80126f2c9e61d8c032085742e7893
44+
uses: github/codeql-action/analyze@80cb6b56b93de3e779c7d476d9100d06fb87c877

‎mvnw‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# ----------------------------------------------------------------------------
2020

2121
# ----------------------------------------------------------------------------
22-
# Apache Maven Wrapper startup batch script, version 3.3.3
22+
# Apache Maven Wrapper startup batch script, version 3.3.4
2323
#
2424
# Optional ENV vars
2525
# -----------------

‎mvnw.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@REM ----------------------------------------------------------------------------
2020

2121
@REM ----------------------------------------------------------------------------
22-
@REM Apache Maven Wrapper startup batch script, version 3.3.3
22+
@REM Apache Maven Wrapper startup batch script, version 3.3.4
2323
@REM
2424
@REM Optional ENV vars
2525
@REM MVNW_REPOURL - repo url base for downloading maven distribution

‎pom.xml‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
15-
<org.mockito.version>5.19.0</org.mockito.version>
15+
<org.mockito.version>5.20.0</org.mockito.version>
1616
<!-- exclusion expression for e2e tests -->
1717
<testExclusions>**/e2e/*.java</testExclusions>
1818
<module-name>${project.groupId}.${project.artifactId}</module-name>
@@ -88,7 +88,7 @@
8888
<dependency>
8989
<groupId>org.assertj</groupId>
9090
<artifactId>assertj-core</artifactId>
91-
<version>3.27.5</version>
91+
<version>3.27.6</version>
9292
<scope>test</scope>
9393
</dependency>
9494

@@ -196,7 +196,7 @@
196196
<dependency>
197197
<groupId>com.vmlens</groupId>
198198
<artifactId>api</artifactId>
199-
<version>1.2.13</version>
199+
<version>1.2.16</version>
200200
<scope>test</scope>
201201
</dependency>
202202

@@ -234,15 +234,15 @@
234234
<dependency>
235235
<groupId>io.cucumber</groupId>
236236
<artifactId>cucumber-bom</artifactId>
237-
<version>7.28.2</version>
237+
<version>7.30.0</version>
238238
<type>pom</type>
239239
<scope>import</scope>
240240
</dependency>
241241

242242
<dependency>
243243
<groupId>org.junit</groupId>
244244
<artifactId>junit-bom</artifactId>
245-
<version>5.13.4</version>
245+
<version>6.0.0</version>
246246
<type>pom</type>
247247
<scope>import</scope>
248248
</dependency>
@@ -291,7 +291,7 @@
291291

292292
<plugin>
293293
<artifactId>maven-compiler-plugin</artifactId>
294-
<version>3.14.0</version>
294+
<version>3.14.1</version>
295295
</plugin>
296296

297297
<plugin>
@@ -348,22 +348,25 @@
348348
</activation>
349349
<build>
350350
<plugins>
351-
<!--<plugin>
351+
<plugin>
352352
<groupId>com.vmlens</groupId>
353353
<artifactId>vmlens-maven-plugin</artifactId>
354-
<version>1.2.14</version>
354+
<version>1.2.16</version>
355355
<executions>
356356
<execution>
357357
<id>test</id>
358358
<goals>
359359
<goal>test</goal>
360360
</goals>
361361
<configuration>
362+
<includes>
363+
<include>**/*CT.java</include>
364+
</includes>
362365
<failIfNoTests>true</failIfNoTests>
363366
</configuration>
364367
</execution>
365368
</executions>
366-
</plugin>-->
369+
</plugin>
367370
<plugin>
368371
<artifactId>maven-dependency-plugin</artifactId>
369372
<version>3.8.1</version>
@@ -501,7 +504,7 @@
501504
<dependency>
502505
<groupId>com.puppycrawl.tools</groupId>
503506
<artifactId>checkstyle</artifactId>
504-
<version>11.0.1</version>
507+
<version>11.1.0</version>
505508
</dependency>
506509
</dependencies>
507510
<executions>
@@ -517,7 +520,7 @@
517520
<plugin>
518521
<groupId>com.diffplug.spotless</groupId>
519522
<artifactId>spotless-maven-plugin</artifactId>
520-
<version>2.46.1</version>
523+
<version>3.0.0</version>
521524
<configuration>
522525
<!-- optional: limit format enforcement to just the files changed by this feature branch -->
523526
<!-- <ratchetFrom>origin/main</ratchetFrom>-->
@@ -580,7 +583,7 @@
580583
<plugin>
581584
<groupId>org.apache.maven.plugins</groupId>
582585
<artifactId>maven-javadoc-plugin</artifactId>
583-
<version>3.11.3</version>
586+
<version>3.12.0</version>
584587
<configuration>
585588
<failOnWarnings>true</failOnWarnings>
586589
<doclint>all,-missing
@@ -611,7 +614,7 @@
611614
<plugin>
612615
<groupId>org.sonatype.central</groupId>
613616
<artifactId>central-publishing-maven-plugin</artifactId>
614-
<version>0.8.0</version>
617+
<version>0.9.0</version>
615618
<extensions>true</extensions>
616619
<configuration>
617620
<publishingServerId>central</publishingServerId>
@@ -665,7 +668,7 @@
665668
<plugin>
666669
<groupId>org.codehaus.mojo</groupId>
667670
<artifactId>exec-maven-plugin</artifactId>
668-
<version>3.5.1</version>
671+
<version>3.6.0</version>
669672
<executions>
670673
<execution>
671674
<id>update-test-harness-submodule</id>
@@ -743,7 +746,7 @@
743746
<plugin>
744747
<groupId>org.apache.maven.plugins</groupId>
745748
<artifactId>maven-compiler-plugin</artifactId>
746-
<version>3.14.0</version>
749+
<version>3.14.1</version>
747750
<executions>
748751
<execution>
749752
<id>default-testCompile</id>

‎src/test/java/dev/openfeature/sdk/e2e/steps/ProviderSteps.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import io.cucumber.java.en.Given;
2727
import io.cucumber.java.en.Then;
2828
import java.util.Map;
29-
import org.awaitility.Awaitility;
3029

3130
public class ProviderSteps {
3231
private final State state;
@@ -113,19 +112,15 @@ private void setupMockProvider(ErrorCode errorCode, String errorMessage, Provide
113112
switch (providerState) {
114113
case FATAL:
115114
case ERROR:
116-
mockProvider.emitProviderReady(details);
117-
mockProvider.emitProviderError(details);
115+
mockProvider.emitProviderReady(details).await();
116+
mockProvider.emitProviderError(details).await();
118117
break;
119118
case STALE:
120-
mockProvider.emitProviderReady(details);
121-
mockProvider.emitProviderStale(details);
119+
mockProvider.emitProviderReady(details).await();
120+
mockProvider.emitProviderStale(details).await();
122121
break;
123122
default:
124123
}
125-
Awaitility.await().until(() -> {
126-
ProviderState providerState1 = client.getProviderState();
127-
return providerState1 == providerState;
128-
});
129124
}
130125

131126
private void configureMockEvaluations(FeatureProvider mockProvider, ErrorCode errorCode, String errorMessage) {

‎src/test/java/dev/openfeature/sdk/vmlens/VmLensTest.java‎ renamed to ‎src/test/java/dev/openfeature/sdk/vmlens/VmLensCT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.junit.jupiter.api.BeforeEach;
1919
import org.junit.jupiter.api.Test;
2020

21-
class VmLensTest {
21+
class VmLensCT {
2222
final OpenFeatureAPI api = OpenFeatureAPITestUtil.createAPI();
2323

2424
@BeforeEach

0 commit comments

Comments
 (0)