Skip to content

Commit f7926de

Browse files
ludochgae-java-bot
authored andcommitted
Upgrade Jetty dependencies in jetty12_testapp to 12.1.6.
PiperOrigin-RevId: 877478475 Change-Id: I196d4bc4da9740fa0324a715eed390df42eb9b23
1 parent ed5436f commit f7926de

2 files changed

Lines changed: 7 additions & 18 deletions

File tree

  • appengine_setup/testapps/jetty12_testapp

appengine_setup/testapps/jetty12_testapp/pom.xml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
<groupId>com.google.appengine.setup.testapps</groupId>
2727
<artifactId>jetty12_testapp</artifactId>
2828
<properties>
29-
<jetty.version>12.0.31</jetty.version>
30-
<jetty121.version>12.1.5</jetty121.version>
3129
<aspectj.version>1.9.25.1</aspectj.version>
3230
</properties>
3331
<dependencies>
@@ -39,45 +37,40 @@
3937
<dependency>
4038
<groupId>org.eclipse.jetty</groupId>
4139
<artifactId>jetty-server</artifactId>
42-
<version>${jetty.version}</version>
40+
<version>${jetty121.version}</version>
4341
</dependency>
4442
<dependency>
4543
<groupId>org.eclipse.jetty</groupId>
4644
<artifactId>jetty-util</artifactId>
47-
<version>${jetty.version}</version>
45+
<version>${jetty121.version}</version>
4846
</dependency>
4947
<dependency>
50-
<groupId>org.eclipse.jetty.ee10</groupId>
51-
<artifactId>jetty-ee10-servlet</artifactId>
52-
<version>${jetty.version}</version>
48+
<groupId>org.eclipse.jetty.ee11</groupId>
49+
<artifactId>jetty-ee11-servlet</artifactId>
50+
<version>${jetty121.version}</version>
5351
</dependency>
5452
<dependency>
5553
<groupId>jakarta.servlet</groupId>
5654
<artifactId>jakarta.servlet-api</artifactId>
57-
<version>6.0.0</version>
5855
<scope>provided</scope>
5956
</dependency>
60-
6157
<dependency>
6258
<groupId>com.jcabi</groupId>
6359
<artifactId>jcabi-aspects</artifactId>
6460
<version>0.26.0</version>
6561
</dependency>
66-
6762
<dependency>
6863
<groupId>org.aspectj</groupId>
6964
<artifactId>aspectjrt</artifactId>
7065
<version>${aspectj.version}</version>
7166
<scope>runtime</scope>
7267
</dependency>
73-
7468
</dependencies>
7569
<build>
7670
<plugins>
7771
<plugin>
7872
<groupId>org.apache.maven.plugins</groupId>
7973
<artifactId>maven-assembly-plugin</artifactId>
80-
<version>3.8.0</version>
8174
<configuration>
8275
<descriptorRefs>
8376
<descriptorRef>jar-with-dependencies</descriptorRef>
@@ -98,19 +91,16 @@
9891
</execution>
9992
</executions>
10093
</plugin>
101-
10294
<plugin>
10395
<groupId>com.google.cloud.tools</groupId>
10496
<artifactId>appengine-maven-plugin</artifactId>
105-
<version>2.8.6</version>
10697
<configuration>
10798
<projectId>srirammahavadi-dev</projectId>
10899
<version>GCLOUD_CONFIG</version>
109100
<automaticRestart>true</automaticRestart>
110101
<artifact>${project.build.directory}/jetty11_testapp-5.0.1-SNAPSHOT-jar-with-dependencies.jar</artifact>
111102
</configuration>
112103
</plugin>
113-
114104
<plugin>
115105
<groupId>com.jcabi</groupId>
116106
<artifactId>jcabi-maven-plugin</artifactId>
@@ -135,7 +125,6 @@
135125
</dependency>
136126
</dependencies>
137127
</plugin>
138-
139128
</plugins>
140129
</build>
141-
</project>
130+
</project>

appengine_setup/testapps/jetty12_testapp/src/main/java/com/google/appengine/setup/testapps/jetty12/servlets/GAEInfoServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
102102
if (cookies != null && cookies.length != 0) {
103103
c = "";
104104
for (Cookie co : cookies) {
105-
c += tr(td(co.getName()) + td(co.getValue()) + td(co.getComment())
105+
c += tr(td(co.getName()) + td(co.getValue())
106106
+ td(co.getPath()) + td(Integer.toString(co.getMaxAge())));
107107
}
108108
table(p, "Cookies", c);

0 commit comments

Comments
 (0)