Skip to content

Commit 23bd223

Browse files
Copilottipsy
Copilot
and
tipsy
committed
Create simplified version bump PR: Update to 7.0.0-SNAPSHOT with Java 17
Co-authored-by: tipsy <[email protected]>
1 parent 87bae5a commit 23bd223

File tree

34 files changed

+287
-733
lines changed

34 files changed

+287
-733
lines changed

‎javalin-bundle/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>javalin-parent</artifactId>
55
<groupId>io.javalin</groupId>
6-
<version>6.7.1-SNAPSHOT</version>
6+
<version>7.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

@@ -58,7 +58,7 @@
5858
<!-- necessary for HTTP/2 and ALPN (application layer protocol negotiation) -->
5959
<dependency>
6060
<groupId>org.eclipse.jetty.http2</groupId>
61-
<artifactId>jetty-http2-server</artifactId>
61+
<artifactId>http2-server</artifactId>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.eclipse.jetty</groupId>

‎javalin-micrometer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>javalin-parent</artifactId>
55
<groupId>io.javalin</groupId>
6-
<version>6.7.1-SNAPSHOT</version>
6+
<version>7.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎javalin-micrometer/src/main/java/io/javalin/micrometer/MicrometerPlugin.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import io.micrometer.core.instrument.Tags
2020
import io.micrometer.core.instrument.binder.http.DefaultHttpJakartaServletRequestTagsProvider
2121
import io.micrometer.core.instrument.binder.jetty.JettyConnectionMetrics
2222
import io.micrometer.core.instrument.binder.jetty.JettyServerThreadPoolMetrics
23-
// import io.micrometer.jetty11.TimedHandler // Temporarily commented out for Jetty 12 compatibility
23+
import io.micrometer.jetty11.TimedHandler
2424
import jakarta.servlet.http.HttpServletRequest
2525
import jakarta.servlet.http.HttpServletResponse
2626
import java.util.function.Consumer
@@ -56,9 +56,6 @@ class MicrometerPlugin(config: Consumer<MicrometerPluginConfig>) : Plugin<Microm
5656
}
5757

5858
config.jetty.modifyServer { server ->
59-
// TODO: Jetty 12 migration - TimedHandler needs to be updated for Jetty 12 compatibility
60-
// Temporarily commented out until micrometer-jetty12 is available
61-
/*
6259
server.insertHandler(TimedHandler(pluginConfig.registry, pluginConfig.tags, object : DefaultHttpJakartaServletRequestTagsProvider() {
6360
override fun getTags(request: HttpServletRequest, response: HttpServletResponse): Iterable<Tag> {
6461
val exceptionName = if (pluginConfig.tagExceptionName) {
@@ -82,7 +79,6 @@ class MicrometerPlugin(config: Consumer<MicrometerPluginConfig>) : Plugin<Microm
8279
)
8380
}
8481
}))
85-
*/
8682

8783
JettyServerThreadPoolMetrics(server.threadPool, pluginConfig.tags).bindTo(pluginConfig.registry)
8884
config.events.serverStarted {

‎javalin-osgi/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>javalin-parent</artifactId>
55
<groupId>io.javalin</groupId>
6-
<version>6.7.1-SNAPSHOT</version>
6+
<version>7.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎javalin-rendering/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>javalin-parent</artifactId>
55
<groupId>io.javalin</groupId>
6-
<version>6.7.1-SNAPSHOT</version>
6+
<version>7.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎javalin-ssl/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.javalin</groupId>
66
<artifactId>javalin-parent</artifactId>
7-
<version>6.7.1-SNAPSHOT</version>
7+
<version>7.0.0-SNAPSHOT</version>
88
</parent>
99

1010
<groupId>io.javalin.community.ssl</groupId>
@@ -71,11 +71,7 @@
7171
</dependency>
7272
<dependency>
7373
<groupId>org.eclipse.jetty.http2</groupId>
74-
<artifactId>jetty-http2-client-transport</artifactId>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.eclipse.jetty.http2</groupId>
78-
<artifactId>jetty-http2-server</artifactId>
74+
<artifactId>http2-server</artifactId>
7975
</dependency>
8076
<dependency>
8177
<groupId>org.eclipse.jetty</groupId>

‎javalin-testtools/pom.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>javalin-parent</artifactId>
55
<groupId>io.javalin</groupId>
6-
<version>6.7.1-SNAPSHOT</version>
6+
<version>7.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

@@ -56,13 +56,11 @@
5656
<dependency>
5757
<groupId>org.eclipse.jetty</groupId>
5858
<artifactId>jetty-server</artifactId>
59-
<version>${jetty.version}</version>
6059
<scope>test</scope>
6160
</dependency>
6261
<dependency>
63-
<groupId>org.eclipse.jetty.ee10</groupId>
64-
<artifactId>jetty-ee10-servlet</artifactId>
65-
<version>${jetty.version}</version>
62+
<groupId>org.eclipse.jetty</groupId>
63+
<artifactId>jetty-servlet</artifactId>
6664
<scope>test</scope>
6765
</dependency>
6866
<dependency>

‎javalin-utils/coverage/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.javalin</groupId>
77
<artifactId>javalin-utils</artifactId>
8-
<version>6.7.1-SNAPSHOT</version>
8+
<version>7.0.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>coverage</artifactId>

‎javalin-utils/javalin-context-mock/pom.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>javalin-utils</artifactId>
55
<groupId>io.javalin</groupId>
6-
<version>6.7.1-SNAPSHOT</version>
6+
<version>7.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

@@ -61,15 +61,14 @@
6161
<scope>test</scope>
6262
</dependency>
6363
<dependency>
64-
<groupId>org.eclipse.jetty.ee10</groupId>
65-
<artifactId>jetty-ee10-servlet</artifactId>
64+
<groupId>org.eclipse.jetty</groupId>
65+
<artifactId>jetty-servlet</artifactId>
6666
<version>${jetty.version}</version>
6767
<scope>test</scope>
6868
</dependency>
6969
<dependency>
70-
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
71-
<artifactId>jetty-ee10-websocket-jetty-server</artifactId>
72-
<version>${jetty.version}</version>
70+
<groupId>org.eclipse.jetty.websocket</groupId>
71+
<artifactId>websocket-jetty-server</artifactId>
7372
<scope>test</scope>
7473
</dependency>
7574
<dependency>

‎javalin-utils/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>javalin-parent</artifactId>
55
<groupId>io.javalin</groupId>
6-
<version>6.7.1-SNAPSHOT</version>
6+
<version>7.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

0 commit comments

Comments
 (0)