Skip to content

Commit 18b6769

Browse files
fix(JWT-4535): use the jetty version provided by spring boot and exclude its use from gwt-user etc.
1 parent 77bce0a commit 18b6769

File tree

2 files changed

+28
-5
lines changed

2 files changed

+28
-5
lines changed

bom/pom.xml

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,33 @@
3838
<groupId>org.gwtproject</groupId>
3939
<artifactId>gwt-user</artifactId>
4040
<version>${gwt.version}</version>
41+
<scope>provided</scope>
42+
<exclusions>
43+
<exclusion>
44+
<groupId>org.eclipse.jetty</groupId>
45+
<artifactId>apache-jsp</artifactId>
46+
</exclusion>
47+
<exclusion>
48+
<groupId>org.eclipse.jetty.websocket</groupId>
49+
<artifactId>websocket-client</artifactId>
50+
</exclusion>
51+
<exclusion>
52+
<groupId>org.eclipse.jetty</groupId>
53+
<artifactId>jetty-webapp</artifactId>
54+
</exclusion>
55+
<exclusion>
56+
<groupId>org.eclipse.jetty</groupId>
57+
<artifactId>jetty-servlet</artifactId>
58+
</exclusion>
59+
<exclusion>
60+
<groupId>org.eclipse.jetty</groupId>
61+
<artifactId>jetty-servlets</artifactId>
62+
</exclusion>
63+
<exclusion>
64+
<groupId>org.eclipse.jetty</groupId>
65+
<artifactId>jetty-annotations</artifactId>
66+
</exclusion>
67+
</exclusions>
4168
</dependency>
4269
<dependency>
4370
<groupId>org.gwtproject</groupId>
@@ -76,22 +103,18 @@
76103
<dependency>
77104
<groupId>org.eclipse.jetty</groupId>
78105
<artifactId>jetty-servlets</artifactId>
79-
<version>${jetty.version}</version>
80106
</dependency>
81107
<dependency>
82108
<groupId>org.eclipse.jetty</groupId>
83109
<artifactId>jetty-servlet</artifactId>
84-
<version>${jetty.version}</version>
85110
</dependency>
86111
<dependency>
87112
<groupId>org.eclipse.jetty</groupId>
88113
<artifactId>jetty-server</artifactId>
89-
<version>${jetty.version}</version>
90114
</dependency>
91115
<dependency>
92116
<groupId>org.eclipse.jetty</groupId>
93117
<artifactId>jetty-http</artifactId>
94-
<version>${jetty.version}</version>
95118
</dependency>
96119
</dependencies>
97120
</dependencyManagement>

example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<plugin>
6868
<groupId>org.apache.maven.plugins</groupId>
6969
<artifactId>maven-war-plugin</artifactId>
70-
<version>3.4.0</version>
70+
<version>3.5.0</version>
7171
</plugin>
7272
<plugin>
7373
<groupId>org.codehaus.mojo</groupId>

0 commit comments

Comments
 (0)