diff --git a/apps/openliberty/pom.xml b/apps/openliberty/pom.xml index 0949d0c00..f7065b729 100644 --- a/apps/openliberty/pom.xml +++ b/apps/openliberty/pom.xml @@ -32,23 +32,17 @@ pom import + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + - - jakarta.platform - jakarta.jakartaee-api - ${jakarta.platform.version} - provided - - - org.eclipse.microprofile - microprofile - pom - provided - - org.trellisldp trellis-api @@ -134,6 +128,12 @@ trellis-triplestore ${project.version} + + jakarta.platform + jakarta.jakartaee-api + ${jakarta.platform.version} + provided + diff --git a/apps/quarkus/pom.xml b/apps/quarkus/pom.xml index ea716a311..7a917351d 100644 --- a/apps/quarkus/pom.xml +++ b/apps/quarkus/pom.xml @@ -201,13 +201,13 @@ org.apache.maven.plugins maven-surefire-plugin - - ${project.build.directory} - ${project.build.directory}/data/binaries - ${project.build.directory}/data/mementos - https://www.trellisldp.org/tests/jwks.json - ${project.build.directory}/data/rdf - + + ${project.build.directory} + ${project.build.directory}/data/binaries + ${project.build.directory}/data/mementos + https://www.trellisldp.org/tests/jwks.json + ${project.build.directory}/data/rdf + diff --git a/trellis-api/pom.xml b/trellis-api/pom.xml index 31dbacbc7..e65b68f7c 100644 --- a/trellis-api/pom.xml +++ b/trellis-api/pom.xml @@ -19,11 +19,22 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided diff --git a/trellis-app/pom.xml b/trellis-app/pom.xml index b134b5f54..193646092 100644 --- a/trellis-app/pom.xml +++ b/trellis-app/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -36,14 +48,13 @@ ${project.version} - jakarta.xml.bind - jakarta.xml.bind-api + jakarta.platform + jakarta.jakartaee-core-api provided - org.eclipse.microprofile - microprofile - pom + jakarta.xml.bind + jakarta.xml.bind-api provided diff --git a/trellis-audit/pom.xml b/trellis-audit/pom.xml index 4ced11054..f963d02b4 100644 --- a/trellis-audit/pom.xml +++ b/trellis-audit/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -31,9 +43,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided diff --git a/trellis-cache/pom.xml b/trellis-cache/pom.xml index d1968ce1e..4823d7831 100644 --- a/trellis-cache/pom.xml +++ b/trellis-cache/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -26,9 +38,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided diff --git a/trellis-cdi/pom.xml b/trellis-cdi/pom.xml index c573a6854..d651ec36c 100644 --- a/trellis-cdi/pom.xml +++ b/trellis-cdi/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -31,9 +43,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided diff --git a/trellis-common/pom.xml b/trellis-common/pom.xml index d24c65d82..ef9baea51 100644 --- a/trellis-common/pom.xml +++ b/trellis-common/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -31,9 +43,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided @@ -41,6 +52,11 @@ jakarta.xml.bind-api provided + + org.eclipse.microprofile.config + microprofile-config-api + provided + org.apache.commons commons-rdf-api diff --git a/trellis-constraint/pom.xml b/trellis-constraint/pom.xml index dabf5c4a6..f4c2019d4 100644 --- a/trellis-constraint/pom.xml +++ b/trellis-constraint/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -31,9 +43,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided diff --git a/trellis-file/pom.xml b/trellis-file/pom.xml index 568fd313b..5ff4eae6c 100644 --- a/trellis-file/pom.xml +++ b/trellis-file/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -31,9 +43,13 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api + provided + + + org.eclipse.microprofile.config + microprofile-config-api provided diff --git a/trellis-http/pom.xml b/trellis-http/pom.xml index 7f1f852e0..e7313d3ab 100644 --- a/trellis-http/pom.xml +++ b/trellis-http/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -36,9 +48,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided @@ -46,6 +57,21 @@ jakarta.xml.bind-api provided + + org.eclipse.microprofile.config + microprofile-config-api + provided + + + org.eclipse.microprofile.openapi + microprofile-openapi-api + provided + + + org.eclipse.microprofile.metrics + microprofile-metrics-api + provided + org.apache.commons commons-rdf-api diff --git a/trellis-jdbc/pom.xml b/trellis-jdbc/pom.xml index 6baa24f72..abe656200 100644 --- a/trellis-jdbc/pom.xml +++ b/trellis-jdbc/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -31,9 +43,18 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api + provided + + + org.eclipse.microprofile.config + microprofile-config-api + provided + + + org.eclipse.microprofile.health + microprofile-health-api provided diff --git a/trellis-jena/pom.xml b/trellis-jena/pom.xml index d894724f2..0161c3201 100644 --- a/trellis-jena/pom.xml +++ b/trellis-jena/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -31,9 +43,13 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api + provided + + + org.eclipse.microprofile.config + microprofile-config-api provided diff --git a/trellis-jwt/pom.xml b/trellis-jwt/pom.xml index b25db0bb4..42e2be8c8 100644 --- a/trellis-jwt/pom.xml +++ b/trellis-jwt/pom.xml @@ -9,7 +9,6 @@ ../trellis-parent - org.trellisldp trellis-jwt 0.20.0-SNAPSHOT @@ -20,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -32,9 +43,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided @@ -42,6 +52,16 @@ jakarta.xml.bind-api provided + + org.eclipse.microprofile.config + microprofile-config-api + provided + + + org.eclipse.microprofile.jwt + microprofile-jwt-auth-api + provided + org.apache.commons commons-rdf-api @@ -107,7 +127,7 @@ maven-surefire-plugin - --add-modules jakarta.el + --add-opens java.base/java.lang=ALL-UNNAMED diff --git a/trellis-namespace/pom.xml b/trellis-namespace/pom.xml index 82ac3e6fc..0d7aa55f9 100644 --- a/trellis-namespace/pom.xml +++ b/trellis-namespace/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -31,9 +43,13 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api + provided + + + org.eclipse.microprofile.config + microprofile-config-api provided diff --git a/trellis-notification-jackson/pom.xml b/trellis-notification-jackson/pom.xml index f0dade384..59848af77 100644 --- a/trellis-notification-jackson/pom.xml +++ b/trellis-notification-jackson/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -31,9 +43,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided diff --git a/trellis-notification-jsonb/pom.xml b/trellis-notification-jsonb/pom.xml index 269f2dabc..df691d28c 100644 --- a/trellis-notification-jsonb/pom.xml +++ b/trellis-notification-jsonb/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -31,9 +43,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided diff --git a/trellis-parent/pom.xml b/trellis-parent/pom.xml index 78de6c4bf..dc0463e8d 100644 --- a/trellis-parent/pom.xml +++ b/trellis-parent/pom.xml @@ -21,6 +21,10 @@ UTF-8 UTF-8 + + 6.0 + 10.0.0 + 1.16.0 2.14.0 @@ -29,13 +33,8 @@ 1.10.0 32.1.3-jre 2.15.2 - - 6.0 - 10.0.0 4.0.1 - 3.41.3 - 3.1.3 4.9.0 0.9.11 3.4.1 @@ -54,6 +53,7 @@ 4.2.0 5.10.0 2.2 + 3.1.3 4.24.0 5.6.0 5.3.2 @@ -65,17 +65,16 @@ + + jakarta.platform + jakarta.jakartaee-core-api + ${jakarta.platform.version} + jakarta.xml.bind jakarta.xml.bind-api ${jakarta.xml.bind.version} - - org.eclipse.microprofile - microprofile - pom - ${microprofile.version} - commons-codec commons-codec @@ -83,13 +82,13 @@ org.apache.commons - commons-rdf-api - ${commons.rdf.version} + commons-lang3 + ${commons.lang3.version} org.apache.commons - commons-lang3 - ${commons.lang3.version} + commons-rdf-api + ${commons.rdf.version} org.apache.jena diff --git a/trellis-rdfa/pom.xml b/trellis-rdfa/pom.xml index 589a80103..641c456eb 100644 --- a/trellis-rdfa/pom.xml +++ b/trellis-rdfa/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -31,9 +43,13 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api + provided + + + org.eclipse.microprofile.config + microprofile-config-api provided diff --git a/trellis-reactive/pom.xml b/trellis-reactive/pom.xml index b237638b4..41eeef85c 100644 --- a/trellis-reactive/pom.xml +++ b/trellis-reactive/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -26,9 +38,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided diff --git a/trellis-test/pom.xml b/trellis-test/pom.xml index 0d48f17c0..f69f47e63 100644 --- a/trellis-test/pom.xml +++ b/trellis-test/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -41,9 +53,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided diff --git a/trellis-triplestore/pom.xml b/trellis-triplestore/pom.xml index 931d81126..7b0a69e4c 100644 --- a/trellis-triplestore/pom.xml +++ b/trellis-triplestore/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -31,9 +43,18 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api + provided + + + org.eclipse.microprofile.config + microprofile-config-api + provided + + + org.eclipse.microprofile.health + microprofile-health-api provided diff --git a/trellis-webac/pom.xml b/trellis-webac/pom.xml index 33b1bf9ae..b5dd77139 100644 --- a/trellis-webac/pom.xml +++ b/trellis-webac/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -36,9 +48,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided @@ -46,6 +57,16 @@ jakarta.xml.bind-api provided + + org.eclipse.microprofile.config + microprofile-config-api + provided + + + org.eclipse.microprofile.metrics + microprofile-metrics-api + provided + org.apache.commons commons-rdf-api diff --git a/trellis-webdav/pom.xml b/trellis-webdav/pom.xml index cc0bc07e6..3cbb750c4 100644 --- a/trellis-webdav/pom.xml +++ b/trellis-webdav/pom.xml @@ -19,6 +19,18 @@ jar + + + + org.eclipse.microprofile + microprofile + ${microprofile.version} + pom + import + + + + org.trellisldp @@ -36,9 +48,8 @@ ${project.version} - org.eclipse.microprofile - microprofile - pom + jakarta.platform + jakarta.jakartaee-core-api provided @@ -46,6 +57,16 @@ jakarta.xml.bind-api provided + + org.eclipse.microprofile.config + microprofile-config-api + provided + + + org.eclipse.microprofile.metrics + microprofile-metrics-api + provided + org.apache.commons commons-rdf-api