Skip to content

Commit c87e035

Browse files
thomasm-ttdthomasm-ttd
authored
Merge pull request #319 from IABTechLab/tjm-UID2-3828-update-Java-21
Updating Shared to Java 21
2 parents 19edb01 + 36c7282 commit c87e035

File tree

3 files changed

+43
-28
lines changed

3 files changed

+43
-28
lines changed

‎.github/workflows/build-and-publish.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ on:
2020
- CRITICAL (DO NOT use if JIRA ticket not raised)
2121
publish_to_maven:
2222
description: 'True to publish the artifacts to Maven repository, false to skip the step'
23-
default: false
23+
default: true
2424
required: false
2525
type: boolean
2626
java_version:
2727
type: string
28-
default: '11'
28+
default: '21'
2929
publish_vulnerabilities:
3030
type: string
3131
default: 'true'

‎.github/workflows/build-and-test.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ on: [pull_request, push, workflow_dispatch]
44
jobs:
55
build:
66
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v2
7+
with:
8+
java_version: "21"
79
secrets: inherit

‎pom.xml‎

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
54
<modelVersion>4.0.0</modelVersion>
65

76
<groupId>com.uid2</groupId>
87
<artifactId>uid2-shared</artifactId>
9-
<version>7.17.0</version>
8+
<version>7.17.3-alpha-146-SNAPSHOT</version>
109
<name>${project.groupId}:${project.artifactId}</name>
1110
<description>Library for all the shared uid2 operations</description>
1211
<url>https://github.com/IABTechLab/uid2docs</url>
@@ -37,8 +36,17 @@
3736
<repository>
3837
<id>snapshots-repo</id>
3938
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
40-
<releases><enabled>false</enabled></releases>
41-
<snapshots><enabled>true</enabled></snapshots>
39+
<releases>
40+
<enabled>false</enabled>
41+
</releases>
42+
<snapshots>
43+
<enabled>true</enabled>
44+
</snapshots>
45+
</repository>
46+
<repository>
47+
<id>maven_central</id>
48+
<name>Maven Central</name>
49+
<url>https://repo.maven.apache.org/maven2/</url>
4250
</repository>
4351
</repositories>
4452
<distributionManagement>
@@ -67,7 +75,7 @@
6775
<dependency>
6876
<groupId>software.amazon.awssdk</groupId>
6977
<artifactId>bom</artifactId>
70-
<version>2.20.69</version>
78+
<version>2.27.2</version>
7179
<type>pom</type>
7280
<scope>import</scope>
7381
</dependency>
@@ -78,14 +86,21 @@
7886
<type>pom</type>
7987
<scope>import</scope>
8088
</dependency>
89+
<dependency>
90+
<groupId>com.azure</groupId>
91+
<artifactId>azure-sdk-bom</artifactId>
92+
<version>1.2.26</version>
93+
<type>pom</type>
94+
<scope>import</scope>
95+
</dependency>
8196
</dependencies>
8297
</dependencyManagement>
8398

8499
<dependencies>
85100
<dependency>
86101
<groupId>com.uid2</groupId>
87102
<artifactId>uid2-attestation-api</artifactId>
88-
<version>2.0.0-f968aec0e3</version>
103+
<version>2.1.6</version>
89104
</dependency>
90105
<dependency>
91106
<groupId>io.vertx</groupId>
@@ -131,17 +146,17 @@
131146
<dependency>
132147
<groupId>ch.qos.logback</groupId>
133148
<artifactId>logback-classic</artifactId>
134-
<version>1.3.12</version>
149+
<version>1.5.6</version>
135150
</dependency>
136151
<dependency>
137152
<groupId>com.github.loki4j</groupId>
138153
<artifactId>loki-logback-appender</artifactId>
139-
<version>1.2.0</version>
154+
<version>1.5.1</version>
140155
</dependency>
141156
<dependency>
142157
<groupId>com.github.ben-manes.caffeine</groupId>
143158
<artifactId>caffeine</artifactId>
144-
<version>3.1.7</version>
159+
<version>3.1.8</version>
145160
</dependency>
146161
<dependency>
147162
<groupId>org.hashids</groupId>
@@ -151,17 +166,17 @@
151166
<dependency>
152167
<groupId>com.amazonaws</groupId>
153168
<artifactId>aws-java-sdk-s3</artifactId>
154-
<version>1.12.701</version>
169+
<version>1.12.765</version>
155170
</dependency>
156-
<dependency> <!--Needs to be on classpath for roles to work-->
171+
<dependency> <!--Needs to be on classpath for roles to work-->
157172
<groupId>com.amazonaws</groupId>
158173
<artifactId>aws-java-sdk-sts</artifactId>
159-
<version>1.12.364</version>
174+
<version>1.12.765</version>
160175
</dependency>
161176
<dependency>
162177
<groupId>com.google.api-client</groupId>
163178
<artifactId>google-api-client</artifactId>
164-
<version>2.1.1</version>
179+
<version>2.6.0</version>
165180
</dependency>
166181
<dependency>
167182
<groupId>com.google.apis</groupId>
@@ -171,7 +186,7 @@
171186
<dependency>
172187
<groupId>com.google.auth</groupId>
173188
<artifactId>google-auth-library-oauth2-http</artifactId>
174-
<version>1.14.0</version>
189+
<version>1.23.0</version>
175190
</dependency>
176191
<dependency>
177192
<groupId>com.google.cloud</groupId>
@@ -180,12 +195,10 @@
180195
<dependency>
181196
<groupId>com.azure</groupId>
182197
<artifactId>azure-security-attestation</artifactId>
183-
<version>1.1.15</version>
184198
</dependency>
185199
<dependency>
186200
<groupId>com.azure</groupId>
187201
<artifactId>azure-core-http-netty</artifactId>
188-
<version>1.13.11</version>
189202
</dependency>
190203
<dependency>
191204
<groupId>co.nstant.in</groupId>
@@ -195,12 +208,12 @@
195208
<dependency>
196209
<groupId>com.fasterxml.jackson.core</groupId>
197210
<artifactId>jackson-databind</artifactId>
198-
<version>2.12.7.1</version>
211+
<version>2.14.2</version>
199212
</dependency>
200213
<dependency>
201214
<groupId>org.projectlombok</groupId>
202215
<artifactId>lombok</artifactId>
203-
<version>1.18.30</version>
216+
<version>1.18.34</version>
204217
</dependency>
205218
<dependency>
206219
<groupId>org.apache.commons</groupId>
@@ -239,20 +252,20 @@
239252
</dependency>
240253
<dependency>
241254
<groupId>org.mockito</groupId>
242-
<artifactId>mockito-inline</artifactId>
243-
<version>5.2.0</version>
255+
<artifactId>mockito-core</artifactId>
256+
<version>5.12.0</version>
244257
<scope>test</scope>
245258
</dependency>
246259
<dependency>
247260
<groupId>org.mockito</groupId>
248261
<artifactId>mockito-junit-jupiter</artifactId>
249-
<version>5.10.0</version>
262+
<version>5.12.0</version>
250263
<scope>test</scope>
251264
</dependency>
252265
<dependency>
253266
<groupId>org.assertj</groupId>
254267
<artifactId>assertj-core</artifactId>
255-
<version>3.25.2</version>
268+
<version>3.26.3</version>
256269
<scope>test</scope>
257270
</dependency>
258271
</dependencies>
@@ -264,8 +277,8 @@
264277
<artifactId>maven-compiler-plugin</artifactId>
265278
<version>3.8.0</version>
266279
<configuration>
267-
<source>11</source>
268-
<target>11</target>
280+
<source>21</source>
281+
<target>21</target>
269282
</configuration>
270283
</plugin>
271284
<plugin>
@@ -343,7 +356,7 @@
343356
<plugin>
344357
<groupId>org.jacoco</groupId>
345358
<artifactId>jacoco-maven-plugin</artifactId>
346-
<version>0.8.8</version>
359+
<version>0.8.12</version>
347360
<executions>
348361
<execution>
349362
<goals>

0 commit comments

Comments
 (0)