Skip to content

chore(deps): update jetty packages to v9.4.30.v20200611 #3160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lesv merged 1 commit into from
Jun 12, 2020
Merged

chore(deps): update jetty packages to v9.4.30.v20200611 #3160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions appengine-java11/appengine-simple-jetty-main/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,30 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
<type>jar</type>
</dependency>
<!-- extra explicit dependency needed because there is a JSP in the sample-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
</dependency>
</dependencies>
<!-- [END gae_java11_server_dependencies] -->
Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/gaeinfo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Copyright 2019 Google LLC
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
</plugin>
</plugins>

Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/guestbook-cloud-firestore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
</plugin>

<plugin>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java11/oauth2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
</plugin>

<plugin>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/sendgrid/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Copyright 2018 Google LLC
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion appengine-java8/spanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
</plugin>
<!-- END -->

Expand Down
2 changes: 1 addition & 1 deletion cloud-sql/mysql/servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
<configuration>
<scanIntervalSeconds>1</scanIntervalSeconds>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion cloud-sql/postgres/servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
<configuration>
<scanIntervalSeconds>1</scanIntervalSeconds>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion endpoints/getting-started/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.29.v20200521</version>
<version>9.4.30.v20200611</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion endpoints/multiple-versions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<maven.war.plugin>2.6</maven.war.plugin>

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty.maven.plugin>9.4.29.v20200521</jetty.maven.plugin>
<jetty.maven.plugin>9.4.30.v20200611</jetty.maven.plugin>

<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
</properties>
Expand Down
2 changes: 1 addition & 1 deletion flexible/analytics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<maven.compiler.source>1.8</maven.compiler.source>

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
</properties>

Expand Down
2 changes: 1 addition & 1 deletion flexible/async-rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>

<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion flexible/cloudsql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
<!-- [END_EXCLUDE] -->
<sqlURL>jdbc:mysql://google/${database}?cloudSqlInstance=${INSTANCE_CONNECTION_NAME}&amp;socketFactory=com.google.cloud.sql.mysql.SocketFactory&amp;user=${user}&amp;password=${password}&amp;useSSL=false</sqlURL>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion flexible/cloudstorage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
</properties>

<!-- [START gae_flex_storage_dependencies] -->
Expand Down
2 changes: 1 addition & 1 deletion flexible/cron/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flexible/datastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
</properties>

<!-- [START gae_flex_datastore_config] -->
Expand Down
2 changes: 1 addition & 1 deletion flexible/disk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flexible/errorreporting/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<failOnMissingWebXml>false</failOnMissingWebXml>
<jetty.maven.plugin>9.4.29.v20200521</jetty.maven.plugin>
<jetty.maven.plugin>9.4.30.v20200611</jetty.maven.plugin>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flexible/extending-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flexible/helloworld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
</properties>

<!-- [START gae_flex_libraries_dependencies] -->
Expand Down
2 changes: 1 addition & 1 deletion flexible/mailgun/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flexible/mailjet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>

<mailjet-version>4.5.0</mailjet-version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion flexible/memcache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flexible/postgres/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
<!-- [END_EXCLUDE] -->
<sqlURL>jdbc:postgresql://google/${database}?useSSL=false&amp;socketFactoryArg=${INSTANCE_CONNECTION_NAME}&amp;socketFactory=com.google.cloud.sql.postgres.SocketFactory&amp;user=${user}&amp;password=${password}</sqlURL>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion flexible/pubsub/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
</properties>

<!-- FIXME(lesv) Temporary fix due to Datastore having the wrong version -->
Expand Down
2 changes: 1 addition & 1 deletion flexible/sendgrid/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flexible/static-files/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flexible/twilio/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->

<appengine.maven.plugin>2.2.0</appengine.maven.plugin>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flexible/websocket-jetty/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
<jetty.version>9.4.29.v20200521</jetty.version>
<jetty.version>9.4.30.v20200611</jetty.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion flexible/websocket-jsr356/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ limitations under the License.
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
<jetty.version>9.4.29.v20200521</jetty.version>
<jetty.version>9.4.30.v20200611</jetty.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion memorystore/redis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<jetty>9.4.29.v20200521</jetty>
<jetty>9.4.30.v20200611</jetty>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion session-handling/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Copyright 2019 Google LLC
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
<maven.compiler.failOnWarning>false</maven.compiler.failOnWarning>
<maven.war.filteringDeploymentDescriptors>false</maven.war.filteringDeploymentDescriptors>
<jetty.version>9.4.29.v20200521</jetty.version>
<jetty.version>9.4.30.v20200611</jetty.version>
</properties>

<dependencies>
Expand Down