Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,612 Commits 63 Branches 460 Tags 356 MiB
Commit Graph

2267 Commits

Author SHA1 Message Date
Greg Wilkins c798a747a9 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-05-06 07:47:09 +10:00
Olivier Lamy 2b78094546
Upgrade h2spec maven plugin 1.0.5 (#6229) 
* Upgrade h2spec maven plugin 1.0.5

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

* use release h2spec-maven-plugin 1.0.5

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-05-05 21:22:47 +10:00
olivier lamy d4f0bee371 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-04-27 10:28:05 +10:00
Olivier Lamy cda38abbad
Issue #5798 fix jetty runner startup error and add jsp support as well (#6115) 
* Issue #5798 fix jetty runner startup error and add jsp support as well

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

* Add test to ensure jetty runner starts correctly

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

* remove unused imports

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

* fix help description

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

* improvement based on Joakim comment, add it test with the path

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-04-27 10:26:33 +10:00
Chris Walker 12eabd856c Updating POM for documentation 
Signed-off-by: Chris Walker <chris@webtide.com>
 2021-04-15 18:30:47 -05:00
Chris Walker f5074cde23 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-04-15 18:29:05 -05:00
Chris Walker d825299da4
Fixing documentation pom values (#6181) 2021-04-15 18:19:50 -05:00
Olivier Lamy 3ee2ba7172 Updating to version 11.0.3-SNAPSHOT 2021-03-26 06:58:38 +00:00
Olivier Lamy 14ed9a5264 Updating to version 11.0.2 2021-03-26 06:41:47 +00:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
olivier lamy 61b5e1a8af revert back to 11.0.2-SNAPSHOT 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-03-26 16:15:49 +10:00
Olivier Lamy 7bd207b309 Updating to version 10.0.2 2021-03-26 06:13:42 +00:00
Olivier Lamy d27363fa55 back to 10.0.2-SNAPSHOT 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-03-26 06:10:47 +00:00
Jesse McConnell e1f2f8c989
Updating to version 11.0.3-SNAPSHOT 2021-03-25 11:14:04 -05:00
Jesse McConnell 0a126e2e21
Updating to version 11.0.2 2021-03-25 10:58:33 -05:00
Jesse McConnell 7a9e01ac56
Updating to version 10.0.3-SNAPSHOT 2021-03-25 10:38:15 -05:00
Jesse McConnell aac6bfbd48
Updating to version 10.0.2 2021-03-25 10:21:44 -05:00
Simone Bordet 6fca106160 Reverted version to 10.0.2-SNAPSHOT. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-03-25 16:02:45 +01:00
Olivier Lamy 3d0574d64c Updating to version 10.0.3-SNAPSHOT 2021-03-25 04:10:39 +00:00
Olivier Lamy ab235ad687 Updating to version 10.0.2 2021-03-25 03:57:25 +00:00
Joakim Erdfelt 4e41d8d3e9
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-10 06:24:53 -06:00
Olivier Lamy 06ea681032 fix some mod files: some url using http to https, use maven central if possible, upgrade log4j2 to 2.14.0 (#6048) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-03-10 19:17:21 +10:00
Joakim Erdfelt 3f0f57cefc Updating to version 11.0.2-SNAPSHOT 2021-02-19 16:20:48 -06:00
Joakim Erdfelt e98092c179 Updating to version 11.0.1 2021-02-19 16:02:24 -06:00
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 ecb9254069 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-19 09:38:43 +10: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 98518c96fe
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-02-18 11:39:59 -06: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
Jan Bartel c3de369a41 Update to Apache Jasper 10.0.2 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-02-17 18:39:47 +01:00
Ludovic Orban 22be42c436 Merge branch 'jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-02-17 16:38:06 +01:00
Jan Bartel d6d648316a
Issue #5941 Use Glassfish JSTL impl (#5942) 
* Issue #5941 Use Glassfish JSTL impl

Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-02-10 22:21:22 +01: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 82195e2c5a Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-01 10:14:41 +10: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 ed77b06165
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-30 10:13:20 -06: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 a6804ed207
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-28 16:10:23 -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
olivier lamy 3576909019 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-01-28 10:57:19 +10: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