Skip to content

Commit 65fb3b1

Browse files
jeanpierrefortunejeanpierrefortune
authored
feat: update Keyple BOM version to 2025.11.21 (#36)
1 parent 7791a38 commit 65fb3b1

45 files changed

Lines changed: 138 additions & 122 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
55

66
## [Unreleased]
77

8+
### Upgraded
9+
- Upgraded [Keyple Java BOM](https://github.com/eclipse-keyple/keyple-java-bom) to `2025.11.21`.
10+
811
## [2025-10-29]
912
### Changed
1013
- Switched to [Keyple Java BOM](https://github.com/eclipse-keyple/keyple-java-bom) `2025.10.24` for dependency

‎Example_Card_Calypso/build.gradle.kts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plugins {
1919
dependencies {
2020
// Begin Keyple configuration (generated by
2121
// 'https://keyple.org/components/overview/configuration-wizard/')
22-
implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.10.24"))
22+
implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.11.21"))
2323
implementation("org.eclipse.keypop:keypop-reader-java-api")
2424
implementation("org.eclipse.keypop:keypop-calypso-card-java-api")
2525
implementation("org.eclipse.keypop:keypop-calypso-crypto-legacysam-java-api")
@@ -166,6 +166,8 @@ fun copyLicenseFiles() {
166166
noticeFile.copyTo(File(metaInfDir, "NOTICE.md"), overwrite = true)
167167
}
168168

169+
tasks.withType<JavaCompile> { options.compilerArgs.add("-Xlint:deprecation") }
170+
169171
tasks {
170172
spotless {
171173
java {

‎Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase10_SessionTrace_TN313/CardReaderObserver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import org.eclipse.keyple.core.util.HexUtil;
2222
import org.eclipse.keypop.calypso.card.CalypsoCardApiFactory;
2323
import org.eclipse.keypop.calypso.card.card.CalypsoCard;
24-
import org.eclipse.keypop.calypso.card.transaction.ChannelControl;
2524
import org.eclipse.keypop.calypso.card.transaction.SecureRegularModeTransactionManager;
2625
import org.eclipse.keypop.calypso.card.transaction.SymmetricCryptoSecuritySetting;
2726
import org.eclipse.keypop.reader.CardReader;
2827
import org.eclipse.keypop.reader.CardReaderEvent;
28+
import org.eclipse.keypop.reader.ChannelControl;
2929
import org.eclipse.keypop.reader.ObservableCardReader;
3030
import org.eclipse.keypop.reader.selection.CardSelectionManager;
3131
import org.eclipse.keypop.reader.spi.CardReaderObservationExceptionHandlerSpi;

‎Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase10_SessionTrace_TN313/Main_SessionTrace_TN313_Pcsc.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ private static void initCardReader() {
268268
true,
269269
PcscReader.IsoProtocol.T1,
270270
PcscReader.SharingMode.SHARED,
271-
PcscSupportedContactlessProtocol.ISO_14443_4.name(),
271+
PcscCardCommunicationProtocol.ISO_14443_4.name(),
272272
ISO_CARD_PROTOCOL);
273273
}
274274

@@ -286,7 +286,7 @@ private static void initSamReader() {
286286
false,
287287
PcscReader.IsoProtocol.ANY,
288288
PcscReader.SharingMode.SHARED,
289-
PcscSupportedContactProtocol.ISO_7816_3_T0.name(),
289+
PcscCardCommunicationProtocol.ISO_7816_3.name(),
290290
SAM_PROTOCOL);
291291
}
292292

‎Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase11_DataSigning/Main_DataSigning_Pcsc.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.eclipse.keypop.calypso.crypto.legacysam.sam.LegacySamSelectionExtension;
3030
import org.eclipse.keypop.calypso.crypto.legacysam.transaction.*;
3131
import org.eclipse.keypop.reader.CardReader;
32+
import org.eclipse.keypop.reader.ChannelControl;
3233
import org.eclipse.keypop.reader.ReaderApiFactory;
3334
import org.eclipse.keypop.reader.selection.BasicCardSelector;
3435
import org.eclipse.keypop.reader.selection.CardSelectionManager;
@@ -311,7 +312,7 @@ private static void performBasicSignature(CardResource cardResource) {
311312
.createBasicSignatureComputationData()
312313
.setData(HexUtil.toByteArray(DATA_TO_SIGN), KIF_BASIC, KVC_BASIC);
313314
freeTransactionManager.prepareComputeSignature(basicSignatureComputationData);
314-
freeTransactionManager.processCommands();
315+
freeTransactionManager.processCommands(ChannelControl.KEEP_OPEN);
315316
String signatureHex = HexUtil.toHex(basicSignatureComputationData.getSignature());
316317
logger.info("signature='{}'", signatureHex);
317318

@@ -330,7 +331,7 @@ private static void performBasicSignature(CardResource cardResource) {
330331
KIF_BASIC,
331332
KVC_BASIC);
332333
freeTransactionManager.prepareVerifySignature(basicSignatureVerificationData);
333-
freeTransactionManager.processCommands();
334+
freeTransactionManager.processCommands(ChannelControl.KEEP_OPEN);
334335
boolean isSignatureValid = basicSignatureVerificationData.isSignatureValid();
335336
logger.info("Signature is valid: '{}'", isSignatureValid);
336337
}
@@ -354,7 +355,7 @@ private static void performTraceableSignature(CardResource cardResource) {
354355
.setData(HexUtil.toByteArray(DATA_TO_SIGN), KIF_TRACEABLE, KVC_TRACEABLE)
355356
.withSamTraceabilityMode(0, SamTraceabilityMode.FULL_SERIAL_NUMBER);
356357
freeTransactionManager.prepareComputeSignature(traceableSignatureComputationData);
357-
freeTransactionManager.processCommands();
358+
freeTransactionManager.processCommands(ChannelControl.KEEP_OPEN);
358359
String signatureHex = HexUtil.toHex(traceableSignatureComputationData.getSignature());
359360
String signedDataHex = HexUtil.toHex(traceableSignatureComputationData.getSignedData());
360361
logger.info("signature='{}'", signatureHex);
@@ -376,7 +377,7 @@ private static void performTraceableSignature(CardResource cardResource) {
376377
KVC_TRACEABLE)
377378
.withSamTraceabilityMode(0, SamTraceabilityMode.FULL_SERIAL_NUMBER, null);
378379
freeTransactionManager.prepareVerifySignature(traceableSignatureVerificationData);
379-
freeTransactionManager.processCommands();
380+
freeTransactionManager.processCommands(ChannelControl.KEEP_OPEN);
380381
boolean isSignatureValid = traceableSignatureVerificationData.isSignatureValid();
381382
logger.info("Signature is valid: '{}'", isSignatureValid);
382383
}

‎Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase12_PerformanceMeasurement_EmbeddedValidation/Main_PerformanceMeasurement_EmbeddedValidation_Pcsc.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
import org.eclipse.keypop.calypso.card.CalypsoCardApiFactory;
2828
import org.eclipse.keypop.calypso.card.card.CalypsoCard;
2929
import org.eclipse.keypop.calypso.card.card.CalypsoCardSelectionExtension;
30-
import org.eclipse.keypop.calypso.card.transaction.ChannelControl;
3130
import org.eclipse.keypop.calypso.card.transaction.SecureRegularModeTransactionManager;
3231
import org.eclipse.keypop.calypso.card.transaction.SymmetricCryptoSecuritySetting;
3332
import org.eclipse.keypop.calypso.crypto.legacysam.LegacySamApiFactory;
3433
import org.eclipse.keypop.calypso.crypto.legacysam.sam.LegacySam;
3534
import org.eclipse.keypop.reader.CardReader;
35+
import org.eclipse.keypop.reader.ChannelControl;
3636
import org.eclipse.keypop.reader.ConfigurableCardReader;
3737
import org.eclipse.keypop.reader.ReaderApiFactory;
3838
import org.eclipse.keypop.reader.selection.CardSelectionManager;
@@ -311,7 +311,7 @@ private static void initCardReader() {
311311
true,
312312
PcscReader.IsoProtocol.T1,
313313
PcscReader.SharingMode.SHARED,
314-
PcscSupportedContactlessProtocol.ISO_14443_4.name(),
314+
PcscCardCommunicationProtocol.ISO_14443_4.name(),
315315
ISO_CARD_PROTOCOL);
316316
}
317317

@@ -329,7 +329,7 @@ private static void initSamReader() {
329329
false,
330330
PcscReader.IsoProtocol.ANY,
331331
PcscReader.SharingMode.SHARED,
332-
PcscSupportedContactProtocol.ISO_7816_3_T0.name(),
332+
PcscCardCommunicationProtocol.ISO_7816_3.name(),
333333
SAM_PROTOCOL);
334334
}
335335

‎Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase13_PerformanceMeasurement_DistributedReloading/Main_PerformanceMeasurement_DistributedReloading_Pcsc.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
import org.eclipse.keypop.calypso.card.CalypsoCardApiFactory;
2828
import org.eclipse.keypop.calypso.card.card.CalypsoCard;
2929
import org.eclipse.keypop.calypso.card.card.CalypsoCardSelectionExtension;
30-
import org.eclipse.keypop.calypso.card.transaction.ChannelControl;
3130
import org.eclipse.keypop.calypso.card.transaction.SecureRegularModeTransactionManager;
3231
import org.eclipse.keypop.calypso.card.transaction.SymmetricCryptoSecuritySetting;
3332
import org.eclipse.keypop.calypso.crypto.legacysam.LegacySamApiFactory;
3433
import org.eclipse.keypop.calypso.crypto.legacysam.sam.LegacySam;
3534
import org.eclipse.keypop.reader.CardReader;
35+
import org.eclipse.keypop.reader.ChannelControl;
3636
import org.eclipse.keypop.reader.ConfigurableCardReader;
3737
import org.eclipse.keypop.reader.ReaderApiFactory;
3838
import org.eclipse.keypop.reader.selection.CardSelectionManager;
@@ -291,7 +291,7 @@ private static void initCardReader() {
291291
true,
292292
PcscReader.IsoProtocol.T1,
293293
PcscReader.SharingMode.SHARED,
294-
PcscSupportedContactlessProtocol.ISO_14443_4.name(),
294+
PcscCardCommunicationProtocol.ISO_14443_4.name(),
295295
ISO_CARD_PROTOCOL);
296296
}
297297

@@ -309,7 +309,7 @@ private static void initSamReader() {
309309
false,
310310
PcscReader.IsoProtocol.ANY,
311311
PcscReader.SharingMode.SHARED,
312-
PcscSupportedContactProtocol.ISO_7816_3_T0.name(),
312+
PcscCardCommunicationProtocol.ISO_7816_3.name(),
313313
SAM_PROTOCOL);
314314
}
315315

‎Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase14_ReadLegacySamCountersAndCeilings/Main_ReadLegacySamCountersAndCeilings_Pcsc.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@
2121
import org.eclipse.keyple.core.service.Plugin;
2222
import org.eclipse.keyple.core.service.SmartCardService;
2323
import org.eclipse.keyple.core.service.SmartCardServiceProvider;
24+
import org.eclipse.keyple.plugin.pcsc.PcscCardCommunicationProtocol;
2425
import org.eclipse.keyple.plugin.pcsc.PcscPluginFactoryBuilder;
2526
import org.eclipse.keyple.plugin.pcsc.PcscReader;
26-
import org.eclipse.keyple.plugin.pcsc.PcscSupportedContactProtocol;
2727
import org.eclipse.keypop.calypso.card.CalypsoCardApiFactory;
2828
import org.eclipse.keypop.calypso.crypto.legacysam.LegacySamApiFactory;
2929
import org.eclipse.keypop.calypso.crypto.legacysam.sam.LegacySam;
3030
import org.eclipse.keypop.calypso.crypto.legacysam.transaction.FreeTransactionManager;
3131
import org.eclipse.keypop.reader.CardReader;
32+
import org.eclipse.keypop.reader.ChannelControl;
3233
import org.eclipse.keypop.reader.ConfigurableCardReader;
3334
import org.eclipse.keypop.reader.ReaderApiFactory;
3435
import org.eclipse.keypop.reader.selection.CardSelectionManager;
@@ -95,7 +96,7 @@ public static void main(String[] args) {
9596
legacySamApiFactory.createFreeTransactionManager(samReader, sam);
9697

9798
// Process the transaction to read counters and ceilings
98-
samTransactionManager.prepareReadAllCountersStatus().processCommands();
99+
samTransactionManager.prepareReadAllCountersStatus().processCommands(ChannelControl.KEEP_OPEN);
99100

100101
// Output results
101102
logger.info("\nSAM event counters =\n{}", gson.toJson(sam.getCounters()));
@@ -130,7 +131,7 @@ private static void initSamReader() {
130131
false,
131132
PcscReader.IsoProtocol.ANY,
132133
PcscReader.SharingMode.SHARED,
133-
PcscSupportedContactProtocol.ISO_7816_3_T0.name(),
134+
PcscCardCommunicationProtocol.ISO_7816_3.name(),
134135
SAM_PROTOCOL);
135136
}
136137

‎Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase15_ExtendedModeSession/Main_ExtendedModeSession_Pcsc.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,19 @@
2121
import org.eclipse.keyple.core.service.SmartCardService;
2222
import org.eclipse.keyple.core.service.SmartCardServiceProvider;
2323
import org.eclipse.keyple.core.util.HexUtil;
24+
import org.eclipse.keyple.plugin.pcsc.PcscCardCommunicationProtocol;
2425
import org.eclipse.keyple.plugin.pcsc.PcscPluginFactoryBuilder;
2526
import org.eclipse.keyple.plugin.pcsc.PcscReader;
26-
import org.eclipse.keyple.plugin.pcsc.PcscSupportedContactProtocol;
27-
import org.eclipse.keyple.plugin.pcsc.PcscSupportedContactlessProtocol;
2827
import org.eclipse.keypop.calypso.card.CalypsoCardApiFactory;
2928
import org.eclipse.keypop.calypso.card.WriteAccessLevel;
3029
import org.eclipse.keypop.calypso.card.card.CalypsoCard;
3130
import org.eclipse.keypop.calypso.card.card.CalypsoCardSelectionExtension;
32-
import org.eclipse.keypop.calypso.card.transaction.ChannelControl;
3331
import org.eclipse.keypop.calypso.card.transaction.SecureExtendedModeTransactionManager;
3432
import org.eclipse.keypop.calypso.card.transaction.SymmetricCryptoSecuritySetting;
3533
import org.eclipse.keypop.calypso.crypto.legacysam.LegacySamApiFactory;
3634
import org.eclipse.keypop.calypso.crypto.legacysam.sam.LegacySam;
3735
import org.eclipse.keypop.reader.CardReader;
36+
import org.eclipse.keypop.reader.ChannelControl;
3837
import org.eclipse.keypop.reader.ConfigurableCardReader;
3938
import org.eclipse.keypop.reader.ReaderApiFactory;
4039
import org.eclipse.keypop.reader.selection.CardSelectionManager;
@@ -178,7 +177,7 @@ private static void initCardReader() {
178177
true,
179178
PcscReader.IsoProtocol.T1,
180179
PcscReader.SharingMode.SHARED,
181-
PcscSupportedContactlessProtocol.ISO_14443_4.name(),
180+
PcscCardCommunicationProtocol.ISO_14443_4.name(),
182181
ISO_CARD_PROTOCOL);
183182
}
184183

@@ -196,7 +195,7 @@ private static void initSamReader() {
196195
false,
197196
PcscReader.IsoProtocol.ANY,
198197
PcscReader.SharingMode.SHARED,
199-
PcscSupportedContactProtocol.ISO_7816_3_T0.name(),
198+
PcscCardCommunicationProtocol.ISO_7816_3.name(),
200199
SAM_PROTOCOL);
201200
}
202201

‎Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase16_PkiModeSession/Main_PkiModeSession_Pcsc.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@
2121
import org.eclipse.keyple.core.service.SmartCardService;
2222
import org.eclipse.keyple.core.service.SmartCardServiceProvider;
2323
import org.eclipse.keyple.core.util.HexUtil;
24+
import org.eclipse.keyple.plugin.pcsc.PcscCardCommunicationProtocol;
2425
import org.eclipse.keyple.plugin.pcsc.PcscPluginFactoryBuilder;
2526
import org.eclipse.keyple.plugin.pcsc.PcscReader;
26-
import org.eclipse.keyple.plugin.pcsc.PcscSupportedContactlessProtocol;
2727
import org.eclipse.keypop.calypso.card.CalypsoCardApiFactory;
2828
import org.eclipse.keypop.calypso.card.card.CalypsoCard;
2929
import org.eclipse.keypop.calypso.card.card.CalypsoCardSelectionExtension;
3030
import org.eclipse.keypop.calypso.card.transaction.*;
3131
import org.eclipse.keypop.calypso.card.transaction.spi.AsymmetricCryptoCardTransactionManagerFactory;
3232
import org.eclipse.keypop.reader.CardReader;
33+
import org.eclipse.keypop.reader.ChannelControl;
3334
import org.eclipse.keypop.reader.ConfigurableCardReader;
3435
import org.eclipse.keypop.reader.ReaderApiFactory;
3536
import org.eclipse.keypop.reader.selection.CardSelectionManager;
@@ -234,7 +235,7 @@ private static void initCardReader() {
234235
true,
235236
PcscReader.IsoProtocol.T1,
236237
PcscReader.SharingMode.SHARED,
237-
PcscSupportedContactlessProtocol.ISO_14443_4.name(),
238+
PcscCardCommunicationProtocol.ISO_14443_4.name(),
238239
ISO_CARD_PROTOCOL);
239240
}
240241

0 commit comments

Comments
 (0)