Skip to content

Commit 7f5957d

Browse files
noboomunoboomu
committed
Bump version, min jdk is now 21 with virtual threads
1 parent fbd1af3 commit 7f5957d

File tree

10 files changed

+169
-152
lines changed

10 files changed

+169
-152
lines changed

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Proteus Changelog.
44
## Unreleased
55
### No issue
66

7+
**Rename SXG file suffix and remove legacy media types**
8+
9+
10+
[fbd1af3f9211dc8](https://github.com/noboomu/proteus/commit/fbd1af3f9211dc8) Joshua Bauer *2023-10-17 19:57:10*
11+
712
**Added SXG mime types.**
813

914

‎pom.xml

+15-50
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>io.sinistral</groupId>
66
<artifactId>proteus-project</artifactId>
77
<packaging>pom</packaging>
8-
<version>0.7.1-SNAPSHOT</version>
8+
<version>0.8.0-SNAPSHOT</version>
99
<name>Proteus Project</name>
1010

1111
<description>Proteus is a blazing fast minimalist Java API server framework built atop Undertow.</description>
@@ -49,7 +49,7 @@
4949
<jackson.version>2.15.2</jackson.version>
5050
<jakarta-ws-rs.version>3.1.0</jakarta-ws-rs.version>
5151
<jansi.version>1.18</jansi.version>
52-
<java.version>17</java.version>
52+
<java.version>21</java.version>
5353
<javapoet.version>1.13.0</javapoet.version>
5454
<logback-classic.version>1.2.11</logback-classic.version>
5555
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -64,45 +64,51 @@
6464
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
6565
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
6666
<openapi.version>2.2.16</openapi.version>
67-
<openhft-compiler.version>2.23ea0</openhft-compiler.version>
6867
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6968
<proteus.version>${project.version}</proteus.version>
7069
<reflections.version>0.10.2</reflections.version>
7170
<slf4j.version>1.7.36</slf4j.version>
7271
<snakeyaml.version>1.30</snakeyaml.version>
7372
<typesafe-config.version>1.4.2</typesafe-config.version>
74-
<undertow.version>2.2.18.Final</undertow.version>
73+
<undertow.version>2.3.10.Final</undertow.version>
7574
<woodstox.version>6.3.0</woodstox.version>
7675
<micrometer-core.version>1.9.1</micrometer-core.version>
7776
<jakarta-validation-api.version>3.0.2</jakarta-validation-api.version>
77+
<annotations.version>24.0.1</annotations.version>
78+
<junit-jupiter-api.version>5.8.2</junit-jupiter-api.version>
79+
<junit-vintage-engine.version>5.8.2</junit-vintage-engine.version>
80+
<rest-assured.version>5.3.0</rest-assured.version>
81+
<jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
82+
<jaxb-runtime.version>4.0.3</jaxb-runtime.version>
83+
<sourcebuddy.version>2.0.0</sourcebuddy.version>
7884
</properties>
7985

8086
<dependencies>
8187

8288
<dependency>
8389
<groupId>org.jetbrains</groupId>
8490
<artifactId>annotations</artifactId>
85-
<version>24.0.1</version>
91+
<version>${annotations.version}</version>
8692
</dependency>
8793

8894
<dependency>
8995
<groupId>org.junit.jupiter</groupId>
9096
<artifactId>junit-jupiter-api</artifactId>
91-
<version>5.8.2</version>
97+
<version>${junit-jupiter-api.version}</version>
9298
<scope>test</scope>
9399
</dependency>
94100

95101
<dependency>
96102
<groupId>org.junit.vintage</groupId>
97103
<artifactId>junit-vintage-engine</artifactId>
98-
<version>5.8.2</version>
104+
<version>${junit-vintage-engine.version}</version>
99105
<scope>test</scope>
100106
</dependency>
101107

102108
<dependency>
103109
<groupId>io.rest-assured</groupId>
104110
<artifactId>rest-assured</artifactId>
105-
<version>5.3.0</version>
111+
<version>${rest-assured.version}</version>
106112
<scope>test</scope>
107113
</dependency>
108114

@@ -112,24 +118,6 @@
112118
<version>${micrometer-core.version}</version>
113119
</dependency>
114120

115-
<!-- <dependency>-->
116-
<!-- <groupId>com.javax0.sourcebuddy</groupId>-->
117-
<!-- <artifactId>SourceBuddy</artifactId>-->
118-
<!-- <version>2.3.0</version>-->
119-
<!-- </dependency>-->
120-
121-
<!-- <dependency>-->
122-
<!-- <groupId>com.sun.xml.ws</groupId>-->
123-
<!-- <artifactId>jaxws-ri</artifactId>-->
124-
<!-- <version>4.0.1</version>-->
125-
<!-- <type>pom</type>-->
126-
<!-- <scope>import</scope>-->
127-
<!-- </dependency>-->
128-
129-
<!-- https://mvnrepository.com/artifact/jakarta.ws.rs/jakarta.ws.rs-api -->
130-
131-
132-
133121

134122
</dependencies>
135123

@@ -160,29 +148,6 @@
160148
</dependencies>
161149
</dependencyManagement>
162150

163-
<!-- <repositories>-->
164-
<!-- <repository>-->
165-
<!-- <id>sonatype-releases</id>-->
166-
<!-- <url>https://oss.sonatype.org/content/repositories/snapshots</url>-->
167-
<!-- <snapshots>-->
168-
<!-- <enabled>true</enabled>-->
169-
<!-- </snapshots>-->
170-
<!-- <releases>-->
171-
<!-- <enabled>false</enabled>-->
172-
<!-- </releases>-->
173-
<!-- </repository>-->
174-
<!-- <repository>-->
175-
<!-- <id>sonatype-snapshots</id>-->
176-
<!-- <url>https://oss.sonatype.org/content/repositories/snapshots</url>-->
177-
<!-- <snapshots>-->
178-
<!-- <enabled>true</enabled>-->
179-
<!-- </snapshots>-->
180-
<!-- <releases>-->
181-
<!-- <enabled>false</enabled>-->
182-
<!-- </releases>-->
183-
<!-- </repository>-->
184-
<!-- </repositories>-->
185-
186151
<repositories>
187152
<repository>
188153
<id>sonatype-snapshots</id>
@@ -217,7 +182,7 @@
217182

218183
<plugin>
219184
<artifactId>maven-jar-plugin</artifactId>
220-
<version>3.1.0</version>
185+
<version>${maven-jar-plugin.version}</version>
221186
<groupId>org.apache.maven.plugins</groupId>
222187
<configuration>
223188
<archive>

‎proteus-core/conf/logback-test.xml

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
<logger name="com.sun.jersey" level="ERROR" />
2121

22-
23-
<logger name="net.openhft.compiler" level="ERROR" />
2422
<logger name="org.xnio" level="ERROR" />
2523
<logger name="io.undertow" level="DEBUG" />
2624
<logger name="org.reflections" level="OFF" />

‎proteus-core/conf/logback.xml

-2
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,13 @@
2727

2828
<logger name="com.sun.jersey" level="ERROR" />
2929

30-
<logger name="net.openhft.compiler" level="ERROR" />
3130
<logger name="org.xnio" level="ERROR" />
3231
<logger name="io.undertow" level="ERROR" />
3332
<logger name="org.reflections" level="OFF" />
3433
<logger name="io.swagger.converter" level="ERROR" />
3534
<logger name="io.swagger.jackson" level="ERROR" />
3635
<logger name="io.swagger.v3" level="ERROR" />
3736
<logger name="swagger" level="ERROR" />
38-
<logger name="net.openhft" level="ERROR" />
3937

4038
<logger name="javax.management" level="ERROR" />
4139
<logger name="javax.management.mbeanserver" level="OFF" />

‎proteus-core/pom.xml

+7-70
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>proteus-project</artifactId>
66
<groupId>io.sinistral</groupId>
7-
<version>0.7.1-SNAPSHOT</version>
7+
<version>0.8.0-SNAPSHOT</version>
88
</parent>
99
<properties>
1010
<jakarta.activation-api.version>2.1.2</jakarta.activation-api.version>
@@ -92,7 +92,6 @@ Proteus Changelog.
9292
<plugin>
9393
<groupId>org.apache.maven.plugins</groupId>
9494
<artifactId>maven-jar-plugin</artifactId>
95-
<version>3.1.0</version>
9695
<executions>
9796
<execution>
9897
<goals>
@@ -109,17 +108,14 @@ Proteus Changelog.
109108
<plugin>
110109
<groupId>org.apache.maven.plugins</groupId>
111110
<artifactId>maven-source-plugin</artifactId>
112-
<version>3.2.1</version>
113111
</plugin>
114112
<plugin>
115113
<groupId>org.apache.maven.plugins</groupId>
116114
<artifactId>maven-javadoc-plugin</artifactId>
117-
<version>3.2.0</version>
118115
</plugin>
119116
<plugin>
120117
<artifactId>maven-surefire-plugin</artifactId>
121118
<groupId>org.apache.maven.plugins</groupId>
122-
<version>3.0.0-M4</version>
123119
</plugin>
124120
<plugin>
125121
<groupId>org.apache.maven.plugins</groupId>
@@ -128,7 +124,6 @@ Proteus Changelog.
128124
<plugin>
129125
<groupId>org.sonatype.plugins</groupId>
130126
<artifactId>nexus-staging-maven-plugin</artifactId>
131-
<version>1.6.8</version>
132127
</plugin>
133128
<plugin>
134129
<groupId>org.apache.maven.plugins</groupId>
@@ -147,6 +142,8 @@ Proteus Changelog.
147142
<arg>--add-opens=java.base/java.lang=ALL-UNNAMED --illegal-access=deny</arg>
148143
</compilerArgs>
149144
<encoding>UTF-8</encoding>
145+
<source>19</source>
146+
<target>19</target>
150147
</configuration>
151148
</plugin>
152149
</plugins>
@@ -205,43 +202,27 @@ Proteus Changelog.
205202
<dependency>
206203
<groupId>jakarta.validation</groupId>
207204
<artifactId>jakarta.validation-api</artifactId>
208-
<version>3.0.2</version>
205+
<version>${jakarta-validation-api.version}</version>
209206
</dependency>
210207

211208
<dependency>
212209
<groupId>jakarta.xml.bind</groupId>
213210
<artifactId>jakarta.xml.bind-api</artifactId>
214-
<version>4.0.1</version>
211+
<version>${jakarta.xml.bind-api.version}</version>
215212
<scope>provided</scope>
216213
</dependency>
217214

218215
<dependency>
219216
<groupId>org.glassfish.jaxb</groupId>
220217
<artifactId>jaxb-runtime</artifactId>
221-
<version>4.0.3</version>
218+
<version>${jaxb-runtime.version}</version>
222219
</dependency>
223220

224221

225-
<!-- <dependency>-->
226-
<!-- <groupId>net.openhft</groupId>-->
227-
<!-- <artifactId>compiler</artifactId>-->
228-
<!-- <version>${openhft-compiler.version}</version>-->
229-
<!-- <exclusions>-->
230-
<!-- <exclusion>-->
231-
<!-- <groupId>org.slf4j</groupId>-->
232-
<!-- <artifactId>slf4j-api</artifactId>-->
233-
<!-- </exclusion>-->
234-
<!-- <exclusion>-->
235-
<!-- <groupId>com.sun.java</groupId>-->
236-
<!-- <artifactId>tools</artifactId>-->
237-
<!-- </exclusion>-->
238-
<!-- </exclusions>-->
239-
<!-- </dependency>-->
240-
241222
<dependency>
242223
<groupId>com.javax0.sourcebuddy</groupId>
243224
<artifactId>SourceBuddy</artifactId>
244-
<version>2.0.0</version>
225+
<version>${sourcebuddy.version}</version>
245226
</dependency>
246227

247228
<dependency>
@@ -356,50 +337,6 @@ Proteus Changelog.
356337
<scope>compile</scope>
357338
</dependency>
358339

359-
360-
<!--<dependency>-->
361-
<!--<groupId>org.eclipse.microprofile.health</groupId>-->
362-
<!--<artifactId>microprofile-health-api</artifactId>-->
363-
<!--<version>1.0</version>-->
364-
<!--</dependency>-->
365-
366-
<!--<dependency>-->
367-
<!--<groupId>org.eclipse.microprofile.metrics</groupId>-->
368-
<!--<artifactId>microprofile-metrics-api</artifactId>-->
369-
<!--<version>1.1.1</version>-->
370-
<!--</dependency>-->
371-
372-
<!--<dependency>-->
373-
<!--<groupId>org.eclipse.microprofile.fault-tolerance</groupId>-->
374-
<!--<artifactId>microprofile-fault-tolerance-api</artifactId>-->
375-
<!--<version>1.1.3</version>-->
376-
<!--</dependency>-->
377-
378-
<!--<dependency>-->
379-
<!--<groupId>org.eclipse.microprofile.openapi</groupId>-->
380-
<!--<artifactId>microprofile-openapi-api</artifactId>-->
381-
<!--<version>2.0-MR1</version>-->
382-
<!--<scope>provided</scope>-->
383-
<!--</dependency>-->
384-
385-
<!--<dependency>-->
386-
<!--<groupId>io.jsonwebtoken</groupId>-->
387-
<!--<artifactId>jjwt-api</artifactId>-->
388-
<!--<version>0.10.5</version>-->
389-
<!--</dependency>-->
390-
<!--<dependency>-->
391-
<!--<groupId>io.jsonwebtoken</groupId>-->
392-
<!--<artifactId>jjwt-impl</artifactId>-->
393-
<!--<version>0.10.5</version>-->
394-
<!--<scope>runtime</scope>-->
395-
<!--</dependency>-->
396-
<!--<dependency>-->
397-
<!--<groupId>io.jsonwebtoken</groupId>-->
398-
<!--<artifactId>jjwt-jackson</artifactId>-->
399-
<!--<version>0.10.5</version>-->
400-
<!--<scope>runtime</scope>-->
401-
<!--</dependency>-->
402-
403340
</dependencies>
404341

405342
<distributionManagement>

0 commit comments

Comments
 (0)