Commit 8ee7ebd
sync up from main (#352)
* Bump io.netty:netty-common from 4.1.117.Final to 4.1.118.Final
Bumps [io.netty:netty-common](https://github.com/netty/netty) from 4.1.117.Final to 4.1.118.Final.
- [Commits](netty/netty@netty-4.1.117.Final...netty-4.1.118.Final)
---
updated-dependencies:
- dependency-name: io.netty:netty-common
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
* - Add Maven CI action for building with Zulu and Liberica JDKs for Java 21, 23.
- Removing Java 22 from all JDK since we can now safely just test on JDK23 and the upcoming JDK24.
PiperOrigin-RevId: 727603486
Change-Id: I73c659ef58fe85fb6d9964d0997949eccec08aeb
* allow Jetty 9.4 jetty-servlets class names to work with Jetty 12
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
* allow Jetty 9.4 jetty-servlets class names to work with Jetty 12
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
* allow Jetty 9.4 jetty-servlets class names to work with Jetty 12
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
* Upgrade GAE Java version from 2.0.32 to 2.0.33 and prepare next version 2.0.34-SNAPSHOT
PiperOrigin-RevId: 728533780
Change-Id: Ic8bd0b0863999092f469267dbb15d0eca39a92db
* PR #345 - changes from review
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
* PR #345 - fixes for broken tests
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
* Set API host idle timeout to 2 seconds by default instead of no timeout. See jetty/jetty.project#3891
PiperOrigin-RevId: 729286826
Change-Id: Iea5120e9e46db5874fd95426537f4136bf876f84
* Set API host idle timeout to 2 seconds by default instead of no timeout. See jetty/jetty.project#3891
PiperOrigin-RevId: 729581319
Change-Id: I85a21e3fdd2cc5c5c250ff048632f5687870a049
* Update all non-major dependencies
* Set API host idle timeout to 25 seconds by default instead of no timeout. See jetty/jetty.project#3891
PiperOrigin-RevId: 731360214
Change-Id: Ifedd44381e45a318ab38705d910ba3f41317ee79
* Update all non-major dependencies
* Update to Jetty 12.0.17 and allow invalid pathSpecs in EE8
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
* Internal change
PiperOrigin-RevId: 734104453
Change-Id: I0ad3f52c675374e3f9337a02ebf5b5668eef8b1b
* Update all non-major dependencies
* Adding `org.eclipse.jetty.servlet` to deprecated package names. This is related to #345
PiperOrigin-RevId: 735623640
Change-Id: I6b2e351765d0778cc2ded07255be8c84b46181db
* Fix App Engine tests for Windows.
This change addresses several issues that prevented App Engine tests from passing on Windows:
- **Maven Wrapper:** The Maven wrapper executable `mvnw` is now invoked with the `.cmd` extension when running on Windows to ensure it can be executed correctly.
- **Newline Handling:** Test output reading logic has been updated to handle both `\n` and `\r\n` newline representations, which is necessary for Windows compatibility.
These changes ensure that the affected tests pass on both Linux/macOS and Windows environments.
PiperOrigin-RevId: 736207509
Change-Id: I7c11b010689343ccdbf9b29801e17569064bb867
* Copybara import of the project:
--
a47b5b3 by Lachlan Roberts <lachlan.p.roberts@gmail.com>:
fix JSPs from appengine-local-runtime-shared-jetty12
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
COPYBARA_INTEGRATE_REVIEW=#350 from GoogleCloudPlatform:DevAppServer-JSP a47b5b3
PiperOrigin-RevId: 736601363
Change-Id: I231efd68881ea23227d1f8d1a21749cc02b71d0e
* Update all non-major dependencies
---------
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Abhinand Sundararajan <abhinasu@google.com>
Co-authored-by: GAE Java Team <gae-java-bot@google.com>
Co-authored-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Co-authored-by: Srinjoy Ray <srinjoyray@google.com>
Co-authored-by: Mend Renovate <bot@renovateapp.com>
Co-authored-by: Lachlan <lachlan@webtide.com>1 parent b6d2e3d commit 8ee7ebd
124 files changed
Lines changed: 396 additions & 184 deletions
File tree
- api_dev
- api_legacy
- api
- appengine-api-1.0-sdk
- appengine-api-stubs
- appengine_init
- appengine_jsr107
- appengine_resources
- appengine_setup
- apiserver_local
- testapps
- jetty12_testapp
- springboot_testapp
- testapps_common
- test
- src/test/java/com/google/appengine/setup/test
- util
- appengine_testing_tests
- appengine_testing
- applications
- proberapp
- springboot
- e2etests
- devappservertests
- stagingtests
- src/test/java/com/google/appengine/tools/admin
- testlocalapps
- allinone_jakarta
- allinone
- badcron
- bundle_standard_with_container_initializer
- bundle_standard_with_no_jsp
- bundle_standard_with_weblistener_memcache
- bundle_standard
- cron-bad-job-age-limit
- cron-good-retry-parameters
- cron-negative-max-backoff
- cron-negative-retry-limit
- cron-two-max-doublings
- http-headers
- java8-jar
- java8-no-webxml
- sample-badaeweb
- sample-baddispatch-yaml
- sample-baddispatch
- sample-badentrypoint
- sample-badindexes
- sample-badruntimechannel
- sample-badweb
- sample-default-auto-ids
- sample-error-in-tag-file
- sample-java11
- sample-java17
- sample-jsptaglibrary
- sample-jspx
- sample-legacy-auto-ids
- sample-missingappid
- sample-nojsps
- sample-unspecified-auto-ids
- sample-with-classes
- sampleapp-automatic-module
- sampleapp-backends
- sampleapp-basic-module
- sampleapp-manual-module
- sampleapp-runtime
- sampleapp
- stage-sampleapp
- stage-with-staging-options
- xmlorder
- external/geronimo_javamail
- google3/third_party/java_src/appengine_standard/api_compatibility_tests
- jetty12_assembly
- kokoro/gcp_ubuntu
- lib
- tools_api
- src/test/java/com/google/appengine/tools/admin
- xml_validator_test
- xml_validator
- protobuf
- quickstartgenerator_jetty12_ee10
- quickstartgenerator_jetty12
- quickstartgenerator
- remoteapi
- runtime
- annotationscanningwebapp
- deployment
- failinitfilterwebapp
- impl
- src/test/java/com/google/apphosting/runtime
- lite
- local_jetty12_ee10
- local_jetty12
- src/main/java/com/google/appengine/tools/development/jetty
- local_jetty9
- main
- nogaeapiswebapp
- runtime_impl_jetty12
- src/main/java/com/google/apphosting/runtime
- http
- jetty
- ee10
- ee8
- runtime_impl_jetty9
- src/main/java/com/google/apphosting/runtime/http
- testapps
- test
- src/test/java/com/google/apphosting/runtime/jetty9
- util
- sdk_assembly
- sessiondata
- utils
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
| 72 | + | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| |||
89 | 89 | | |
90 | 90 | | |
91 | 91 | | |
92 | | - | |
| 92 | + | |
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
| |||
188 | 188 | | |
189 | 189 | | |
190 | 190 | | |
191 | | - | |
| 191 | + | |
192 | 192 | | |
193 | 193 | | |
194 | 194 | | |
| |||
211 | 211 | | |
212 | 212 | | |
213 | 213 | | |
214 | | - | |
| 214 | + | |
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
| |||
226 | 226 | | |
227 | 227 | | |
228 | 228 | | |
229 | | - | |
| 229 | + | |
230 | 230 | | |
231 | 231 | | |
232 | 232 | | |
233 | 233 | | |
234 | 234 | | |
235 | | - | |
| 235 | + | |
236 | 236 | | |
237 | 237 | | |
238 | 238 | | |
239 | 239 | | |
240 | 240 | | |
241 | | - | |
| 241 | + | |
242 | 242 | | |
243 | 243 | | |
244 | 244 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
69 | | - | |
| 69 | + | |
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
0 commit comments