Commit Graph

819 Commits

Author SHA1 Message Date
Joakim Erdfelt a9c596e3d7
Updating various old/moved URL references found across project (`jetty-10.0.x`) (#10098)
* Now that the migration of `https://eclipse.org/jetty/` to `https://eclipse.dev/jetty/` has occurred, it is time to review the URI use in our project

+ Updated URLs in poms
+ Added more URIs to XmlConfiguration
+ Updated URLs in module files
+ Updated URLs in documentation
+ Updated URLs in HTML
+ Correcting bad double-scheme URLs (eg: `http://https://www.eclipse...`)
+ Updating text in *.mod files
+ Removing `/current/` from path `/jetty/documentation/current/`
+ Fixing mailing list URL

---------

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-07-14 12:38:45 -05:00
Greg Wilkins 11d2a32eea
Fixes #9999 and #10055 - proper quoting for dry-run
Using "strong quoting" with the single quote character to quote argument of --dry-run output.

Signed-off-by: gregw <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-14 17:05:41 +02:00
Joakim Erdfelt 81efae2f98
jetty-start cleanup (#9555)
* Extract jars/zips using zipfs
* Restrict MavenMetadata external DTD/XSD access
* Introduce --allow-insecure-http-downloads
* Produce debug log if file exists in destination during copy.
* Simpler MavenMetadata
* If `maven.repo.uri` has been redeclared by user, automatically set allow insecure http downloads.

---------

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-04-10 08:53:58 -05:00
Joakim Erdfelt 20c9b02a8f
Fix broken javadoc
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-03-23 15:19:32 -05:00
Joakim Erdfelt 054d11e13c
toQuotedString() simplified
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-03-23 12:44:07 -05:00
Joakim Erdfelt 9060adb8ca
Merge remote-tracking branch 'origin/jetty-10.0.x' into fix/jetty-10.0.x/jetty-sh-start-properties 2023-03-20 23:14:28 -05:00
gregw 7a7d69a69f Happy no year
Remove modification date from copyright notice and instead just have the
project inception year.

Signed-off-by: gregw <gregw@webtide.com>
2023-02-15 15:22:32 +11:00
Joakim Erdfelt 3ac7af0d2f
Deprecating quote(String args)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-02-06 16:09:03 -06:00
Joakim Erdfelt a238c50a7f
Fixing checkstyle 2023-02-06 15:59:12 -06:00
Joakim Erdfelt 8c992b9c93
CommandLineBuilder doesn't escape, and only quotes with single-quote tick when arg has space.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-02-06 15:46:50 -06:00
Joakim Erdfelt 45fdebc0fb
Issue #9309 - More comprehensive escaping of command line options
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-02-03 10:20:46 -06:00
Olivier Lamy 2212c62829
temporary fix by using artifacts which exists
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-02-01 22:05:59 +10:00
Joakim Erdfelt a84fe38fef
Fix directory traversal on bad jar/zip files
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-10-05 13:26:56 -05:00
Lachlan Roberts f60bbf3b11 expand jetty properties when generating dry-run command line
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-04 17:17:33 +11:00
Joakim Erdfelt 7aa2d8def2
Issue #8222 - Addressing NPE with JvmArgs and non-existent modules. (#8223)
* Issue #8222 - Addressing NPE with JvmArgs and non-existent modules.

+ Better variable naming.
+ Simpler use case, without need for new StartArgs method
+ Correct naming in StartArgs.getEnabledModules
+ Introduce StartArgs.getSelectedModules
+ Change javadoc and usage everywhere else
* Stabilize flaky test by using UTC properly

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-07-01 16:08:52 -05:00
Joakim Erdfelt 96af5d1990
Issue #5681 - clearer warning on JVM Arg / System Property use (#7769)
- Improved warning on unrecognized Command Line Options

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-03-25 12:25:30 -05:00
Joakim Erdfelt 23a1dc59a3
Issue #5965 - fixing invalid dot output from start.jar (#7606)
* Adding testcase that can use `dot` if it exists on the machine.
2022-02-23 07:10:02 -04:00
Joakim Erdfelt 3791f38684
Issue #6017 - fix accidentally broken k+=v property usage (#7510)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-02-01 13:58:41 -06:00
Joakim Erdfelt cb127793e5
Happy New Year 2022 (#7459)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-01-27 10:42:30 -06:00
lujiefsi ff10c26332
fix resource leak (#7361)
Fix resource leaks
2022-01-10 10:56:22 +01:00
Simone Bordet 1ea012afde
Issue #7111 - Add support to deprecate jetty-home modules. (#7125)
* Issue #7111 - Add support to deprecate jetty-home modules.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-02 10:09:05 +01:00
Joakim Erdfelt ec3d7dbe92
Issue #6017 - Start Property Overrides (#7118)
* Issue #6017 - jetty-start Property override behavior

+ All *.mod based configuration defaults are default
  properties are not forced values and can be overridden.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-11-17 10:10:29 -06:00
Joakim Erdfelt edaead4a5b
Issue #7064 - Fix `(null)` for source output in `--list-config` (#7065)
Improved start handling of output so that testcases
can now validate the output if they need to.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-11-16 09:07:46 -06:00
Joakim Erdfelt 9eeb44bfe9
Port of jetty-start Usecase testing from 9.4.x (#7112)
+ Changes are isolated to src/test/java
+ No changes to src/main/java
+ Each test is now self contained entirely within java code
+ Removed *.prepare.txt, *.cmdline.txt, and *.assert.txt files
+ Removed all src/test/resources/usecases content
+ Removed CollectionAsserts
+ Removed ConfigurationAsserts

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-11-15 12:45:48 -06:00
Joakim Erdfelt 7321d54915
Close Resources opened from java.nio.file.Files API calls (#7048) (#7050)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-10-27 05:53:10 -05:00
Lachlan Roberts 5eb30b61bb Issue #6100 - fix flaky test MavenMetadataTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-09-21 23:01:52 +10:00
Joakim Erdfelt c5a33e27d2
Issue #5684 - Windows test overhaul (#6581)
Issue #5684 - Window's test overhaul

+ Migrate from @DisabledOnOs(WINDOWS) to assumptions on capabilities instead.
+ Fix other outstanding windows testing issues.
+ Cleanup FileBufferedResponseHandlerTest expectations on Windows.
+ PathWatcher scan interval is variable on windows
+ If unable to start testcase based on assumption,
  the stop shouldn't fail testcase
+ Increase various wait timeouts
+ Make tests less strict due to system speed issues
+ Disable Sni tests due to TLS behaviors differences in Windows
  + Windows TLSv1.3 seems to introduce this difference
  + If we restrict to TLSv1.2 this passes.
  + On Linux TLSv.13 on client side will always return a
  + javax.net.ssl.SSLHandshakeException in those test cases that expect it.
  + However, on Windows, Only the TLSv1.2 implementation will return a javax.net.ssl.SSLHandshakeException,
  + All other TLS versions on Windows will result in a
  + javax.net.ssl.SSLException: Software caused connection abort: recv failed
+ Disable ConcurrentStreamCreationTest
  + Not possible to create all of these streams.
+ Fixing DeploymentTempDirTest
  + Using unique workdir per testcase.
  + Don't expect to delete files / directories between tests
    (not supported on windows due to file locking anyway)
 + Fixing line ending difference on windows
 + InvalidPathException is a 404 Not Found
 + Cannot reuse test directory between runs due to memory mapped files that are still in use from previous run.
 + java.nio.file.FileSystemException: C:\code\jetty.project\jetty-webapp\target\tests\welcome#\index.html: The requested operation cannot be performed on a file with a user-mapped section open.

	at java.base/sun.nio.fs.WindowsException.translateToIOException(WindowsException.java:92)
	at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:103)
	at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:108)
	at java.base/sun.nio.fs.WindowsFileSystemProvider.newByteChannel(WindowsFileSystemProvider.java:235)
	at java.base/java.nio.file.spi.FileSystemProvider.newOutputStream(FileSystemProvider.java:478)
	at java.base/java.nio.file.Files.newOutputStream(Files.java:220)
	at org.eclipse.jetty.webapp/org.eclipse.jetty.webapp.WebAppDefaultServletTest.prepareServer(WebAppDefaultServletTest.java:84)

 + As is typical on windows, we are often unable to delete a file due to file locking issues.
 + Use a unique resource base between tests.
   This is to avoid file locking behaviors that prevent the
   resource base from being reused too quickly on windows.
 + Prevent test run if symlinks not supported
 + Allowing for Windows slosh char as well in asserts
 + SelectorUtils is File.separator dependent
 + Regex is now FS.separator independent
 + Using SelectorUtils from plexus correctly for include/exclude
 + Turning off mapped files for testing reasons.
 + Fix and re-enable RFC2616NIOHttpsTest
 + Issue #6552 - Fix test failures due to slf4j dep
 + Issue #6552 - upgrade testcontainers
 + Issue #6552 - move to assumption based docker existence
 + Issue #6552 - Fix enforcer rule violation on jna.
  Addresses the following side effect of upgrading testcontainers.

[WARNING] Rule 3: org.apache.maven.plugins.enforcer.RequireUpperBoundDeps failed with message:
Failed while enforcing RequireUpperBoundDeps. The error(s) are [
Require upper bound dependencies error for net.java.dev.jna:jna:5.6.0 paths to dependency are:
+-org.eclipse.jetty:infinispan-remote-query:10.0.7-SNAPSHOT
  +-org.testcontainers:testcontainers:1.16.0
    +-com.github.docker-java:docker-java-transport-zerodep:3.2.11
      +-net.java.dev.jna:jna:5.6.0 (managed) <-- net.java.dev.jna:jna:5.8.0

 + use annotation to disable test when docker not available and needed
 + Disabling FileSessionDistributionTests.stopRestartWebappTestSessionContentSaved on Windows
 + Using TLS basic
 + Programmatic removal of memory mapped behavior during testing
 + Fixing slf4j warning

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-08-26 11:26:46 -05:00
Simone Bordet 4af93b5e19
Issue #6476 - warn on exec (#6597)
Fixes #6476 - Show message if JVM args are present but new JVM is spawned

* Improved documentation by correctly redacting out `jetty-halt.xml`,
an XML file that is only necessary for rendering the documentation.
* Added WARN message when new JVM is spawned.
* Updated documentation.
* Updated --list-config to report whether a JVM is forked.
* Added test case.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-08-13 17:32:53 +02:00
Joakim Erdfelt 3b7957cfb0
Expose buildNumber properly in `--list-config`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-05-11 12:34:59 -05:00
Simone Bordet 1e3f3a3cbb
Fixes #6049 - Default provider [files] section always executed (#6051)
* Fixes #6049 - Default provider [files] section always executed

Keeping only enabled modules when processing the modules,
so that default provider modules don't get processed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-12 10:41:51 +02:00
Greg Wilkins 303e031235
Added before dependents to Modules (#6080)
Added `before` section to a module to control ordering
rename `options` section to `after`

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-24 13:31:36 +01:00
Joakim Erdfelt 40b42c9388
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-18 16:09:11 -06:00
Joakim Erdfelt f2bed1368b
Issue #5492 - changed from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-18 11:14:54 -06:00
Simone Bordet 322d1018a7 Improvements to the Jetty documentation.
Documented the Jetty modules.

Improved the TOC javascript, as it was not working if the link had sub-elements.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-17 15:58:36 +01:00
Joakim Erdfelt 7ed68d0681
Issue #5492 - Updating jetty-start property test expectations
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 14:25:09 -06:00
Joakim Erdfelt d6ec96fe1b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-15 14:18:08 -06:00
Joakim Erdfelt 1b15c1e4a3
Issue #5492 - Changing from "java.feature.*" to "runtime.feature.*"
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 13:09:24 -06:00
Joakim Erdfelt de5b8bc84a
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5492-java-features-start-properties 2021-02-15 12:59:48 -06:00
Joakim Erdfelt 5dd987779c
Adding `WhitespaceAfter` checkstyle rule.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 12:48:24 -06:00
Simone Bordet 29d48b0de5 Improvements to the Jetty documentation.
Documented the Jetty start mechanism.

Reorganized the documentation to look better on the TOC.

Improved JettyIncludeExtension to support replacements, deletions and callouts.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-10 11:27:30 +01:00
olivier lamy 59bf0f9439 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-01-26 19:48:40 +10:00
olivier lamy 54d37c6aad tag this test as external
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-26 19:45:57 +10:00
olivier lamy da7fd63d98 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-01-26 18:26:18 +10:00
Joakim Erdfelt 4c51591407
Remove PMD from build (#5900)
* Remove PMD from build

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Attempt to fix log4j2 distribution test

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Fixing jetty-start tests to use configured maven.repo.uri property

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Using ${env.MAVEN_REPO_URI} configured at Jenkins.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* no need of this

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-26 18:17:29 +10:00
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:05:57 -06:00
Joakim Erdfelt 176e29e408
Happy New Year 2021
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 12:31:00 -06:00
Simone Bordet f836f87754 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-11 11:23:12 +01:00
Simone Bordet b45c32616c
Fixes #5844 - --download flag to jetty-start causes NullPointerException.
Added test case, null guard and a couple small fixes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-07 12:51:06 +01:00
olivier lamy 0c1f9636b3 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-14 09:24:17 +10:00
Olivier Lamy 9343844f15
Jetty 9.4.x spotbug issue map iteration using entrySet(), diamond list creation (#5804)
* fix some spotbug performance map iterations

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* cannot use computeIfAbsent because it is a PathMap

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-14 08:46:35 +10:00