From df9000fce3bbaa559ba8bf4606c591f982f1cee4 Mon Sep 17 00:00:00 2001 From: Mark Raynsford Date: Sun, 1 Sep 2024 11:00:30 +0000 Subject: [PATCH 1/5] Begin next development iteration. --- com.io7m.darco.api/pom.xml | 2 +- com.io7m.darco.examples/pom.xml | 2 +- com.io7m.darco.postgres/pom.xml | 2 +- com.io7m.darco.sqlite/pom.xml | 2 +- com.io7m.darco.templating/pom.xml | 2 +- com.io7m.darco.tests/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/com.io7m.darco.api/pom.xml b/com.io7m.darco.api/pom.xml index 6e37a04..8c6642d 100644 --- a/com.io7m.darco.api/pom.xml +++ b/com.io7m.darco.api/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 1.0.0 + 1.0.1-SNAPSHOT com.io7m.darco.api diff --git a/com.io7m.darco.examples/pom.xml b/com.io7m.darco.examples/pom.xml index 150f524..2a03fe3 100644 --- a/com.io7m.darco.examples/pom.xml +++ b/com.io7m.darco.examples/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 1.0.0 + 1.0.1-SNAPSHOT com.io7m.darco.examples diff --git a/com.io7m.darco.postgres/pom.xml b/com.io7m.darco.postgres/pom.xml index c12a26d..ac899c8 100644 --- a/com.io7m.darco.postgres/pom.xml +++ b/com.io7m.darco.postgres/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 1.0.0 + 1.0.1-SNAPSHOT com.io7m.darco.postgres diff --git a/com.io7m.darco.sqlite/pom.xml b/com.io7m.darco.sqlite/pom.xml index 9165a67..7fc1f34 100644 --- a/com.io7m.darco.sqlite/pom.xml +++ b/com.io7m.darco.sqlite/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 1.0.0 + 1.0.1-SNAPSHOT com.io7m.darco.sqlite diff --git a/com.io7m.darco.templating/pom.xml b/com.io7m.darco.templating/pom.xml index 955a28f..15d99ef 100644 --- a/com.io7m.darco.templating/pom.xml +++ b/com.io7m.darco.templating/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 1.0.0 + 1.0.1-SNAPSHOT com.io7m.darco.templating diff --git a/com.io7m.darco.tests/pom.xml b/com.io7m.darco.tests/pom.xml index b243018..796163e 100644 --- a/com.io7m.darco.tests/pom.xml +++ b/com.io7m.darco.tests/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 1.0.0 + 1.0.1-SNAPSHOT com.io7m.darco.tests diff --git a/pom.xml b/pom.xml index f56daa9..470d222 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.io7m.darco com.io7m.darco - 1.0.0 + 1.0.1-SNAPSHOT pom com.io7m.darco From 86087202db44863daa133cebd5ad163e1963bb32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 20:44:03 +0000 Subject: [PATCH 2/5] Bump ch.qos.logback:logback-classic from 1.5.7 to 1.5.8 Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.5.7 to 1.5.8. - [Commits](https://github.com/qos-ch/logback/compare/v_1.5.7...v_1.5.8) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 470d222..fc283a9 100644 --- a/pom.xml +++ b/pom.xml @@ -235,7 +235,7 @@ ch.qos.logback logback-classic - 1.5.7 + 1.5.8 From 84e09309d52f2d165ab22190a3f45bbc5264063c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 20:44:17 +0000 Subject: [PATCH 3/5] Bump io.opentelemetry:opentelemetry-bom from 1.41.0 to 1.42.0 Bumps [io.opentelemetry:opentelemetry-bom](https://github.com/open-telemetry/opentelemetry-java) from 1.41.0 to 1.42.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.41.0...v1.42.0) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 470d222..9568e95 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 1.0.0 - 1.41.0 + 1.42.0 1.9.0 5.11.0 16.3 From dbc06fa8026acfc0580308886ef7f8d249f955cb Mon Sep 17 00:00:00 2001 From: Mark Raynsford Date: Fri, 6 Sep 2024 21:41:44 +0000 Subject: [PATCH 4/5] Require SAX parsers to be passed in explicitly. --- README-CHANGES.xml | 7 +++++- com.io7m.darco.api/pom.xml | 6 ++++- .../darco/api/DDatabaseConfigurationType.java | 10 +++++++++ .../java/com/io7m/darco/api/package-info.java | 2 +- .../src/main/java/module-info.java | 1 + com.io7m.darco.examples/pom.xml | 6 ++++- .../com/io7m/darco/examples/package-info.java | 2 +- .../postgresql/EPQDatabaseConfiguration.java | 6 +++++ .../examples/postgresql/package-info.java | 2 +- .../sqlite/ESDatabaseConfiguration.java | 22 ++++++++++++------- .../darco/examples/sqlite/package-info.java | 2 +- .../src/main/java/module-info.java | 1 + com.io7m.darco.postgres/pom.xml | 10 ++++++++- .../darco/postgres/DPQDatabaseFactory.java | 13 ++++++++++- .../src/main/java/module-info.java | 2 ++ com.io7m.darco.sqlite/pom.xml | 10 ++++++++- .../io7m/darco/sqlite/DSDatabaseFactory.java | 13 ++++++++++- .../src/main/java/module-info.java | 10 +++++---- com.io7m.darco.templating/pom.xml | 2 +- com.io7m.darco.tests/pom.xml | 2 +- .../com/io7m/darco/tests/EPQDatabaseTest.java | 3 +++ .../com/io7m/darco/tests/ESDatabaseTest.java | 2 ++ pom.xml | 19 +++++++++++----- 23 files changed, 123 insertions(+), 30 deletions(-) diff --git a/README-CHANGES.xml b/README-CHANGES.xml index 8216c14..20df4f2 100644 --- a/README-CHANGES.xml +++ b/README-CHANGES.xml @@ -1,9 +1,14 @@ - + + + + + + diff --git a/com.io7m.darco.api/pom.xml b/com.io7m.darco.api/pom.xml index 8c6642d..b6ce118 100644 --- a/com.io7m.darco.api/pom.xml +++ b/com.io7m.darco.api/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 1.0.1-SNAPSHOT + 2.0.0-SNAPSHOT com.io7m.darco.api @@ -39,6 +39,10 @@ com.io7m.jmulticlose com.io7m.jmulticlose.core + + com.io7m.jxe + com.io7m.jxe.core + org.osgi diff --git a/com.io7m.darco.api/src/main/java/com/io7m/darco/api/DDatabaseConfigurationType.java b/com.io7m.darco.api/src/main/java/com/io7m/darco/api/DDatabaseConfigurationType.java index 99e3965..c2644e3 100644 --- a/com.io7m.darco.api/src/main/java/com/io7m/darco/api/DDatabaseConfigurationType.java +++ b/com.io7m.darco.api/src/main/java/com/io7m/darco/api/DDatabaseConfigurationType.java @@ -16,12 +16,22 @@ package com.io7m.darco.api; +import com.io7m.jxe.core.JXEHardenedSAXParsers; + +import java.util.Optional; + /** * The base database configuration. */ public interface DDatabaseConfigurationType { + /** + * @return A factory of SAX parsers used to parse database schemas + */ + + Optional saxParsers(); + /** * @return The database telemetry interface */ diff --git a/com.io7m.darco.api/src/main/java/com/io7m/darco/api/package-info.java b/com.io7m.darco.api/src/main/java/com/io7m/darco/api/package-info.java index b9d835f..a2f6db6 100644 --- a/com.io7m.darco.api/src/main/java/com/io7m/darco/api/package-info.java +++ b/com.io7m.darco.api/src/main/java/com/io7m/darco/api/package-info.java @@ -19,7 +19,7 @@ */ @Export -@Version("1.0.0") +@Version("2.0.0") package com.io7m.darco.api; import org.osgi.annotation.bundle.Export; diff --git a/com.io7m.darco.api/src/main/java/module-info.java b/com.io7m.darco.api/src/main/java/module-info.java index 0638dbd..80d07ef 100644 --- a/com.io7m.darco.api/src/main/java/module-info.java +++ b/com.io7m.darco.api/src/main/java/module-info.java @@ -24,6 +24,7 @@ requires static org.osgi.annotation.versioning; requires com.io7m.jmulticlose.core; + requires com.io7m.jxe.core; requires com.io7m.lanark.core; requires com.io7m.seltzer.api; requires io.opentelemetry.api; diff --git a/com.io7m.darco.examples/pom.xml b/com.io7m.darco.examples/pom.xml index 2a03fe3..9848fe4 100644 --- a/com.io7m.darco.examples/pom.xml +++ b/com.io7m.darco.examples/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 1.0.1-SNAPSHOT + 2.0.0-SNAPSHOT com.io7m.darco.examples @@ -35,6 +35,10 @@ ${project.version} + + com.io7m.jxe + com.io7m.jxe.core + com.io7m.jmulticlose com.io7m.jmulticlose.core diff --git a/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/package-info.java b/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/package-info.java index 0ebbf27..994b253 100644 --- a/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/package-info.java +++ b/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/package-info.java @@ -19,7 +19,7 @@ */ @Export -@Version("1.0.0") +@Version("2.0.0") package com.io7m.darco.examples; import org.osgi.annotation.bundle.Export; diff --git a/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/postgresql/EPQDatabaseConfiguration.java b/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/postgresql/EPQDatabaseConfiguration.java index 1edf358..13bcd2a 100644 --- a/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/postgresql/EPQDatabaseConfiguration.java +++ b/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/postgresql/EPQDatabaseConfiguration.java @@ -22,12 +22,15 @@ import com.io7m.darco.api.DDatabaseUpgrade; import com.io7m.darco.api.DUsernamePassword; import com.io7m.darco.postgres.DPQDatabaseConfigurationType; +import com.io7m.jxe.core.JXEHardenedSAXParsers; import java.util.Objects; +import java.util.Optional; /** * The configuration information for the example PostgreSQL database. * + * @param saxParsers The SAX parser factory * @param telemetry The telemetry interface * @param create The database creation option * @param upgrade The database upgrade option @@ -40,6 +43,7 @@ */ public record EPQDatabaseConfiguration( + Optional saxParsers, DDatabaseTelemetryType telemetry, DDatabaseCreate create, DDatabaseUpgrade upgrade, @@ -54,6 +58,7 @@ public record EPQDatabaseConfiguration( /** * The configuration information for the example PostgreSQL database. * + * @param saxParsers The SAX parser factory * @param telemetry The telemetry interface * @param create The database creation option * @param upgrade The database upgrade option @@ -67,6 +72,7 @@ public record EPQDatabaseConfiguration( public EPQDatabaseConfiguration { + Objects.requireNonNull(saxParsers, "saxParsers"); Objects.requireNonNull(telemetry, "telemetry"); Objects.requireNonNull(create, "create"); Objects.requireNonNull(upgrade, "upgrade"); diff --git a/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/postgresql/package-info.java b/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/postgresql/package-info.java index 53f61f3..aecfaf4 100644 --- a/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/postgresql/package-info.java +++ b/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/postgresql/package-info.java @@ -19,7 +19,7 @@ */ @Export -@Version("1.0.0") +@Version("2.0.0") package com.io7m.darco.examples.postgresql; import org.osgi.annotation.bundle.Export; diff --git a/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/sqlite/ESDatabaseConfiguration.java b/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/sqlite/ESDatabaseConfiguration.java index 9c5fc1f..704bb3a 100644 --- a/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/sqlite/ESDatabaseConfiguration.java +++ b/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/sqlite/ESDatabaseConfiguration.java @@ -21,20 +21,24 @@ import com.io7m.darco.api.DDatabaseTelemetryType; import com.io7m.darco.api.DDatabaseUpgrade; import com.io7m.darco.sqlite.DSDatabaseConfigurationType; +import com.io7m.jxe.core.JXEHardenedSAXParsers; import java.nio.file.Path; import java.util.Objects; +import java.util.Optional; /** * The configuration information for the example SQLite database. * - * @param telemetry The telemetry interface - * @param create The database creation option - * @param upgrade The database upgrade option - * @param file The database file + * @param saxParsers The SAX parsers + * @param telemetry The telemetry interface + * @param create The database creation option + * @param upgrade The database upgrade option + * @param file The database file */ public record ESDatabaseConfiguration( + Optional saxParsers, DDatabaseTelemetryType telemetry, DDatabaseCreate create, DDatabaseUpgrade upgrade, @@ -44,14 +48,16 @@ public record ESDatabaseConfiguration( /** * The configuration information for the example SQLite database. * - * @param telemetry The telemetry interface - * @param create The database creation option - * @param upgrade The database upgrade option - * @param file The database file + * @param saxParsers The SAX parsers + * @param telemetry The telemetry interface + * @param create The database creation option + * @param upgrade The database upgrade option + * @param file The database file */ public ESDatabaseConfiguration { + Objects.requireNonNull(saxParsers, "saxParsers"); Objects.requireNonNull(telemetry, "telemetry"); Objects.requireNonNull(create, "create"); Objects.requireNonNull(upgrade, "upgrade"); diff --git a/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/sqlite/package-info.java b/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/sqlite/package-info.java index 4cde3fb..b1d0daa 100644 --- a/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/sqlite/package-info.java +++ b/com.io7m.darco.examples/src/main/java/com/io7m/darco/examples/sqlite/package-info.java @@ -19,7 +19,7 @@ */ @Export -@Version("1.0.0") +@Version("2.0.0") package com.io7m.darco.examples.sqlite; import org.osgi.annotation.bundle.Export; diff --git a/com.io7m.darco.examples/src/main/java/module-info.java b/com.io7m.darco.examples/src/main/java/module-info.java index 32acfeb..94175fe 100644 --- a/com.io7m.darco.examples/src/main/java/module-info.java +++ b/com.io7m.darco.examples/src/main/java/module-info.java @@ -41,6 +41,7 @@ requires io.opentelemetry.api; requires org.slf4j; requires org.xerial.sqlitejdbc; + requires com.io7m.jxe.core; uses ESDatabaseQueryProviderType; uses EPQDatabaseQueryProviderType; diff --git a/com.io7m.darco.postgres/pom.xml b/com.io7m.darco.postgres/pom.xml index ac899c8..a3306a1 100644 --- a/com.io7m.darco.postgres/pom.xml +++ b/com.io7m.darco.postgres/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 1.0.1-SNAPSHOT + 2.0.0-SNAPSHOT com.io7m.darco.postgres @@ -25,6 +25,14 @@ ${project.version} + + com.io7m.jxe + com.io7m.jxe.core + + + com.io7m.anethum + com.io7m.anethum.api + com.io7m.jmulticlose com.io7m.jmulticlose.core diff --git a/com.io7m.darco.postgres/src/main/java/com/io7m/darco/postgres/DPQDatabaseFactory.java b/com.io7m.darco.postgres/src/main/java/com/io7m/darco/postgres/DPQDatabaseFactory.java index f17a59d..774d3be 100644 --- a/com.io7m.darco.postgres/src/main/java/com/io7m/darco/postgres/DPQDatabaseFactory.java +++ b/com.io7m.darco.postgres/src/main/java/com/io7m/darco/postgres/DPQDatabaseFactory.java @@ -26,6 +26,7 @@ import com.io7m.darco.api.DDatabaseType; import com.io7m.jmulticlose.core.CloseableCollection; import com.io7m.jmulticlose.core.CloseableCollectionType; +import com.io7m.jxe.core.JXEHardenedSAXParsers; import com.io7m.lanark.core.RDottedName; import com.io7m.trasco.api.TrArguments; import com.io7m.trasco.api.TrEventExecutingSQL; @@ -367,7 +368,17 @@ private void createOrUpgrade( final var parsers = new TrSchemaRevisionSetParsers(); final TrSchemaRevisionSet revisions; try (var stream = this.onRequireDatabaseSchemaXML()) { - revisions = parsers.parse(URI.create("urn:source"), stream); + final var parser = + parsers.createParserWithContext( + configuration.saxParsers() + .orElseGet(JXEHardenedSAXParsers::new), + URI.create("urn:source"), + stream, + parseStatus -> { + + } + ); + revisions = parser.execute(); } try (var connection = installDataSource.getConnection()) { diff --git a/com.io7m.darco.postgres/src/main/java/module-info.java b/com.io7m.darco.postgres/src/main/java/module-info.java index 9ec272d..bc170d5 100644 --- a/com.io7m.darco.postgres/src/main/java/module-info.java +++ b/com.io7m.darco.postgres/src/main/java/module-info.java @@ -28,7 +28,9 @@ requires java.sql; requires java.naming; + requires com.io7m.anethum.api; requires com.io7m.jmulticlose.core; + requires com.io7m.jxe.core; requires com.io7m.lanark.core; requires com.io7m.trasco.api; requires com.io7m.trasco.vanilla; diff --git a/com.io7m.darco.sqlite/pom.xml b/com.io7m.darco.sqlite/pom.xml index 7fc1f34..e87dc77 100644 --- a/com.io7m.darco.sqlite/pom.xml +++ b/com.io7m.darco.sqlite/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 1.0.1-SNAPSHOT + 2.0.0-SNAPSHOT com.io7m.darco.sqlite @@ -25,6 +25,14 @@ ${project.version} + + com.io7m.jxe + com.io7m.jxe.core + + + com.io7m.anethum + com.io7m.anethum.api + com.io7m.jmulticlose com.io7m.jmulticlose.core diff --git a/com.io7m.darco.sqlite/src/main/java/com/io7m/darco/sqlite/DSDatabaseFactory.java b/com.io7m.darco.sqlite/src/main/java/com/io7m/darco/sqlite/DSDatabaseFactory.java index 7e8ea58..798e9ad 100644 --- a/com.io7m.darco.sqlite/src/main/java/com/io7m/darco/sqlite/DSDatabaseFactory.java +++ b/com.io7m.darco.sqlite/src/main/java/com/io7m/darco/sqlite/DSDatabaseFactory.java @@ -26,6 +26,7 @@ import com.io7m.darco.api.DDatabaseType; import com.io7m.jmulticlose.core.CloseableCollection; import com.io7m.jmulticlose.core.CloseableCollectionType; +import com.io7m.jxe.core.JXEHardenedSAXParsers; import com.io7m.lanark.core.RDottedName; import com.io7m.trasco.api.TrArguments; import com.io7m.trasco.api.TrEventExecutingSQL; @@ -295,7 +296,17 @@ private SQLiteDataSource openDataSourceInSpan( final var parsers = new TrSchemaRevisionSetParsers(); final TrSchemaRevisionSet revisions; try (var stream = this.onRequireDatabaseSchemaXML()) { - revisions = parsers.parse(URI.create("urn:source"), stream); + final var parser = + parsers.createParserWithContext( + configuration.saxParsers() + .orElseGet(JXEHardenedSAXParsers::new), + URI.create("urn:source"), + stream, + parseStatus -> { + + } + ); + revisions = parser.execute(); } final var arguments = diff --git a/com.io7m.darco.sqlite/src/main/java/module-info.java b/com.io7m.darco.sqlite/src/main/java/module-info.java index a7284db..7465faf 100644 --- a/com.io7m.darco.sqlite/src/main/java/module-info.java +++ b/com.io7m.darco.sqlite/src/main/java/module-info.java @@ -27,14 +27,16 @@ requires java.sql; + requires com.io7m.anethum.api; + requires com.io7m.jmulticlose.core; + requires com.io7m.jxe.core; + requires com.io7m.lanark.core; requires com.io7m.trasco.api; requires com.io7m.trasco.vanilla; - requires com.io7m.lanark.core; - requires org.slf4j; - requires org.xerial.sqlitejdbc; requires io.opentelemetry.api; requires io.opentelemetry.context; - requires com.io7m.jmulticlose.core; + requires org.slf4j; + requires org.xerial.sqlitejdbc; exports com.io7m.darco.sqlite; } \ No newline at end of file diff --git a/com.io7m.darco.templating/pom.xml b/com.io7m.darco.templating/pom.xml index 15d99ef..13f514f 100644 --- a/com.io7m.darco.templating/pom.xml +++ b/com.io7m.darco.templating/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 1.0.1-SNAPSHOT + 2.0.0-SNAPSHOT com.io7m.darco.templating diff --git a/com.io7m.darco.tests/pom.xml b/com.io7m.darco.tests/pom.xml index 796163e..788f510 100644 --- a/com.io7m.darco.tests/pom.xml +++ b/com.io7m.darco.tests/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 1.0.1-SNAPSHOT + 2.0.0-SNAPSHOT com.io7m.darco.tests diff --git a/com.io7m.darco.tests/src/main/java/com/io7m/darco/tests/EPQDatabaseTest.java b/com.io7m.darco.tests/src/main/java/com/io7m/darco/tests/EPQDatabaseTest.java index db1f18f..a428ffd 100644 --- a/com.io7m.darco.tests/src/main/java/com/io7m/darco/tests/EPQDatabaseTest.java +++ b/com.io7m.darco.tests/src/main/java/com/io7m/darco/tests/EPQDatabaseTest.java @@ -37,6 +37,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import java.util.Optional; + import static com.io7m.darco.api.DDatabaseUnit.UNIT; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -68,6 +70,7 @@ public void setup() this.database = this.databases.open( new EPQDatabaseConfiguration( + Optional.empty(), DDatabaseTelemetryNoOp.get(), DDatabaseCreate.CREATE_DATABASE, DDatabaseUpgrade.UPGRADE_DATABASE, diff --git a/com.io7m.darco.tests/src/main/java/com/io7m/darco/tests/ESDatabaseTest.java b/com.io7m.darco.tests/src/main/java/com/io7m/darco/tests/ESDatabaseTest.java index ef8cd15..b68290c 100644 --- a/com.io7m.darco.tests/src/main/java/com/io7m/darco/tests/ESDatabaseTest.java +++ b/com.io7m.darco.tests/src/main/java/com/io7m/darco/tests/ESDatabaseTest.java @@ -32,6 +32,7 @@ import java.nio.file.Path; import java.time.Clock; +import java.util.Optional; import static com.io7m.darco.api.DDatabaseUnit.UNIT; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -54,6 +55,7 @@ public void setup( this.database = this.databases.open( new ESDatabaseConfiguration( + Optional.empty(), DDatabaseTelemetryNoOp.get(), DDatabaseCreate.CREATE_DATABASE, DDatabaseUpgrade.UPGRADE_DATABASE, diff --git a/pom.xml b/pom.xml index bbed074..4420422 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.io7m.darco com.io7m.darco - 1.0.1-SNAPSHOT + 2.0.0-SNAPSHOT pom com.io7m.darco @@ -36,8 +36,12 @@ 17 - 2.0.1 1.0.0 + 1.1.3 + 2.0.0 + 1.2.0 + 1.1.0 + 3.0.0 1.0.0 @@ -103,17 +107,22 @@ com.io7m.seltzer com.io7m.seltzer.api - 1.1.0 + ${com.io7m.seltzer.version} com.io7m.jmulticlose com.io7m.jmulticlose.core - 1.1.3 + ${com.io7m.jmulticlose.version} com.io7m.lanark com.io7m.lanark.core - 1.2.0 + ${com.io7m.lanark.version} + + + com.io7m.jxe + com.io7m.jxe.core + ${com.io7m.jxe.version} From 02f3800bc34ce351573576c88d42691946c3f594 Mon Sep 17 00:00:00 2001 From: Mark Raynsford Date: Sat, 7 Sep 2024 08:58:36 +0000 Subject: [PATCH 5/5] Mark release 2.0.0 --- README-CHANGES.xml | 6 ++++-- com.io7m.darco.api/pom.xml | 2 +- com.io7m.darco.examples/pom.xml | 2 +- com.io7m.darco.postgres/pom.xml | 2 +- com.io7m.darco.sqlite/pom.xml | 2 +- com.io7m.darco.templating/pom.xml | 2 +- com.io7m.darco.tests/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README-CHANGES.xml b/README-CHANGES.xml index 20df4f2..ade1d9f 100644 --- a/README-CHANGES.xml +++ b/README-CHANGES.xml @@ -4,9 +4,11 @@ - + - + + + diff --git a/com.io7m.darco.api/pom.xml b/com.io7m.darco.api/pom.xml index b6ce118..eb9dd5c 100644 --- a/com.io7m.darco.api/pom.xml +++ b/com.io7m.darco.api/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 2.0.0-SNAPSHOT + 2.0.0 com.io7m.darco.api diff --git a/com.io7m.darco.examples/pom.xml b/com.io7m.darco.examples/pom.xml index 9848fe4..f2c23a4 100644 --- a/com.io7m.darco.examples/pom.xml +++ b/com.io7m.darco.examples/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 2.0.0-SNAPSHOT + 2.0.0 com.io7m.darco.examples diff --git a/com.io7m.darco.postgres/pom.xml b/com.io7m.darco.postgres/pom.xml index a3306a1..0fd30ac 100644 --- a/com.io7m.darco.postgres/pom.xml +++ b/com.io7m.darco.postgres/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 2.0.0-SNAPSHOT + 2.0.0 com.io7m.darco.postgres diff --git a/com.io7m.darco.sqlite/pom.xml b/com.io7m.darco.sqlite/pom.xml index e87dc77..96f0836 100644 --- a/com.io7m.darco.sqlite/pom.xml +++ b/com.io7m.darco.sqlite/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 2.0.0-SNAPSHOT + 2.0.0 com.io7m.darco.sqlite diff --git a/com.io7m.darco.templating/pom.xml b/com.io7m.darco.templating/pom.xml index 13f514f..96f9c84 100644 --- a/com.io7m.darco.templating/pom.xml +++ b/com.io7m.darco.templating/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 2.0.0-SNAPSHOT + 2.0.0 com.io7m.darco.templating diff --git a/com.io7m.darco.tests/pom.xml b/com.io7m.darco.tests/pom.xml index 788f510..54ce5df 100644 --- a/com.io7m.darco.tests/pom.xml +++ b/com.io7m.darco.tests/pom.xml @@ -9,7 +9,7 @@ com.io7m.darco com.io7m.darco - 2.0.0-SNAPSHOT + 2.0.0 com.io7m.darco.tests diff --git a/pom.xml b/pom.xml index 4420422..2268e3f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.io7m.darco com.io7m.darco - 2.0.0-SNAPSHOT + 2.0.0 pom com.io7m.darco