Added SXG mime types.

noboomu · Oct 17, 2023 · 294bc67 · 294bc67
1 parent 638ef73
commit 294bc67
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 40 deletions.
diff --git 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
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.sinistral</groupId>
     <artifactId>proteus-project</artifactId>
     <packaging>pom</packaging>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.7.1-SNAPSHOT</version>
     <name>Proteus Project</name>
 
     <description>Proteus is a blazing fast minimalist Java API server framework built atop Undertow.</description>
@@ -36,7 +34,7 @@
     <scm>
         <connection>scm:git:git://github.com/noboomu/proteus.git</connection>
         <developerConnection>scm:git:ssh://github.com/noboomu/proteus.git</developerConnection>
-        <url>http://github.com/noboomu/proteus/tree/master</url>
+        <url>https://github.com/noboomu/proteus/tree/master</url>
         <tag>HEAD</tag>
     </scm>
 
@@ -120,12 +118,17 @@
         <!--            <version>2.3.0</version>-->
         <!--        </dependency>-->
 
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-ri</artifactId>
-            <version>4.0.1</version>
-            <type>pom</type>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.sun.xml.ws</groupId>-->
+<!--            <artifactId>jaxws-ri</artifactId>-->
+<!--            <version>4.0.1</version>-->
+<!--            <type>pom</type>-->
+<!--            <scope>import</scope>-->
+<!--        </dependency>-->
+
+        <!-- https://mvnrepository.com/artifact/jakarta.ws.rs/jakarta.ws.rs-api -->
+
+
 
 
     </dependencies>
@@ -261,15 +264,6 @@
                 <configuration>
                     <argLine>-Dconfig.file=src/test/resources/application.conf</argLine>
                     <argLine>-Dlogback.configuration=src/test/resources/logback-test.xml</argLine>
-                    <argLine>--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</argLine>
-                    <argLine>--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED</argLine>
-                    <argLine>--add-exports=java.base/sun.nio.ch=ALL-UNNAMED</argLine>
-                    <argLine>--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</argLine>
-                    <argLine>--add-opens=jdk.compiler/com.sun.tools.javac=ALL-UNNAMED</argLine>
-                    <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
-                    <argLine>--add-opens=java.base/java.lang.reflect=ALL-UNNAMED</argLine>
-                    <argLine>--add-opens=java.base/java.io=ALL-UNNAMED</argLine>
-                    <argLine>--add-opens=java.base/java.util=ALL-UNNAMED</argLine>
 
                 </configuration>
             </plugin>
@@ -461,15 +455,6 @@
                     <configuration>
                         <argLine>-Dconfig.file=src/test/resources/application.conf</argLine>
                         <argLine>-Dlogback.configuration=src/test/resources/logback-test.xml</argLine>
-                        <argLine>--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</argLine>
-                        <argLine>--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED</argLine>
-                        <argLine>--add-exports=java.base/sun.nio.ch=ALL-UNNAMED</argLine>
-                        <argLine>--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</argLine>
-                        <argLine>--add-opens=jdk.compiler/com.sun.tools.javac=ALL-UNNAMED</argLine>
-                        <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
-                        <argLine>--add-opens=java.base/java.lang.reflect=ALL-UNNAMED</argLine>
-                        <argLine>--add-opens=java.base/java.io=ALL-UNNAMED</argLine>
-                        <argLine>--add-opens=java.base/java.util=ALL-UNNAMED</argLine>
                     </configuration>
                 </plugin>
 

diff --git a/proteus-core/pom.xml b/proteus-core/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>proteus-project</artifactId>
         <groupId>io.sinistral</groupId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
     </parent>
     <properties>
         <jakarta.activation-api.version>2.1.2</jakarta.activation-api.version>
@@ -189,25 +188,40 @@ Proteus Changelog.
             <version>${slf4j.version}</version>
         </dependency>
 
+
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
             <version>${jakarta-ws-rs.version}</version>
         </dependency>
 
+
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+            <version>${jakarta.activation-api.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
-            <version>${jakarta-validation-api.version}</version>
+            <version>3.0.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>4.0.1</version>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <version>${jakarta.activation-api.version}</version>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>4.0.3</version>
         </dependency>
 
+
         <!--        <dependency>-->
         <!--            <groupId>net.openhft</groupId>-->
         <!--            <artifactId>compiler</artifactId>-->

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
@@ -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
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>proteus-project</artifactId>
         <groupId>io.sinistral</groupId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>