diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c5965d..cd66655 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ Proteus Changelog. ## Unreleased ### No issue +**Make controller compilation synchronous.** + + +[638ef73f7a867cc](https://github.com/noboomu/proteus/commit/638ef73f7a867cc) Joshua Bauer *2023-09-28 21:25:43* + **Migrate to Jakarta.** diff --git a/pom.xml b/pom.xml index e5aeda2..ffbbdf6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 io.sinistral proteus-project pom - 0.7.0-SNAPSHOT + 0.7.1-SNAPSHOT Proteus Project Proteus is a blazing fast minimalist Java API server framework built atop Undertow. @@ -36,7 +34,7 @@ scm:git:git://github.com/noboomu/proteus.git scm:git:ssh://github.com/noboomu/proteus.git - http://github.com/noboomu/proteus/tree/master + https://github.com/noboomu/proteus/tree/master HEAD @@ -120,12 +118,17 @@ - - com.sun.xml.ws - jaxws-ri - 4.0.1 - pom - + + + + + + + + + + + @@ -261,15 +264,6 @@ -Dconfig.file=src/test/resources/application.conf -Dlogback.configuration=src/test/resources/logback-test.xml - --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED - --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED - --add-exports=java.base/sun.nio.ch=ALL-UNNAMED - --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED - --add-opens=jdk.compiler/com.sun.tools.javac=ALL-UNNAMED - --add-opens=java.base/java.lang=ALL-UNNAMED - --add-opens=java.base/java.lang.reflect=ALL-UNNAMED - --add-opens=java.base/java.io=ALL-UNNAMED - --add-opens=java.base/java.util=ALL-UNNAMED @@ -461,15 +455,6 @@ -Dconfig.file=src/test/resources/application.conf -Dlogback.configuration=src/test/resources/logback-test.xml - --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED - --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED - --add-exports=java.base/sun.nio.ch=ALL-UNNAMED - --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED - --add-opens=jdk.compiler/com.sun.tools.javac=ALL-UNNAMED - --add-opens=java.base/java.lang=ALL-UNNAMED - --add-opens=java.base/java.lang.reflect=ALL-UNNAMED - --add-opens=java.base/java.io=ALL-UNNAMED - --add-opens=java.base/java.util=ALL-UNNAMED diff --git a/proteus-core/pom.xml b/proteus-core/pom.xml index 5dfcb72..2dfe802 100644 --- a/proteus-core/pom.xml +++ b/proteus-core/pom.xml @@ -1,11 +1,10 @@ - proteus-project io.sinistral - 0.7.0-SNAPSHOT + 0.7.1-SNAPSHOT 2.1.2 @@ -189,25 +188,40 @@ Proteus Changelog. ${slf4j.version} + jakarta.ws.rs jakarta.ws.rs-api ${jakarta-ws-rs.version} + + + jakarta.activation + jakarta.activation-api + ${jakarta.activation-api.version} + + jakarta.validation jakarta.validation-api - ${jakarta-validation-api.version} + 3.0.2 + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.1 + provided + - jakarta.activation - jakarta.activation-api - ${jakarta.activation-api.version} + org.glassfish.jaxb + jaxb-runtime + 4.0.3 + diff --git a/proteus-core/src/main/java/io/sinistral/proteus/protocol/MediaType.java b/proteus-core/src/main/java/io/sinistral/proteus/protocol/MediaType.java index d32f5cf..94493b3 100644 --- a/proteus-core/src/main/java/io/sinistral/proteus/protocol/MediaType.java +++ b/proteus-core/src/main/java/io/sinistral/proteus/protocol/MediaType.java @@ -50,6 +50,7 @@ public class MediaType { public static final MediaType APPLICATION_BBOLIN = create("application/bbolin", "lin"); public static final MediaType APPLICATION_CAP = create("application/cap", "cap", "pcap"); public static final MediaType APPLICATION_CCXML_XML = create("application/ccxml+xml", "ccxml"); + public static final MediaType APPLICATION_CERT_CHAIN_CBOR = create("application/cert-chain+cbor", "cbor"); public static final MediaType APPLICATION_CDMI_CAPABILITY = create("application/cdmi-capability", "cdmia"); public static final MediaType APPLICATION_CDMI_CONTAINER = create("application/cdmi-container", "cdmic"); public static final MediaType APPLICATION_CDMI_DOMAIN = create("application/cdmi-domain", "cdmid"); @@ -156,7 +157,8 @@ public class MediaType { "SETPAY"); public static final MediaType APPLICATION_SET_REGISTRATION_INITIATION = create( "APPLICATION/SET-REGISTRATION-INITIATION", "SETREG"); - public static final MediaType APPLICATION_SHF_XML = create("application/shf+xml", "shf"); + public static final MediaType APPLICATION_SHF_XML = create("application/signed-exchange;v=b3", "sxgs"); + public static final MediaType APPLICATION_SIGNED_EXCHANGE = create("application/shf+xml", "shf"); public static final MediaType APPLICATION_SLA = create("application/sla", "stl"); public static final MediaType APPLICATION_SMIL = create("application/smil", "smi", "smil"); public static final MediaType APPLICATION_SMIL_XML = create("application/smil+xml", "smi", "smil"); diff --git a/proteus-openapi/pom.xml b/proteus-openapi/pom.xml index 1e29768..6f72359 100644 --- a/proteus-openapi/pom.xml +++ b/proteus-openapi/pom.xml @@ -1,10 +1,9 @@ - + proteus-project io.sinistral - 0.7.0-SNAPSHOT + 0.7.1-SNAPSHOT 4.0.0