Commit Graph

186 Commits

Author SHA1 Message Date
Lachlan Roberts e31360dd7f
rename jetty-test-util to jetty-test-common
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-27 14:39:47 +10:00
Lachlan Roberts 063e839962
reduce duplication for OpenIdProvider testing class
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-26 11:48:10 +10:00
Olivier Lamy 2ef6a3473a
jetty 12.1.x 12184 urls fixes (#12187)
* fix proxy url in web.xml
* Issue #12184 Change urls https://eclipse.dev to https://jetty.org

Fix #12187

Signed-off-by: Olivier Lamy <olamy@apache.org>

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-08-22 04:34:56 +02:00
Simone Bordet 8e6ad22b69
Merged branch 'jetty-12.0.x' into 'jetty-12.1.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-08-21 11:38:00 +02:00
Olivier Lamy 2ca9be96ae
change urls https://eclipse.dev to https://jetty.org (#12172)
* change urls https://eclipse.dev to  https://jetty.org

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-08-21 07:18:20 +02:00
Olivier Lamy c7e02ba008
invoker:install should include test dependencies as well as they are used by the tests, this issue can happen only when not snapshots have been deployed of demos new versions
Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-07-31 08:07:55 +10:00
Joakim Erdfelt d3af12957b
Updating to version 12.0.13-SNAPSHOT 2024-07-25 17:23:21 -05:00
Joakim Erdfelt cc6f1b74db
Updating to version 12.0.12 2024-07-25 16:57:59 -05:00
Jan Bartel d43da5279c Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-07-24 16:10:27 +10:00
Jan Bartel 558da27c2d
Issue #12044 ensure temp dir cleaned up (#12045)
* Issue #12044 ensure temp dir cleaned up
2024-07-24 14:20:52 +10:00
gregw 5903efdf96 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x
# Conflicts:
#	jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java
#	jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ArrayByteBufferPool.java
#	jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/BufferedContentSink.java
#	jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ContextScopeListenerTest.java
#	jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpOutput.java
2024-07-01 11:05:47 +10:00
Joakim Erdfelt f5abe07ade
Updating to version 12.0.12-SNAPSHOT 2024-06-27 19:09:24 -05:00
Joakim Erdfelt 9f90cedce3
Updating to version 12.0.11 2024-06-27 18:42:08 -05:00
Joakim Erdfelt f89e3b8aee
Merge pull request #11950 from jetty/experiment/jetty-12.0.x/11932-icb-subclasses
Make succeeded and failed in ICB final + introduce onSuccess
2024-06-27 12:00:27 -05:00
Jan Bartel 893911a833
Jetty 12.0.x 11774 backport env web xml (#11966)
* Jetty 12.0.x jetty ee web xml (PR #11746)
* Resolve jetty-eeX-web.xml before jetty-web.xml
* Support jetty-eeX-env.xml, as per jetty-eeX-web.xml
* Support jetty-eeX-env.xml, as per jetty-eeX-web.xml

---------

Co-authored-by: Greg Wilkins <gregw@webtide.com>
2024-06-27 11:50:03 -05:00
Joakim Erdfelt 2caf9c11c0 Cleanup XML environment specific deployment AppProviders 2024-06-27 11:48:37 -05:00
Joakim Erdfelt d062cf368e
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-06-27 08:46:09 -05:00
Joakim Erdfelt b2c4acdde4
Exclude jetty-schemas (no longer needed in Jetty 12) 2024-06-27 08:45:49 -05:00
Joakim Erdfelt c7ad22e861
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-06-27 06:45:25 -05:00
Joakim Erdfelt d7a2f08458
Bump ee8 apache-jsp from 9.0.83.1 to 9.0.90 2024-06-27 06:27:53 -05:00
Olivier Lamy bae2e8f9bc
force jetty-client in invoker it tests
Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-06-27 11:46:44 +02:00
Joakim Erdfelt f78f4422f5
Issue #11925 - Fix Etag NPE when using URLResource and improve Base Resource is alias warning (#11930)
* Issue #11925 - ee9 DefaultServlet and suffix url-patterns.
* Issue #11925 - Fix NPE in EtagUtils with URLResource
* Issue #11925 - Make error message "Base Resource should not be an alias" more useful.
* Set <reuseForks> to false for problematic tests.
2024-06-25 08:11:35 -05:00
Jan Bartel 5e77a36140 Add missing environment props for some demos. 2024-06-24 12:16:32 +10:00
Joakim Erdfelt 25bb6a2104
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-06-21 15:28:23 -05:00
Joakim Erdfelt b15cfd125d
Update URLs for new jetty locations 2024-06-21 13:33:46 -05:00
Joakim Erdfelt aac0353092
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2024-06-21 13:30:06 -05:00
Joakim Erdfelt af23f51d92
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-06-19 16:18:15 -05:00
Lachlan Roberts 6278ad8f77 PR #11907 - add newlines to end of openid .mod files
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2024-06-12 12:18:04 +10:00
Lachlan Roberts bc24f87303 Fix openid.mod files for Jetty 12
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2024-06-12 01:11:03 +10:00
Joakim Erdfelt f653c2f658
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-06-04 10:48:58 -05:00
Olivier Lamy fb1697fd07
Updating to version 12.0.11-SNAPSHOT 2024-05-30 15:23:16 +10:00
Olivier Lamy 26106dfc84
Updating to version 12.0.10 2024-05-30 14:39:40 +10:00
Jan Bartel 4bf8e412e3 Issue #11851 export org.eclipse.jetty.ee8.websocket.javax.server 2024-05-30 04:25:16 +02:00
Jan Bartel 5dc9a73970
Jetty 12.1.x move demos (#11836)
* Refactor all ee demos to remove duplicates
2024-05-28 07:59:10 +02:00
Jan Bartel 810eccaeea Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-05-28 10:23:00 +10:00
Simone Bordet 36cdc12ab7 Fixed JPMS declarations.
Some require transitive was missing, and has been added.
In other cases, making a field private (e.g. for log instances) made the warning go away.
In another case, removed explicit dependency on websocket core exception, as it was not necessary.

Clean up the POMs for jetty-eeN-annotations, that had unnecessary dependencies.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-05-23 22:06:01 +02:00
gregw 22ddb6db77 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-05-16 17:28:29 +10:00
Jan Bartel 6f2f599b17
Issue #11761 fix jetty maven doco and integration test (#11771)
* Issue #11761 fix jetty maven doco and integration test
2024-05-13 01:44:13 +02:00
Jan Bartel 1e0f012f66
Support jetty-eeX-env.xml, as per jetty-eeX-web.xml (#11752)
* Support jetty-eeX-env.xml, as per jetty-eeX-web.xml

---------

Co-authored-by: Greg Wilkins <gregw@webtide.com>
2024-05-10 08:43:48 +02:00
Jan Bartel 004c2a9a3d Make ee8 version of test xml for JettyWebXmlConfigurationTest 2024-05-04 11:33:45 +10:00
Joakim Erdfelt 8e7e42201a
Updating to version 12.0.10-SNAPSHOT 2024-05-03 09:28:36 -04:00
Joakim Erdfelt efe8023327
Updating to version 12.0.9 2024-05-03 09:02:37 -04:00
Olivier Lamy cea1440079
install up to test scope
Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-05-03 15:53:52 +10:00
Olivier Lamy d06a45b0c0
fix invoker settings xml for jetty-runner modules
Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-05-03 14:12:11 +10:00
Jan Bartel ce13b8590f Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-05-03 12:18:49 +10:00
Simone Bordet c5b2533fde
Fixed XML files after #11722.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-05-02 18:14:50 +02:00
gregw b11996a3c4 Introduced EE11 and jetty-12.1.x 2024-04-26 22:42:57 +10:00
Jan Bartel e9c71be811
Jetty 12.0.x refactor common maven plugin classes (#11651)
* Issue #11514 - Cleanup `jetty.webapp.addServerClasses` property behavior for ee10/ee9/ee8

* Merging patterns (default -> env -> config)
* Moved ClassMatcher to util
* System Server Classes
* Renaming to Hidden/Protected
* Updated for loss of dump.war
* Update jetty-core/jetty-ee/src/main/java/org/eclipse/jetty/ee/WebappClassLoading.java
* fixed OSGi tests
* Ensure default hidden server and system classes.
* Fixed ee9 OSGi to load jetty-ee
* Adding more deprecations
* Changing XML demos/tests to use new getter names
* rollback xml changes in ee9/ee8
* Fix ee8 maven plugin
* Make jetty-maven dependency optional in ee9 to match ee10

---------

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: gregw <gregw@webtide.com>
2024-04-25 20:53:40 -05:00
Olivier Lamy ea8139e94a
Issue #11642 restore Jetty ee8 runner (#11650)
* Issue #11642 restore Jetty ee8 runner
---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-04-13 10:33:30 +02:00
Greg Wilkins 30bee710f1
Move ClassMatcher to core to have a consistent fix for addServerClasses in all environments (#11566)
* Issue #11514 - Cleanup `jetty.webapp.addServerClasses` property behavior for ee10/ee9/ee8

* Fix test

* Merging patterns (default -> env -> config)

* Moved ClassMatcher to util

* Adding more deprecations

* Changing XML demos/tests to use new getter names

* rollback xml changes in ee9/ee8

---------

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
2024-04-12 17:31:47 +10:00