Merge branch 'main' into 1580_create_daemon_threads

Signed-off-by: jarebudev <23311805+jarebudev@users.noreply.github.com>

Author: jarebudev

.github/workflows/merge.yml

@@ -21,12 +21,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@71cf2267d89c5cb81562390fa70a37fa40b1305e
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
       with:
         fetch-depth: 0
         submodules: recursive
     - name: Set up JDK 17
-      uses: actions/setup-java@de5a937a1dc73fbc1a67d7d1aa4bebc1082f3190
+      uses: actions/setup-java@46c56d6f92c88cf540acf95a12a4a41197499222
       with:
         java-version: '17'
         distribution: 'temurin'

.github/workflows/pullrequest.yml

@@ -19,20 +19,20 @@ jobs:
     runs-on: ${{ matrix.os}}
     steps:
       - name: Check out the code
-        uses: actions/checkout@71cf2267d89c5cb81562390fa70a37fa40b1305e
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           fetch-depth: 0
           submodules: recursive
 
       - name: Set up JDK ${{ matrix.build.java }}
-        uses: actions/setup-java@de5a937a1dc73fbc1a67d7d1aa4bebc1082f3190
+        uses: actions/setup-java@46c56d6f92c88cf540acf95a12a4a41197499222
         with:
             java-version: ${{ matrix.build.java }}
             distribution: 'temurin'
             cache: maven
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1d9f357d018e5801d9d25e32220badc298aa1c17
+        uses: github/codeql-action/init@ce729e4d353d580e6cacd6a8cf2921b72e5e310a
         with:
           languages: java
 
@@ -58,4 +58,4 @@ jobs:
           verbose: true # optional (default = false)
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1d9f357d018e5801d9d25e32220badc298aa1c17
+        uses: github/codeql-action/analyze@ce729e4d353d580e6cacd6a8cf2921b72e5e310a

.github/workflows/release.yml

@@ -37,13 +37,13 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@71cf2267d89c5cb81562390fa70a37fa40b1305e
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           fetch-depth: 0
           submodules: recursive
 
       - name: Set up JDK 17
-        uses: actions/setup-java@de5a937a1dc73fbc1a67d7d1aa4bebc1082f3190
+        uses: actions/setup-java@46c56d6f92c88cf540acf95a12a4a41197499222
         with:
           java-version: '17'
           distribution: 'temurin'

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

@@ -29,16 +29,16 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@71cf2267d89c5cb81562390fa70a37fa40b1305e
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1d9f357d018e5801d9d25e32220badc298aa1c17
+        uses: github/codeql-action/init@ce729e4d353d580e6cacd6a8cf2921b72e5e310a
         with:
           languages: java
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@1d9f357d018e5801d9d25e32220badc298aa1c17
+        uses: github/codeql-action/autobuild@ce729e4d353d580e6cacd6a8cf2921b72e5e310a
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1d9f357d018e5801d9d25e32220badc298aa1c17
+        uses: github/codeql-action/analyze@ce729e4d353d580e6cacd6a8cf2921b72e5e310a

.gitignore

@@ -10,6 +10,7 @@ target
 
 # vscode stuff - we may want to use a more specific pattern later if we'd like to suggest editor configurations
 .vscode/
+.cursor
 
 # used for spec compliance tooling
 java-report.json

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright OpenFeature Maintainers
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

pom.xml

@@ -20,6 +20,8 @@
         <skip.tests>false</skip.tests>
         <!-- this will throw an error if we use wrong apis -->
         <maven.compiler.release>11</maven.compiler.release>
+        <org.mockito.jar>${settings.localRepository}/org/mockito/mockito-core/${org.mockito.version}/mockito-core-${org.mockito.version}.jar</org.mockito.jar>
+        <org.mockito.agent.argline>-javaagent:${org.mockito.jar}</org.mockito.agent.argline>
     </properties>
 
     <name>OpenFeature Java SDK</name>
@@ -212,14 +214,14 @@
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy</artifactId>
-                <version>1.18.0</version>
+                <version>1.18.1</version>
                 <scope>test</scope>
             </dependency>
 
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy-agent</artifactId>
-                <version>1.18.0</version>
+                <version>1.18.1</version>
                 <scope>test</scope>
             </dependency>
             <!-- End mockito workaround-->
@@ -300,10 +302,9 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.5.4</version>
                 <configuration>
-                    <forkCount>1</forkCount>
-                    <reuseForks>false</reuseForks>
                     <argLine>
                         ${surefireArgLine}
+                        ${org.mockito.agent.argline}
                         --add-opens java.base/java.util=ALL-UNNAMED
                         --add-opens java.base/java.lang=ALL-UNNAMED
                     </argLine>
@@ -321,6 +322,7 @@
                 <configuration>
                     <argLine>
                         ${surefireArgLine}
+                        ${org.mockito.agent.argline}
                     </argLine>
                 </configuration>
             </plugin>
@@ -329,7 +331,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.2</version>
+                <version>3.5.0</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -364,6 +366,7 @@
 						                <include>**/*CT.java</include>
 					                </includes>
                                     <failIfNoTests>true</failIfNoTests>
+                                    <argLine>${org.mockito.agent.argline}</argLine>
                                 </configuration>
                             </execution>
                         </executions>
@@ -505,7 +508,7 @@
                             <dependency>
                                 <groupId>com.puppycrawl.tools</groupId>
                                 <artifactId>checkstyle</artifactId>
-                                <version>12.1.1</version>
+                                <version>12.1.2</version>
                             </dependency>
                         </dependencies>
                         <executions>
@@ -521,7 +524,7 @@
                     <plugin>
                         <groupId>com.diffplug.spotless</groupId>
                         <artifactId>spotless-maven-plugin</artifactId>
-                        <version>3.0.0</version>
+                        <version>3.1.0</version>
                         <configuration>
                             <!-- optional: limit format enforcement to just the files changed by this feature branch -->
                             <!--                <ratchetFrom>origin/main</ratchetFrom>-->
@@ -740,6 +743,7 @@
                         <version>3.5.4</version>
                         <configuration>
                             <argLine>
+                                ${org.mockito.agent.argline}
                                 ${surefireArgLine}
                             </argLine>
                         </configuration>