Commit Graph

2087 Commits

Author SHA1 Message Date
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -06:00
olivier lamy ddec50eb2e Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-02-19 09:36:54 +10:00
Joakim Erdfelt 91cb3c06eb
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-18 11:28:39 -06:00
Joakim Erdfelt 4467f5c01a
Updating ant in our maven-invoker-plugin usages.
* Due to CVE-2020-1945

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-04 15:38:05 -06:00
Joakim Erdfelt c040bb5bf1
Updating ant in our maven-antrun-plugin usages.
* Due to CVE-2020-1945

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-04 09:38:04 -06:00
Joakim Erdfelt 5ad9bc9b3d
Merge pull request #5669 from eclipse/dependabot/maven/jetty-9.4.x/org.eclipse.jetty.toolchain-jetty-version-maven-plugin-2.7
Bump jetty-version-maven-plugin from 2.6 to 2.7
2021-02-02 12:15:53 -06:00
olivier lamy 5b97d91f59 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-02-01 10:12:39 +10:00
Olivier Lamy efbd1813ff
force properties encoding when filtering resources (#5929)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-01 10:11:09 +10:00
Simone Bordet 2f766632b3 Fixes #5924 - Javadoc build triggers maven error
Fixed javadoc generation error.
Apparently, this is caused by a doxia dependency of asciidoctor-maven-plugin
that transitively pulls in Apache HttpClient, but at an older version
that causes this error:

Exception in thread “main” java.lang.NoSuchMethodError: ‘org.apache.http.HttpHost org.apache.http.client.utils.URIUtils.extractHost(java.net.URI)’

Adding Apache HttpClient as an explicit dependency of the asciidoctor-maven-plugin
works around the issue.

Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-01 00:32:24 +01:00
Joakim Erdfelt 17958ef79d
Issue #5924 - Disabling javadoc module (again)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-30 10:12:50 -06:00
Joakim Erdfelt 8c34fdd4ca
Merge pull request #5928 from eclipse/jetty-10.0.x-5924-asciidoc-breakout
Issue #5924 - Reorganized jetty-documentation
2021-01-28 16:08:32 -06:00
Joakim Erdfelt 618bff71e2
Issue #5924 - Reorganized jetty-documentation
* New top level /documentation/
  Which is a parent pom
* Existing /jetty-documentation/ moved to new
  /documentation/jetty-documentation/ location
* New /documentation/jetty-asciidoctor-extensions/ project
  Created from the java code in the old
  /jetty-documentation/src/main/ tree
* Referencing new jetty-asciidoctor-extensions project
  in asciidoc plugin on /documentation/jetty-documentation/pom.xml
* All projects in /documentation/ are now on
  org.eclipse.jetty.documentation groupId

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-28 10:49:21 -06:00
Joakim Erdfelt f2fe26ffcd
Issue #5924 - Enable javadoc module again
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-28 10:10:26 -06:00
Joakim Erdfelt bf90ce2435
Issue #5942 - Disable javadoc module as it breaks the jenkins build.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-27 18:11:26 -06:00
Joakim Erdfelt 95797039bb
Disable javadoc module as it breaks the jenkins build. (See issue 5924)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-27 15:29:40 -06:00
Joakim Erdfelt aca497072e
Merge pull request #5921 from eclipse/jetty-10.0.x-cleanup-demo-embedded
Cleaning up demos/embedded
2021-01-27 13:33:38 -06:00
Joakim Erdfelt fb6a148e9c
Disable javadoc module as it breaks the jenkins build. (See issue 5924)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-27 13:33:14 -06:00
Joakim Erdfelt cd4c046988
Restore javadoc module + Upgrade errorprone
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-27 12:03:42 -06:00
Jan Bartel 4c44d83b45
Issue #5901 Update to javax.servlet.api 4.0.6. (#5918)
This brings in a change to the javax.servlet.api module-info
to open the javax.servlet.resources package to all modules,
so that the dtds and xsds can be retrieved as resources, either
from the context Classloader.getResource, or
from the ServletContext.class.getResource.

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-27 09:06:14 +01:00
olivier lamy f189967128 temporary remove this as it is causing failure....
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-27 15:44:27 +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
Simone Bordet 95b5cfd532
Fixes #5902 - Grab Jetty startup output in documentation. (#5906)
* Fixes #5902 - Grab Jetty startup output in documentation.

Implemented an Asciidoctor extension that uses `JettyHomeTester` to run
Jetty and capture its output.
This extension is triggered by the `ServiceLoader` mechanism, so the
documentation jar is now in the plugin classpath.

Introduced `jetty-halt.xml` so that the JVM can be halted.
In this way, Jetty does not produce the "stopping" log lines and
therefore they won't be grabbed and included in the documentation.

Used the new `include::jetty[]` directive in the documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
2021-01-25 14:21:17 +01:00
Ludovic Orban 422a63a1b4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-22 08:49:44 +01:00
Ludovic Orban 9840a82e8c force LC_ALL env variable when running tests
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-22 08:38:26 +01: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
Joakim Erdfelt 2e53ec5384 Updating to version 9.4.37-SNAPSHOT 2021-01-14 11:27:24 -06:00
Joakim Erdfelt 238ec6997c Updating to version 9.4.36.v20210114 2021-01-14 10:29:28 -06:00
Lachlan Roberts c3e8e8d395 Rename jar to jetty-keystore, remove main from KeystoreGenerator.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 16:42:25 +11:00
Lachlan Roberts c2b9d92a2f Issue #1673 - generate keystore when using test-keystore module
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-06 18:07:42 +11:00
olivier lamy 05712f0c60 fix and simplify build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-30 21:43:29 +10:00
olivier lamy 712027de1c Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-30 18:14:52 +10:00
olivier lamy 960dac2a5d add a fast profile to quickly build everything
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-30 18:13:13 +10:00
Olivier Lamy 06df421b56
Remove javax.* dependencies (#5776)
remove non needed enforcer rule in websocket poms
force search transitive

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-22 08:17:16 +10:00
olivier lamy 6769a83d3d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-16 20:03:28 +10:00
Olivier Lamy 38f0fc4c7f
Upgrade testcontainers to 1.15.1 (#5814)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-16 19:38:54 +10:00
Joakim Erdfelt 2662be0a05
Merge pull request #5795 from eclipse/jetty-10.0.x-5784-fix-dual-license-text
Issue #5784 - fix dual license text
2020-12-11 11:37:58 -06:00
olivier lamy 9b100a5bfb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-11 12:10:35 +10:00
Joakim Erdfelt a8d68360f8
Issue #5784 - Removing infinispan exclusions on license checker
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-10 19:55:36 -06:00
Joakim Erdfelt 29744ef8fd
Issue #5784 - Cleaning up jetty-ant license checks
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-10 19:50:52 -06:00
Olivier Lamy 639cad63fe
Jetty 9.4.x optimize parser warning from logs and add spotbug (#5735)
* enable spotbugs in CI

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

record issues

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

use warning new generation

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

activate errorprone

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

fix Jenkinsfile

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

do not run spotbugs for jetty-runner as we do not want to fix all dependencies bugs :)

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

junit should allow empty results

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

maven console can be use only once...

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

one liner

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

recordissues only once

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

force id

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

aggregate results

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

configure a name for aggregated reports

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

mo more -T3 no need anymore of remote session test profile

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

I want to see what failing tests look like with new report.

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

skip spotbugs for jetty-jmh

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

get rid of findbugs as we now have spotbugs

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

Revert "I want to see what failing tests look like with new report."

This reverts commit df0d13e4c53d7461872e1f925ec06bd36e4a66c9.

activate errorProne parser

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

make pmd quiet for CI

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

remove -fae flag and do not display transfer progress

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

try junitParser() to see what it does

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

junit parser is a bad idea...

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

increase timeout

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

no -T2 for javadoc

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

fix skip spotbugs and pmd verbose

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

* remove -T options

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 11:47:26 +10:00
Joakim Erdfelt 0a70fbf206
Merge remote-tracking branch 'origin/release-10.0.0' into jetty-10.0.x 2020-12-09 15:28:26 -06:00
olivier lamy 1744687e8d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-09 07:03:35 +10:00
Olivier Lamy be5d968c4b
Upgrade h2spec maven plugin to 1.0.3 (#5770)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-09 06:59:02 +10:00
Olivier Lamy 9deaef0de4
remove configuration for plugin clirr as it is not used (#5771)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-09 06:58:08 +10:00
Joakim Erdfelt 9319f10425 Updating to version 10.0.1-SNAPSHOT 2020-12-02 15:30:13 -06:00
Joakim Erdfelt b9645a1737 Updating to version 10.0.0 2020-12-02 15:04:53 -06:00
Jan Bartel 7b77a532a8 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-30 14:42:18 +01:00