Skip to content

Commit ccf58ea

Browse files
authored
Merge branch 'main' into build/release_parent
2 parents 16be385 + 3bf822b commit ccf58ea

File tree

14 files changed

+40
-31
lines changed

14 files changed

+40
-31
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
build:
1717
- java: 21
1818
profile: codequality
19-
- java: 8
20-
profile: java8
19+
- java: 11
20+
profile: java11
2121

2222
name: with Java ${{ matrix.build.java }}
2323
runs-on: ${{ matrix.os}}
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2727

2828
- name: Set up JDK ${{ matrix.build.java }}
29-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
29+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
3030
with:
3131
java-version: ${{ matrix.build.java }}
3232
distribution: 'temurin'

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- name: Set up JDK 21
2424
if: ${{ steps.release.outputs.releases_created }}
25-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
25+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
2626
with:
2727
java-version: '21'
2828
distribution: 'temurin'

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[submodule "providers/flagd/test-harness"]
55
path = providers/flagd/test-harness
66
url = https://github.com/open-feature/test-harness.git
7-
branch = v2.7.4
7+
branch = v2.8.0
88
[submodule "providers/flagd/spec"]
99
path = providers/flagd/spec
1010
url = https://github.com/open-feature/spec.git

.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java=8.0.312-tem
1+
java=11.0.26-tem

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
## System Requirements
44

5-
Java 8+ is required for the tooling, plugins, etc. Maven 3.8+ is recommended.
5+
Java 11+ is required for the tooling, plugins, etc. Maven 3.8+ is recommended.
66

77
## Compilation target(s)
88

9-
As in the Java-SDK, we target Java 8. The parent POM configures this automatically.
9+
As in the Java-SDK, we target Java 11. The parent POM configures this automatically.
1010

1111
## Adding a module
1212

pom.xml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,22 @@
6262
</surefireArgLine>
6363
<skip.tests>false</skip.tests>
6464
<!-- this will throw an error if we use APIs not available in the specified version -->
65-
<maven.compiler.release>8</maven.compiler.release>
65+
<maven.compiler.release>11</maven.compiler.release>
6666
</properties>
6767

6868
<dependencyManagement>
6969
<dependencies>
7070
<dependency>
7171
<groupId>org.junit</groupId>
7272
<artifactId>junit-bom</artifactId>
73-
<version>5.12.1</version>
73+
<version>5.12.2</version>
7474
<type>pom</type>
7575
<scope>import</scope>
7676
</dependency>
7777
<dependency>
7878
<groupId>io.cucumber</groupId>
7979
<artifactId>cucumber-bom</artifactId>
80-
<version>7.21.1</version>
80+
<version>7.22.0</version>
8181
<type>pom</type>
8282
<scope>import</scope>
8383
</dependency>
@@ -106,7 +106,7 @@
106106
<dependency>
107107
<groupId>org.projectlombok</groupId>
108108
<artifactId>lombok</artifactId>
109-
<version>1.18.36</version>
109+
<version>1.18.38</version>
110110
<scope>provided</scope>
111111
</dependency>
112112

@@ -292,8 +292,7 @@
292292
</excludePackageNames>
293293
<doclint>all,-missing
294294
</doclint> <!-- ignore missing javadoc, these are enforced with more customizability in the checkstyle plugin -->
295-
296-
<source>8</source>
295+
<legacyMode>true</legacyMode>
297296
</configuration>
298297
<executions>
299298
<execution>
@@ -368,7 +367,7 @@
368367
<plugin>
369368
<groupId>org.apache.maven.plugins</groupId>
370369
<artifactId>maven-surefire-plugin</artifactId>
371-
<version>3.5.2</version>
370+
<version>3.5.3</version>
372371
<configuration>
373372
<excludes>
374373
<!-- tests to exclude -->
@@ -454,7 +453,7 @@
454453
<plugin>
455454
<groupId>com.h3xstream.findsecbugs</groupId>
456455
<artifactId>findsecbugs-plugin</artifactId>
457-
<version>1.13.0</version>
456+
<version>1.14.0</version>
458457
</plugin>
459458
</plugins>
460459
</configuration>
@@ -529,14 +528,14 @@
529528
</build>
530529
</profile>
531530

532-
<!-- profile for running tests under java 8 (used mostly in CI) -->
531+
<!-- profile for running tests under java 11 (used mostly in CI) -->
533532
<!-- selected automatically by JDK activeation (see https://maven.apache.org/guides/introduction/introduction-to-profiles.html#implicit-profile-activation) -->
534533
<profile>
535-
<id>java8</id>
536-
<!-- with the next block we can define a set of artifacts which still support java 8, if any of the artifacts is not supporting java 8 anymore -->
534+
<id>java11</id>
535+
<!-- with the next block we can define a set of artifacts which still support java 11, if any of the artifacts is not supporting java 11 anymore -->
537536
<!--<modules><module></module></modules>-->
538537
<properties>
539-
<toolchain.jdk.version>(1.8,9)</toolchain.jdk.version>
538+
<toolchain.jdk.version>[11,)</toolchain.jdk.version>
540539
<skip.tests>true</skip.tests>
541540
</properties>
542541

@@ -557,7 +556,7 @@
557556
<plugin>
558557
<groupId>org.apache.maven.plugins</groupId>
559558
<artifactId>maven-surefire-plugin</artifactId>
560-
<version>3.5.2</version>
559+
<version>3.5.3</version>
561560
<configuration>
562561
<skipTests>${skip.tests}</skipTests>
563562
</configuration>

providers/flagd/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<dependency>
112112
<groupId>org.apache.commons</groupId>
113113
<artifactId>commons-collections4</artifactId>
114-
<version>4.4</version>
114+
<version>4.5.0</version>
115115
</dependency>
116116

117117
<dependency>
@@ -141,19 +141,19 @@
141141
<dependency>
142142
<groupId>org.junit.jupiter</groupId>
143143
<artifactId>junit-jupiter</artifactId>
144-
<version>5.12.1</version>
144+
<version>5.12.2</version>
145145
<scope>test</scope>
146146
</dependency>
147147
<dependency>
148148
<groupId>org.testcontainers</groupId>
149149
<artifactId>testcontainers</artifactId>
150-
<version>1.20.6</version>
150+
<version>1.21.0</version>
151151
<scope>test</scope>
152152
</dependency>
153153
<dependency>
154154
<groupId>org.testcontainers</groupId>
155155
<artifactId>junit-jupiter</artifactId>
156-
<version>1.20.6</version>
156+
<version>1.21.0</version>
157157
<scope>test</scope>
158158
</dependency>
159159
<dependency>

providers/flagd/schemas

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ private void onProviderEvent(FlagdProviderEvent flagdProviderEvent) {
210210
onConfigurationChanged(flagdProviderEvent);
211211
break;
212212
}
213-
// intentional fall through
213+
// intentional fall through
214214
case PROVIDER_READY:
215215
/*
216216
* Sync metadata is used to enrich the context, and is immutable in flagd,

0 commit comments

Comments
 (0)