Skip to content

Commit 9b32cca

Browse files
grgrzybekmattrpav
authored andcommitted
[Jetty 12] Use proper jetty-ee9-maven-plugin
1 parent 7327ce7 commit 9b32cca

3 files changed

Lines changed: 28 additions & 26 deletions

File tree

activemq-web-console/pom.xml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,18 @@
5252
</configuration>
5353
</plugin>
5454
<plugin>
55-
<groupId>${jetty.maven.groupid}</groupId>
56-
<artifactId>jetty-maven-plugin</artifactId>
55+
<groupId>org.eclipse.jetty.ee9</groupId>
56+
<artifactId>jetty-ee9-maven-plugin</artifactId>
5757
<version>${jetty-version}</version>
5858
<configuration>
59-
<connectors>
60-
<connector implementation="org.eclipse.jetty.server.ServerConnector">
61-
<port>${jetty.port}</port>
62-
<maxIdleTime>60000</maxIdleTime>
63-
</connector>
64-
</connectors>
65-
66-
<webAppConfig>
59+
<httpConnector>
60+
<port>${jetty.port}</port>
61+
<idleTimeout>60000</idleTimeout>
62+
</httpConnector>
63+
<scan>10</scan>
64+
<webApp>
6765
<contextPath>/</contextPath>
68-
</webAppConfig>
66+
</webApp>
6967

7068
<systemProperties>
7169
<!-- enable easy connection to JConsole -->
@@ -100,7 +98,6 @@
10098
</systemProperty>
10199
-->
102100
</systemProperties>
103-
<scanIntervalSeconds>10</scanIntervalSeconds>
104101
</configuration>
105102
</plugin>
106103
<plugin>
@@ -288,18 +285,24 @@
288285
<scope>provided</scope>
289286
</dependency>
290287

291-
<!-- Tag Libs -->
288+
<!-- Tag Libs -->
289+
<!--
290+
These two should be available either in the WAR itself or from the container. We can't configure
291+
jetty-ee9-maven-plugin with <useProvidedScope>true</useProvidedScope> because we don't need ALL provided
292+
dependencies. But we shouldn't build the WAR with these two included either, because _full_ web container
293+
may provide own taglibs... Not me to decide ;)
294+
-->
292295
<dependency>
293296
<groupId>jakarta.servlet.jsp.jstl</groupId>
294297
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
295298
<version>3.0.0</version>
296-
<scope>provided</scope>
299+
<!-- <scope>provided</scope>-->
297300
</dependency>
298301
<dependency>
299302
<groupId>org.glassfish.web</groupId>
300303
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
301304
<version>3.0.1</version>
302-
<scope>provided</scope>
305+
<!-- <scope>provided</scope>-->
303306
</dependency>
304307
<!--
305308
<dependency>

activemq-web-demo/pom.xml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,15 @@
3333
<build>
3434
<plugins>
3535
<plugin>
36-
<groupId>org.eclipse.jetty</groupId>
37-
<artifactId>jetty-maven-plugin</artifactId>
36+
<groupId>org.eclipse.jetty.ee9</groupId>
37+
<artifactId>jetty-ee9-maven-plugin</artifactId>
3838
<configuration>
39-
<connectors>
40-
<connector implementation="org.eclipse.jetty.server.ServerConnector">
41-
<port>${jetty.port}</port>
42-
<maxIdleTime>60000</maxIdleTime>
43-
</connector>
44-
</connectors>
45-
<scanIntervalSeconds>10</scanIntervalSeconds>
39+
<httpConnector>
40+
<port>${jetty.port}</port>
41+
<idleTimeout>60000</idleTimeout>
42+
</httpConnector>
43+
<scan>10</scan>
44+
<useTestScope>true</useTestScope>
4645
</configuration>
4746
</plugin>
4847

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,8 +1048,8 @@
10481048
<version>${javacc-maven-plugin-version}</version>
10491049
</plugin>
10501050
<plugin>
1051-
<groupId>org.eclipse.jetty</groupId>
1052-
<artifactId>jetty-maven-plugin</artifactId>
1051+
<groupId>org.eclipse.jetty.ee9</groupId>
1052+
<artifactId>jetty-ee9-maven-plugin</artifactId>
10531053
<version>${jetty-version}</version>
10541054
</plugin>
10551055
<plugin>

0 commit comments

Comments
 (0)