Skip to content

Commit b889969

Browse files
ludochgae-java-bot
authored andcommitted
Remove Jetty BOM and explicitly version Jetty dependencies.
PiperOrigin-RevId: 876396561 Change-Id: I3037a4629edd8cf985ff39becc557416aacd2cb7
1 parent 6655bb2 commit b889969

File tree

9 files changed

+27
-46
lines changed

9 files changed

+27
-46
lines changed

api_dev/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,12 @@
184184
<dependency>
185185
<groupId>org.eclipse.jetty</groupId>
186186
<artifactId>jetty-server</artifactId>
187+
<version>${jetty.version}</version>
187188
</dependency>
188189
<dependency>
189190
<groupId>org.eclipse.jetty</groupId>
190191
<artifactId>jetty-servlet</artifactId>
192+
<version>${jetty.version}</version>
191193
</dependency>
192194
<dependency>
193195
<groupId>org.apache.httpcomponents</groupId>

applications/springboot/pom.xml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<dependency>
4646
<groupId>org.springframework.boot</groupId>
4747
<artifactId>spring-boot-starter-web</artifactId>
48+
<version>${spring.boot.version}</version>
4849
<!-- Exclude Tomcat so that it doesn't conflict w/ Jetty server -->
4950
<exclusions>
5051
<exclusion>
@@ -53,14 +54,7 @@
5354
</exclusion>
5455
</exclusions>
5556
</dependency>
56-
57-
<!-- Exclude any jul-to-slf4j -->
58-
<dependency>
59-
<groupId>org.slf4j</groupId>
60-
<artifactId>jul-to-slf4j</artifactId>
61-
<scope>provided</scope>
62-
</dependency>
63-
57+
6458
<!-- Include Servlet API -->
6559
<dependency>
6660
<groupId>jakarta.servlet</groupId>
@@ -71,6 +65,7 @@
7165
<dependency>
7266
<groupId>org.springframework.boot</groupId>
7367
<artifactId>spring-boot-starter-test</artifactId>
68+
<version>${spring.boot.version}</version>
7469
<scope>test</scope>
7570
</dependency>
7671
<dependency>
@@ -80,18 +75,7 @@
8075
</dependency>
8176
</dependencies>
8277

83-
<dependencyManagement>
84-
<dependencies>
85-
<dependency>
86-
<!-- Import dependency management from Spring Boot -->
87-
<groupId>org.springframework.boot</groupId>
88-
<artifactId>spring-boot-dependencies</artifactId>
89-
<version>${spring.boot.version}</version>
90-
<type>pom</type>
91-
<scope>import</scope>
92-
</dependency>
93-
</dependencies>
94-
</dependencyManagement>
78+
9579

9680
<build>
9781
<plugins>

external/geronimo_javamail/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<packaging>jar</packaging>
3131
<name>AppEngine :: JavaMail 1.4</name>
3232
<url>https://github.com/GoogleCloudPlatform/appengine-java-standard/</url>
33-
<version>1.4.4-${project.parent.version}</version>
3433

3534
<description>Javamail 1.4 Specification with AppEngine updates.</description>
3635

pom.xml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,6 @@
134134
<url>${distributionManagement.snapshot.url}</url>
135135
</snapshotRepository>
136136
</distributionManagement>
137-
<repositories>
138-
<repository>
139-
<id>webtide-harbor</id>
140-
<url>https://harbor.webtide.com/releases</url>
141-
</repository>
142-
</repositories>
143137
<profiles>
144138
<profile>
145139
<id>sonatype-release</id>
@@ -209,10 +203,6 @@
209203
<activeByDefault>false</activeByDefault>
210204
</activation>
211205
<repositories>
212-
<repository>
213-
<id>webtide-harbor</id>
214-
<url>https://harbor.webtide.com/releases</url>
215-
</repository>
216206
<repository>
217207
<id>aoss-artifact-registry</id>
218208
<name>AOSS Repository</name>
@@ -258,6 +248,15 @@
258248
</plugins>
259249
</build>
260250
</profile>
251+
<profile>
252+
<id>webtide-harbor-profile</id>
253+
<repositories>
254+
<repository>
255+
<id>webtide-harbor</id>
256+
<url>https://harbor.webtide.com/releases</url>
257+
</repository>
258+
</repositories>
259+
</profile>
261260
</profiles>
262261

263262
<dependencyManagement>
@@ -575,13 +574,6 @@
575574
<artifactId>jspecify</artifactId>
576575
<version>1.0.0</version>
577576
</dependency>
578-
<dependency>
579-
<groupId>org.eclipse.jetty</groupId>
580-
<artifactId>jetty-bom</artifactId>
581-
<version>${jetty.version}</version>
582-
<type>pom</type>
583-
<scope>import</scope>
584-
</dependency>
585577
<dependency>
586578
<groupId>org.eclipse.jetty.toolchain</groupId>
587579
<artifactId>jetty-schemas</artifactId>

runtime/runtime_impl_jetty9/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
<dependency>
106106
<groupId>org.eclipse.jetty</groupId>
107107
<artifactId>jetty-client</artifactId>
108+
<version>${jetty.version}</version>
108109
<optional>true</optional>
109110
</dependency>
110111
<dependency>
@@ -116,11 +117,13 @@
116117
<artifactId>javax.transaction-api</artifactId>
117118
</exclusion>
118119
</exclusions>
120+
<version>${jetty.version}</version>
119121
<optional>true</optional>
120122
</dependency>
121123
<dependency>
122124
<groupId>org.eclipse.jetty</groupId>
123125
<artifactId>jetty-servlets</artifactId>
126+
<version>${jetty.version}</version>
124127
<optional>true</optional>
125128
</dependency>
126129
<dependency>

runtime/test/pom.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@
4545
<dependency>
4646
<groupId>org.eclipse.jetty</groupId>
4747
<artifactId>jetty-server</artifactId>
48-
</dependency>
48+
<version>${jetty.version}</version>
49+
</dependency>
4950
<dependency>
5051
<groupId>org.eclipse.jetty</groupId>
5152
<artifactId>jetty-servlet</artifactId>
53+
<version>${jetty.version}</version>
5254
</dependency>
5355
<dependency>
5456
<groupId>com.google.appengine</groupId>
@@ -113,6 +115,7 @@
113115
<dependency>
114116
<groupId>org.eclipse.jetty</groupId>
115117
<artifactId>jetty-client</artifactId>
118+
<version>${jetty.version}</version>
116119
<scope>test</scope>
117120
</dependency>
118121
<dependency>

runtime/testapps/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<dependency>
4242
<groupId>org.eclipse.jetty</groupId>
4343
<artifactId>jetty-util</artifactId>
44+
<version>${jetty.version}</version>
4445
</dependency>
4546
<dependency>
4647
<groupId>com.google.guava</groupId>

sdk_assembly/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -445,11 +445,6 @@
445445
<dependency>
446446
<groupId>com.google.appengine</groupId>
447447
<artifactId>appengine-resources</artifactId>
448-
</dependency>
449-
<dependency>
450-
<groupId>org.eclipse.jetty</groupId>
451-
<artifactId>jetty-distribution</artifactId>
452-
<type>zip</type>
453448
</dependency>
454449
<dependency>
455450
<groupId>com.google.appengine</groupId>

shared_sdk_jetty9/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@
5151
<dependency>
5252
<groupId>org.eclipse.jetty</groupId>
5353
<artifactId>jetty-server</artifactId>
54-
</dependency>
54+
<version>${jetty.version}</version>
55+
</dependency>
5556
<dependency>
5657
<groupId>com.google.guava</groupId>
5758
<artifactId>guava</artifactId>
@@ -68,6 +69,7 @@
6869
<dependency>
6970
<groupId>org.eclipse.jetty</groupId>
7071
<artifactId>jetty-servlet</artifactId>
71-
</dependency>
72+
<version>${jetty.version}</version>
73+
</dependency>
7274
</dependencies>
7375
</project>

0 commit comments

Comments
 (0)