Skip to content

Commit a4e5928

Browse files
beeme1mrbeeme1mr
authored
Merge branch 'main' into add-provider-id
2 parents 7e47525 + 31b1ebc commit a4e5928

File tree

5 files changed

+40
-50
lines changed

5 files changed

+40
-50
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
os: [ubuntu-latest]
1616
build:
17-
- java: 17
17+
- java: 21
1818
profile: codequality
1919
- java: 8
2020
profile: java8

‎.github/workflows/release-please.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
if: ${{ steps.release.outputs.releases_created }}
2020
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2121

22-
- name: Set up JDK 17
22+
- name: Set up JDK 21
2323
if: ${{ steps.release.outputs.releases_created }}
2424
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
2525
with:
26-
java-version: '17'
26+
java-version: '21'
2727
distribution: 'temurin'
2828
cache: maven
2929
server-id: ossrh

‎pom.xml‎

Lines changed: 33 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,10 @@
4949
</scm>
5050

5151
<properties>
52-
<toolchain.jdk.version>[17,)</toolchain.jdk.version>
53-
<junit.jupiter.version>5.11.4</junit.jupiter.version>
52+
<toolchain.jdk.version>[21,)</toolchain.jdk.version>
5453
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5554
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5655
<module-name>${groupId}.${artifactId}</module-name>
57-
<io.cucumber.version>7.21.1</io.cucumber.version>
58-
<org.mockito.version>5.2.0</org.mockito.version>
5956
<javadoc.failOnWarnings>true</javadoc.failOnWarnings>
6057
<!-- This is required for later correct replacement of surefireArgLine -->
6158
<!-- see surefire-java8 and surefire-java9+ profiles -->
@@ -65,9 +62,35 @@
6562
</surefireArgLine>
6663
<skip.tests>false</skip.tests>
6764
<!-- this will throw an error if we use APIs not available in the specified version -->
68-
<maven.compiler.release>8</maven.compiler.release>
65+
<maven.compiler.release>8</maven.compiler.release>
6966
</properties>
7067

68+
<dependencyManagement>
69+
<dependencies>
70+
<dependency>
71+
<groupId>org.junit</groupId>
72+
<artifactId>junit-bom</artifactId>
73+
<version>5.12.0</version>
74+
<type>pom</type>
75+
<scope>import</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>io.cucumber</groupId>
79+
<artifactId>cucumber-bom</artifactId>
80+
<version>7.21.1</version>
81+
<type>pom</type>
82+
<scope>import</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.mockito</groupId>
86+
<artifactId>mockito-bom</artifactId>
87+
<version>5.15.2</version>
88+
<type>pom</type>
89+
<scope>import</scope>
90+
</dependency>
91+
</dependencies>
92+
</dependencyManagement>
93+
7194
<dependencies>
7295
<dependency>
7396
<!-- provided -->
@@ -101,27 +124,8 @@
101124
<dependency>
102125
<groupId>org.mockito</groupId>
103126
<artifactId>mockito-core</artifactId>
104-
<version>${org.mockito.version}</version>
105-
<scope>test</scope>
106-
</dependency>
107-
108-
<!-- Start mockito workaround -->
109-
<!-- https://github.com/mockito/mockito/issues/3121 -->
110-
<!-- These are transitive dependencies of mockito we are forcing -->
111-
<dependency>
112-
<groupId>net.bytebuddy</groupId>
113-
<artifactId>byte-buddy</artifactId>
114-
<version>1.17.2</version>
115-
<scope>test</scope>
116-
</dependency>
117-
118-
<dependency>
119-
<groupId>net.bytebuddy</groupId>
120-
<artifactId>byte-buddy-agent</artifactId>
121-
<version>1.17.2</version>
122127
<scope>test</scope>
123128
</dependency>
124-
<!-- End mockito workaround-->
125129

126130
<dependency>
127131
<groupId>uk.org.lidalia</groupId>
@@ -140,35 +144,30 @@
140144
<dependency>
141145
<groupId>org.junit.jupiter</groupId>
142146
<artifactId>junit-jupiter</artifactId>
143-
<version>${junit.jupiter.version}</version>
144147
<scope>test</scope>
145148
</dependency>
146149

147150
<dependency>
148151
<groupId>org.junit.jupiter</groupId>
149152
<artifactId>junit-jupiter-engine</artifactId>
150-
<version>${junit.jupiter.version}</version>
151153
<scope>test</scope>
152154
</dependency>
153155

154156
<dependency>
155157
<groupId>org.junit.jupiter</groupId>
156158
<artifactId>junit-jupiter-api</artifactId>
157-
<version>${junit.jupiter.version}</version>
158159
<scope>test</scope>
159160
</dependency>
160161

161162
<dependency>
162163
<groupId>org.junit.jupiter</groupId>
163164
<artifactId>junit-jupiter-params</artifactId>
164-
<version>${junit.jupiter.version}</version>
165165
<scope>test</scope>
166166
</dependency>
167167

168168
<dependency>
169169
<groupId>org.junit.platform</groupId>
170170
<artifactId>junit-platform-suite</artifactId>
171-
<version>1.11.4</version>
172171
<scope>test</scope>
173172
</dependency>
174173

@@ -182,35 +181,24 @@
182181
<dependency>
183182
<groupId>org.mockito</groupId>
184183
<artifactId>mockito-junit-jupiter</artifactId>
185-
<version>5.15.2</version>
186-
<scope>test</scope>
187-
</dependency>
188-
189-
<dependency>
190-
<groupId>org.mockito</groupId>
191-
<artifactId>mockito-inline</artifactId>
192-
<version>${org.mockito.version}</version>
193184
<scope>test</scope>
194185
</dependency>
195186

196187
<dependency>
197188
<groupId>io.cucumber</groupId>
198189
<artifactId>cucumber-java</artifactId>
199-
<version>${io.cucumber.version}</version>
200190
<scope>test</scope>
201191
</dependency>
202192

203193
<dependency>
204194
<groupId>io.cucumber</groupId>
205195
<artifactId>cucumber-junit-platform-engine</artifactId>
206-
<version>${io.cucumber.version}</version>
207196
<scope>test</scope>
208197
</dependency>
209198

210199
<dependency>
211200
<groupId>io.cucumber</groupId>
212201
<artifactId>cucumber-picocontainer</artifactId>
213-
<version>${io.cucumber.version}</version>
214202
<scope>test</scope>
215203
</dependency>
216204

@@ -401,6 +389,9 @@
401389
<activation>
402390
<activeByDefault>true</activeByDefault>
403391
</activation>
392+
<properties>
393+
<maven.compiler.proc>full</maven.compiler.proc>
394+
</properties>
404395
<build>
405396
<plugins>
406397
<!-- CODE QUALITY TOOLS -->
@@ -420,7 +411,7 @@
420411
<dependency>
421412
<groupId>com.puppycrawl.tools</groupId>
422413
<artifactId>checkstyle</artifactId>
423-
<version>10.21.3</version>
414+
<version>10.21.4</version>
424415
</dependency>
425416
</dependencies>
426417
<executions>
@@ -456,7 +447,7 @@
456447
<plugin>
457448
<groupId>com.github.spotbugs</groupId>
458449
<artifactId>spotbugs-maven-plugin</artifactId>
459-
<version>4.9.1.0</version>
450+
<version>4.9.2.0</version>
460451
<configuration>
461452
<excludeFilterFile>spotbugs-exclusions.xml</excludeFilterFile>
462453
<plugins>

‎providers/flagd/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,19 +141,19 @@
141141
<dependency>
142142
<groupId>org.junit.jupiter</groupId>
143143
<artifactId>junit-jupiter</artifactId>
144-
<version>5.11.4</version>
144+
<version>5.12.0</version>
145145
<scope>test</scope>
146146
</dependency>
147147
<dependency>
148148
<groupId>org.testcontainers</groupId>
149149
<artifactId>testcontainers</artifactId>
150-
<version>1.20.5</version>
150+
<version>1.20.6</version>
151151
<scope>test</scope>
152152
</dependency>
153153
<dependency>
154154
<groupId>org.testcontainers</groupId>
155155
<artifactId>junit-jupiter</artifactId>
156-
<version>1.20.5</version>
156+
<version>1.20.6</version>
157157
<scope>test</scope>
158158
</dependency>
159159
<dependency>
@@ -278,7 +278,7 @@
278278
<plugin>
279279
<groupId>com.github.spotbugs</groupId>
280280
<artifactId>spotbugs-maven-plugin</artifactId>
281-
<version>4.9.1.0</version>
281+
<version>4.9.2.0</version>
282282
<configuration>
283283
<onlyAnalyze>dev.openfeature.contrib.-</onlyAnalyze>
284284
</configuration>

‎tools/junit-openfeature/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<dependency>
3636
<groupId>org.junit.jupiter</groupId>
3737
<artifactId>junit-jupiter-api</artifactId>
38-
<version>${junit.jupiter.version}</version>
3938
</dependency>
4039

4140
<dependency>

0 commit comments

Comments
 (0)