From 2125d386130172b1a9dbd4dfd92c54fa1916ad44 Mon Sep 17 00:00:00 2001 From: Pierre Laborde Date: Fri, 13 Feb 2026 11:09:14 +0100 Subject: [PATCH 1/7] Fix issue #34 --- LICENSE | 2 +- README.md | 10 +++++++--- .../BaselineOfBlocSerialization.class.st | 8 +++++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index f630b4b..dc050e4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 OpenSmock +Copyright (c) 2023-2026 OpenSmock Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 79dae38..5a8913c 100644 --- a/README.md +++ b/README.md @@ -76,13 +76,17 @@ Serialization or Materialization process return some exceptions in case of probl ## Serialization backends -Actually `STON` is the only backend used for serialization. The project architecture allow to add anothers serialization backends if needed. +`Stash` and `STON` can be used as serialization backends. + +The project architecture is flexible enough to accommodate the addition of more serialization backends if required. ## Dependencies -- [Bloc](https://github.com/pharo-graphics/Bloc) +- [Stash](https://github.com/OpenSmock/stash) - [STON](https://github.com/svenvc/ston) +- [Alexandrie](https://github.com/pharo-graphics/Alexandrie) +- [Bloc](https://github.com/pharo-graphics/Bloc) ## License -This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. +This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. \ No newline at end of file diff --git a/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st b/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st index fddb3c4..9aa656c 100644 --- a/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st +++ b/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st @@ -25,6 +25,7 @@ BaselineOfBlocSerialization >> baseline: spec [ { #category : #accessing } BaselineOfBlocSerialization >> dependency: spec [ + "Serialization backends" spec baseline: 'Ston' with: [ spec repository: 'github://svenvc/ston/repository' ]. @@ -33,7 +34,12 @@ BaselineOfBlocSerialization >> dependency: spec [ baseline: 'StashSerialization' with: [ spec repository: 'github://OpenSmock/Stash/src' ]. + "Graphic librairies: this section should be removed when librairies will be integrated in Pharo" + spec + baseline: 'Alexandrie' + with: [ spec repository: 'github://ThalesGroup/Alexandrie:dev' ]. + spec baseline: 'Bloc' - with: [ spec repository: 'github://OpenSmock/Bloc:dev/src' ]. + with: [ spec repository: 'github://ThalesGroup/Bloc:dev' ]. ] From c5e113b0758f32e0be09dc645a531d0c1b4adb75 Mon Sep 17 00:00:00 2001 From: Pierre Laborde Date: Fri, 13 Feb 2026 11:14:14 +0100 Subject: [PATCH 2/7] Fix CI baseline loading --- .smalltalkci.default.ston | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.smalltalkci.default.ston b/.smalltalkci.default.ston index 90a88fd..16bef0e 100644 --- a/.smalltalkci.default.ston +++ b/.smalltalkci.default.ston @@ -3,7 +3,15 @@ SmalltalkCISpec { SCIMetacelloLoadSpec { #baseline : 'BlocSerialization', #directory : 'src', - #platforms : [ #pharo ] + #platforms : [ #pharo ], + #onConflict : #useIncoming, + #onUpgrade : #useLoaded, + #ignoreImage : true } - ] + ], + + #testing : { + #failOnZeroTests : false, + #packages : [ 'Bloc-Serialization.*.Tests' ] + } } From 33a21bfb9b223348c2557828e7cbd0b5ebf976b3 Mon Sep 17 00:00:00 2001 From: Pierre Laborde Date: Wed, 11 Mar 2026 16:51:48 +0100 Subject: [PATCH 3/7] Fix issue #37 --- .../BaselineOfBlocSerialization.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st b/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st index 9aa656c..12e8ee1 100644 --- a/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st +++ b/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st @@ -32,7 +32,7 @@ BaselineOfBlocSerialization >> dependency: spec [ spec baseline: 'StashSerialization' - with: [ spec repository: 'github://OpenSmock/Stash/src' ]. + with: [ spec repository: 'github://ThalesGroup/Stash:main' ]. "Graphic librairies: this section should be removed when librairies will be integrated in Pharo" spec From 258a2b9a8496f037caea735626fada7c6efc8aec Mon Sep 17 00:00:00 2001 From: Pierre Laborde Date: Wed, 11 Mar 2026 16:55:00 +0100 Subject: [PATCH 4/7] Update licence --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index dc050e4..d36e533 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023-2026 OpenSmock +Copyright (c) 2023-2026 Thales Group Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From e515a2019969d66bb66b193623395ca4df9ce776 Mon Sep 17 00:00:00 2001 From: Pierre Laborde Date: Wed, 11 Mar 2026 16:55:53 +0100 Subject: [PATCH 5/7] Update Stash location in the readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a8913c..6b50c65 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ The project architecture is flexible enough to accommodate the addition of more ## Dependencies -- [Stash](https://github.com/OpenSmock/stash) +- [Stash](https://github.com/ThalesGroup/stash) - [STON](https://github.com/svenvc/ston) - [Alexandrie](https://github.com/pharo-graphics/Alexandrie) - [Bloc](https://github.com/pharo-graphics/Bloc) From 97de17854e7665ef5b8d86a62fd18754fa976eb5 Mon Sep 17 00:00:00 2001 From: Pierre Laborde Date: Wed, 11 Mar 2026 16:59:11 +0100 Subject: [PATCH 6/7] fix branch name --- .../BaselineOfBlocSerialization.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st b/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st index 12e8ee1..949994c 100644 --- a/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st +++ b/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st @@ -32,7 +32,7 @@ BaselineOfBlocSerialization >> dependency: spec [ spec baseline: 'StashSerialization' - with: [ spec repository: 'github://ThalesGroup/Stash:main' ]. + with: [ spec repository: 'github://ThalesGroup/Stash:master' ]. "Graphic librairies: this section should be removed when librairies will be integrated in Pharo" spec From fedae273af0d3ee48790f5eb186145f890d7fe97 Mon Sep 17 00:00:00 2001 From: Pierre Laborde Date: Wed, 11 Mar 2026 17:14:06 +0100 Subject: [PATCH 7/7] change to main --- .../BaselineOfBlocSerialization.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st b/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st index 949994c..12e8ee1 100644 --- a/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st +++ b/src/BaselineOfBlocSerialization/BaselineOfBlocSerialization.class.st @@ -32,7 +32,7 @@ BaselineOfBlocSerialization >> dependency: spec [ spec baseline: 'StashSerialization' - with: [ spec repository: 'github://ThalesGroup/Stash:master' ]. + with: [ spec repository: 'github://ThalesGroup/Stash:main' ]. "Graphic librairies: this section should be removed when librairies will be integrated in Pharo" spec