From 470b744776b1dbf04449b368462c7ac8fd410998 Mon Sep 17 00:00:00 2001 From: jarebudev <23311805+jarebudev@users.noreply.github.com> Date: Wed, 26 Mar 2025 21:45:15 +0000 Subject: [PATCH 1/6] bumped to java 11, altered CI to target java 11 Signed-off-by: jarebudev <23311805+jarebudev@users.noreply.github.com> --- .github/workflows/pullrequest.yml | 4 ++-- README.md | 2 +- pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 4409f152..8d202a6e 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -13,7 +13,7 @@ jobs: build: - java: 17 profile: codequality - - java: 8 + - java: 11 profile: java8 name: with Java ${{ matrix.build.java }} runs-on: ${{ matrix.os}} @@ -21,7 +21,7 @@ jobs: - name: Check out the code uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@b8ebb8ba1d9655f7f159c0a8b8135606ae11b5c9 with: java-version: ${{ matrix.build.java }} diff --git a/README.md b/README.md index 49d5562e..5dbe0f68 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ ### Requirements -- Java 8+ (compiler target is 1.8) +- Java 11+ (compiler target is 11) Note that this library is intended to be used in server-side contexts and has not been evaluated for use on mobile devices. diff --git a/pom.xml b/pom.xml index 1ab82f46..5c938e29 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ [17,) UTF-8 - 1.8 + 11 ${maven.compiler.source} 5.12.1 7.21.1 @@ -20,7 +20,7 @@ ${project.groupId}.${project.artifactId} false - 8 + 11 OpenFeature Java SDK From 4b3d5a11327b54a8c0a10cb3d1e428e959f7e7f6 Mon Sep 17 00:00:00 2001 From: jarebudev <23311805+jarebudev@users.noreply.github.com> Date: Wed, 26 Mar 2025 22:22:19 +0000 Subject: [PATCH 2/6] changed profile and toolchain Signed-off-by: jarebudev <23311805+jarebudev@users.noreply.github.com> --- .github/workflows/pullrequest.yml | 2 +- pom.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index c14593a9..334d7323 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -14,7 +14,7 @@ jobs: - java: 17 profile: codequality - java: 11 - profile: java8 + profile: java11 name: with Java ${{ matrix.build.java }} runs-on: ${{ matrix.os}} steps: diff --git a/pom.xml b/pom.xml index 87013352..5dec0be8 100644 --- a/pom.xml +++ b/pom.xml @@ -646,14 +646,14 @@ - - + + - java8 + java11 - (1.8,9) + (11) true From 53fbb2cc4ad7eecdb0713622ff05b771b23c2266 Mon Sep 17 00:00:00 2001 From: jarebudev <23311805+jarebudev@users.noreply.github.com> Date: Wed, 26 Mar 2025 22:33:23 +0000 Subject: [PATCH 3/6] corrected toolchain version Signed-off-by: jarebudev <23311805+jarebudev@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5dec0be8..382f2508 100644 --- a/pom.xml +++ b/pom.xml @@ -653,7 +653,7 @@ - (11) + [11,) true From 638dfd19a57dd49fe9a6ab0f54b1e28d291f5c62 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 01:31:00 +0000 Subject: [PATCH 4/6] chore(deps): update github/codeql-action digest to d26c46a (#1413) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/pullrequest.yml | 4 ++-- .github/workflows/static-code-scanning.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index ef352c00..9144328c 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -30,7 +30,7 @@ jobs: cache: maven - name: Initialize CodeQL - uses: github/codeql-action/init@362ef4ce205154842cd1d34794abd82bb8f12cd5 + uses: github/codeql-action/init@d26c46acea4065b13fc57703621e0a7c8b9e836b with: languages: java @@ -56,4 +56,4 @@ jobs: verbose: true # optional (default = false) - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@362ef4ce205154842cd1d34794abd82bb8f12cd5 + uses: github/codeql-action/analyze@d26c46acea4065b13fc57703621e0a7c8b9e836b diff --git a/.github/workflows/static-code-scanning.yaml b/.github/workflows/static-code-scanning.yaml index 8e161d75..654d3fff 100644 --- a/.github/workflows/static-code-scanning.yaml +++ b/.github/workflows/static-code-scanning.yaml @@ -33,12 +33,12 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@362ef4ce205154842cd1d34794abd82bb8f12cd5 + uses: github/codeql-action/init@d26c46acea4065b13fc57703621e0a7c8b9e836b with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@362ef4ce205154842cd1d34794abd82bb8f12cd5 + uses: github/codeql-action/autobuild@d26c46acea4065b13fc57703621e0a7c8b9e836b - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@362ef4ce205154842cd1d34794abd82bb8f12cd5 + uses: github/codeql-action/analyze@d26c46acea4065b13fc57703621e0a7c8b9e836b From d65a154510b505df375928ecf2549ac6eb6286fe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 06:34:39 +0000 Subject: [PATCH 5/6] chore(deps): update dependency com.diffplug.spotless:spotless-maven-plugin to v2.44.4 (#1414) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 51637f0e..8c353c6d 100644 --- a/pom.xml +++ b/pom.xml @@ -473,7 +473,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.44.3 + 2.44.4 From 200252bf6a9360a3fe5ae1f6f0bc9c1674f46939 Mon Sep 17 00:00:00 2001 From: Simon Schrottner Date: Wed, 9 Apr 2025 12:54:34 +0200 Subject: [PATCH 6/6] fixup: adding module-info Signed-off-by: Simon Schrottner --- pom.xml | 12 +++++++++++- spotbugs-exclusions.xml | 7 ++++++- .../openfeature/sdk/hooks/logging/LoggingHook.java | 3 --- src/main/java/module-info.java | 10 ++++++++++ 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 src/main/java/module-info.java diff --git a/pom.xml b/pom.xml index 8c353c6d..7a7c0c67 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ false 11 + 1.18.38 OpenFeature Java SDK @@ -54,7 +55,7 @@ org.projectlombok lombok - 1.18.38 + ${lombok.version} provided @@ -263,6 +264,15 @@ maven-compiler-plugin 3.14.0 + + + + org.projectlombok + lombok + ${lombok.version} + + + diff --git a/spotbugs-exclusions.xml b/spotbugs-exclusions.xml index 66032ad0..5988a3a4 100644 --- a/spotbugs-exclusions.xml +++ b/spotbugs-exclusions.xml @@ -46,6 +46,11 @@ + + we can ignore return values of chainables (builders) here + + + @@ -58,4 +63,4 @@ - \ No newline at end of file + diff --git a/src/main/java/dev/openfeature/sdk/hooks/logging/LoggingHook.java b/src/main/java/dev/openfeature/sdk/hooks/logging/LoggingHook.java index 7465aa77..e6dc9b50 100644 --- a/src/main/java/dev/openfeature/sdk/hooks/logging/LoggingHook.java +++ b/src/main/java/dev/openfeature/sdk/hooks/logging/LoggingHook.java @@ -17,9 +17,6 @@ * Flag evaluation data is logged at debug and error in before/after stages and error stages, respectively. */ @Slf4j -@edu.umd.cs.findbugs.annotations.SuppressFBWarnings( - value = "RV_RETURN_VALUE_IGNORED", - justification = "we can ignore return values of chainables (builders) here") public class LoggingHook implements Hook { static final String DOMAIN_KEY = "domain"; diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 00000000..0079cba0 --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,10 @@ +module dev.openfeature.sdk { + requires static lombok; + requires org.slf4j; + requires com.github.spotbugs.annotations; + + exports dev.openfeature.sdk; + exports dev.openfeature.sdk.exceptions; + exports dev.openfeature.sdk.hooks.logging; + exports dev.openfeature.sdk.providers.memory; +}