baa325d56c
Updated ALPN version for JDK 8u221 and 8u222.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-07-20 19:43:20 +02:00
d744d097de
Checkstyle cleanup ( #3847 )
...
* Checkstyle cleanup
* fixed bug from reformat
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 17:24:08 +02:00
5568f833e7
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-03 16:53:00 +02:00
bb7fb48f08
Fix checkstyle warnings for tests. ( #3846 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-03 16:42:20 +02:00
b7a7a53a18
Jetty 10.0.x reformat ( #3812 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"
# Conflicts:
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml
* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:42:39 +02:00
9706d70484
Jetty 9.4.x reformat ( #3811 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
internal default values.
We want to keep those values as a hedge against future default
value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:40:30 +02:00
2256c532be
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-22 10:30:25 +02:00
e8f11d3c7e
Added small performance improvements
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-22 08:27:53 +02:00
2ba8542ed1
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-05-09 07:12:27 +10:00
a176c60c5c
reformatted code
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-08 14:15:10 +02:00
cced3bd5e6
Added Unit Tests to increase code coverage.
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-07 18:01:10 +02:00
ad3b2bc4d0
Removed files merged by mistake.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-18 18:39:51 +02:00
b3381646a5
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-2/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/infinispan-common/pom.xml
# jetty-infinispan/infinispan-embedded-query/pom.xml
# jetty-infinispan/infinispan-embedded/pom.xml
# jetty-infinispan/infinispan-remote-query/pom.xml
# jetty-infinispan/infinispan-remote/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/pom.xml
# jetty-nosql/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-server/pom.xml
# jetty-servlet/pom.xml
# jetty-servlets/pom.xml
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/pom.xml
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/jetty-websocket-common/pom.xml
# jetty-websocket/jetty-websocket-tests/pom.xml
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/jetty-jmh/pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-distribution/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-http2-webapp/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-simple-webapp/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2019-04-18 11:25:58 -05:00
038c7ee6d7
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2019-04-18 18:07:00 +02:00
1f31f52a5a
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2019-04-18 18:01:59 +02:00
03243ebfbd
Updated ALPN version for JDK 8u211 and 8u212.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-18 17:55:06 +02:00
1f046f44fe
Fixing CRLF issues.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 15:24:29 -05:00
edaefdbb3b
Fixing CRLF files
2019-04-03 11:56:07 -05:00
6f7e1e3c48
Fixes #3333 - Jetty 10 standalone cannot start on the module-path.
...
Added --add-modules=ALL-MODULE-PATH by default because now Jetty has
proper JPMS modules and when starting in standalone mode only the
org.eclipse.jetty.xml module will be in the module graph - while
before automatic modules where added to the module graph implicitly.
Added --add-reads=ALL-UNNAMED to the websocket module to allow the
websocket implementation to access method handles of application
classes (the websocket endpoints) that live in the web application
classloader (which forms an unnamed module).
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-07 17:48:17 +01:00
2a8b4c4c47
Updated ALPN to JDK 8u201 and 8u202.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:25:39 +01:00
0e17b56aaf
Updated ALPN to JDK 8u201 and 8u202.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:12:25 +01:00
cdd553332c
Updated ALPN version for JDK 8u201 and 8u202.
2019-01-16 17:03:51 +01:00
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
fe1b515d25
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-10-21 10:18:36 +11:00
d048dd321e
Merge branch 'jetty-9.4.x' into jetty-9.4.x
2018-10-18 17:07:24 +11:00
932f1a7516
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-10-17 15:49:54 +02:00
44ac57040a
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-10-17 12:36:56 +02:00
add74bf889
Updated ALPN version for JDK 8u191 and 8u192.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-17 11:56:39 +02:00
41663d8e5c
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-10-11 00:36:10 +02:00
1fe6c92ee9
Issue #2948 - Require JDK 11 for Jetty 10.x.
...
First pass at making Jetty 10.x require JDK 11.
* Removed JDK 8 modules (in particular ALPN and ALPN *.mod files).
* Removed profiles targeting JDK 8, 9 and 10.
* Updated dependencies to newer versions that support JDK 11.
* Temporarily commented out the Jetty Maven Plugins due to
maven-plugin-plugin not working with JDK 11.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-03 11:15:30 +02:00
02eccd55ae
Issue #2191 - JPMS Support.
...
NPE fixes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-28 10:22:51 +02:00
587ecfeb9c
Issue #2191 - JPMS Support.
...
Code cleanups.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-26 13:36:51 +02:00
81d02893dc
Issue #2191 - JPMS Support.
...
Using BaseHome.getPaths() to resolve paths for patches modules.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-26 13:21:40 +02:00
e4ff653295
Issue #2191 - JPMS Support.
...
Introduced --jpms option in jetty-start to run Jetty from the module-path.
Introduced [jpms] sections in *.mod files, to specify JPMS command line
options that needs to be added to the command line generated by jetty-start.
Bumped java.transaction-api to 1.3 because it has Automatic-Module-Name.
Fixed ASM version lookup using ManifestUtils.
Fixed WebInfConfiguration.findAndFilterContainerPaths() to properly
scan the module-path, which may contain both files and directories.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-25 22:11:25 +02:00
78d529b13a
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'.
2018-09-24 15:23:30 +02:00
60e3562f99
Issue #2191 - JPMS Support
...
Turns out that Package.getImplementationVersion() and similar return
null when running from the module path, so the logic in StartArgs
broke and prevented Jetty to start.
Introduced ManifestUtils to retrieve the manifest file from JarFile,
so that attribute entries can be retrieved independently from the JDK
version or module-path vs class-path.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-17 19:32:00 +02:00
cd7138131e
Fix outdated bundle vendor
...
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2018-09-12 10:56:05 +08:00
a3f1592c50
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 10:07:17 +10:00
45d5bd2cae
Issue #2719 --list-config shows properties from files
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-21 12:19:11 +10:00
96218e8bc4
Fix typos detected by github.com/client9/misspell
...
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
2018-08-10 23:52:16 +09:00
eceaff7bed
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-07-18 16:21:00 +02:00
37e4da24cb
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-07-18 16:15:27 +02:00
7845497702
Updated ALPN version for JDK 8u181.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-18 15:47:39 +02:00
346879f2a5
Merge pull request #2664 from mperktold/jetty-9.4.x
...
Issue #2662 Unnecessary boxing conversions
2018-06-13 22:52:27 +02:00
f901efc413
Issue #2662 - Unnecessary boxing conversions
...
Signed-off-by: Matthias Perktold <tias251@gmail.com>
2018-06-13 16:20:12 +02:00
71dc6d9ceb
delete file if exist to prevent build failure for non clean build #2650 ( #2651 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-12 09:23:39 +02:00
04c1447f88
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2018-05-21 16:34:06 -05:00
4f947c7ee5
Issue #2556 - Adding Testcase to verify report
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-21 16:32:56 -05:00
07b3367519
#2472 it looks https://central.maven.org/maven2 does not work anymore ( #2538 )
...
* #2472 it looks https://central.maven.org/maven2 does not work anymore
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* #2472 add unit test we correctly download files from default repo
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use maven format to download alpn boot jar modules
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* change default to https://repo1.maven.org/maven2 #2472
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-18 08:21:29 +10:00
d9de386b28
Updated documentation in light of #2403 .
2018-05-02 10:34:29 -04:00
0ea704a29a
Fixing merge issue
2018-04-25 16:30:47 -05:00
47586c5449
Fix typo ( #2480 )
...
* fix typo for #2403
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* default url to download artifacts must be https per default #2472
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use dot rather than dashes
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use central.maven.org as default
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-26 06:20:01 +10:00
fbbf5d2d2d
allow --add-to-start to specify maven repository location #2403 ( #2473 )
...
* allow --add-to-start to specify maven repository location #2403
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-25 10:57:45 +10:00
6e2cd06c89
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-04-20 10:31:39 +02:00
8323417622
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-04-20 10:27:14 +02:00
d7ce334f8f
Updated ALPN version for JDK 8u171 and 8u172.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-20 10:16:50 +02:00
b26817767b
Fixed test that was not working with JDK 11.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-10 11:11:31 +02:00
afd0677719
Fixes #2358 - Add ALPN module file for JDK 10.
...
Also added ALPN module file for JDK 11.
Removed merge leftovers under directory protonego-impl/.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-20 11:00:47 +01:00
534b8ea38b
Add edit warning for .mod files. Resolves #173
2018-03-15 13:23:42 -04:00
44546e5ca9
Fixing jetty-start tests
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-15 07:36:50 -05:00
4ce7e9591b
Safer simpler version parsing #2284
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-15 22:49:20 +11:00
a128b87e3a
Jetty 9.4.x #2279 start update params ( #2285 )
...
Jetty 9.4.x #2279 start update params (#2285 ):
* Cleanup and Unify param update logic #2279
* Cleanup system property source #2279
* Cleanup property source #2279
* Property cleanup for #2279
* Removed duplicate Prop and Property classes
* properties are only updated/set if value source is not from ?=
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-07 16:33:28 +11:00
bcb9fa3b32
Merge pull request #2257 from lachlan-roberts/jetty-9.4.x-2206-ReferenceEquality
...
Resolved errorprone ReferenceEquality warnings #2206
2018-03-07 11:11:40 +11:00
020ebde77c
found additional ReferenceEquality warnings which have been resolved
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-06 14:28:11 +11:00
e2b9351662
Avoid NPE in exception for bad version #2284
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-06 13:13:41 +11:00
716a703b4e
support 10 as well
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-18 19:01:24 +10:00
43f99d8857
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-01-17 12:00:13 +01:00
53eebd045c
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-01-17 11:56:26 +01:00
3de4de99d3
Updated ALPN version for JDK 8u161 and 8u162.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-01-17 11:46:12 +01:00
21365234f8
Issue #2108 - Updating license headers for year 2018
2018-01-09 09:44:41 -06:00
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
067fc5d2d8
Issue #2108 - Upgrade licenses for 2018
2018-01-09 07:42:06 -06:00
26a4909c88
Use shaded utils in start for JavaVersion and TopologicalSort #2090 ( #2094 )
...
* shaded TopologicalSort. Use shaded start in jetty-home
* removed unused property
* jetty-start shaded dependency
* removed component dependencies from TopologicalSort
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-06 11:23:37 +01:00
595c6ac1ee
Issue #2090 Java Version JEP223. Use shaded util in start.
2018-01-04 13:13:39 +01:00
7f6e2e8dd0
Issue #1933
...
Cherry-pick of 29373c644d170e
2017-11-22 13:53:38 +01:00
44d170e2e0
Issue #1933
...
Do not set java.class.path when running with the distro.
2017-11-21 18:12:16 +01:00
f8ce63c125
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-10-18 10:53:16 +02:00
55d461ae17
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-10-18 10:50:40 +02:00
a74ad00b77
Update ALPN support for Java 8u151 and 8u152.
2017-10-18 10:44:18 +02:00
8bcf10395d
Fix #1814 Java Version utility
2017-10-17 15:25:25 +11:00
3399fd36dc
Fix #1814 Java Version utility
2017-09-13 15:20:43 +10:00
89bcba9a78
Clean imports in start
2017-09-06 12:02:16 +10:00
1311052b15
Cleaning up state of branch to match the original jetty-9.4.x
...
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
585f126b48
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x-clean
2017-08-08 09:24:41 -07:00
a8ca4d23c6
Fixes #1702 - Update ALPN for JDK 8u144.
2017-08-08 09:15:38 -07:00
a2d63141e9
Fixed location of ALPN files for JDK 8u141.
2017-08-08 09:15:16 -07:00
489f68c708
Fixes #1685 - Update ALPN support for Java 8u141.
2017-08-08 09:15:12 -07:00
b616249603
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-08-01 11:14:28 +02:00
d4d5211ede
Fixes #1702 - Update ALPN for JDK 8u144.
2017-08-01 11:05:30 +02:00
6782a6fafd
Fixed location of ALPN files for JDK 8u141.
2017-07-24 10:50:48 +02:00
a0026fd9d2
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-07-24 10:44:39 +02:00
3f94a5d132
Fixes #1685 - Update ALPN support for Java 8u141.
2017-07-24 10:08:10 +02:00
04019675f6
Issue #1505 remove trailing / from jetty.home.uri
2017-05-12 10:55:35 +02:00
861372c70d
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-05-02 22:16:45 +02:00
c955fb609e
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-05-02 22:12:29 +02:00
9ba7b713d2
Fixes #1523 - Update ALPN support for Java 8u131.
2017-05-02 22:01:00 +02:00
9e65d1ebcb
Issue #1505
...
* minor cleanups of ClasspathPattern
* defined jetty.home.uri and jetty.base.uri in start.jar and webapp configuration properties
* minor cleanup of start.jar property handling (more needed)
* updated location classpathpatterns in modules
2017-04-26 14:54:37 +02:00
68c7a1d960
Fixes #1494
...
Converted dependencies from a Set to a List, so the order of dependencies
can be used to help select between multiple provides. More specifically,
stop an unordered Set allowing one dependency to trigger a default provider
when an earlier specified dependency enables a specific provider.
2017-04-21 14:26:28 +10:00
4eda32ddca
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-02-15 11:54:19 -07:00
852d9d5c01
Issue #1326 - Search system properties too for --stop
...
+ The NPE should be cleared up as well
2017-02-15 10:38:37 -07:00
5e57b9562f
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:14:10 -07:00
9a8f22d5dd
Testing Updates
...
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
in jetty-test-helper and the test classes.
2017-02-02 15:51:38 -07:00
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd4565c186d7
2017-01-19 18:26:43 +01:00
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
a7938910b7
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-18 18:54:47 +01:00
53281d3202
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-01-18 18:52:20 +01:00
79202d1cc6
Updated ALPN version for JDK 8u121.
2017-01-18 18:30:30 +01:00
fc947c92fd
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-17 15:53:13 +01:00
f6ea2e4fa5
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
Made module tests work with JDK 9 too.
2017-01-17 15:38:50 +01:00
999195fdb7
Issue #1260 expand system properties for exec
2017-01-13 19:11:24 +11:00
07fb9c97db
Issue #1260 expand system properties
2017-01-13 17:49:27 +11:00
e539d0b1fd
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-12 17:52:45 +01:00
11d669092a
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
8cd46e7918
Issue #1195
2016-12-22 11:59:28 +11:00
2a2af4c026
Issue #1195
2016-12-22 11:56:21 +11:00
b2162cb347
Merge pull request #1159 from WalkerWatch/issues/1139
...
Issue #1139 - Documented new features and misc cleanup.
2016-12-14 13:10:28 -07:00
dd50c9fa24
Fixes #1163
2016-12-12 19:55:40 +11:00
ff804b6445
Issue #1139 - Documented new features and misc cleanup.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-09 15:15:39 -05:00
52f3f70f36
Issue #1139
...
Added --update-ini option to set properties in existing ini files.
2016-12-07 20:54:12 +11:00
73ee8f29bd
Issue #1139 fixed javadoc
2016-12-02 14:12:15 +11:00
8dcdea45a1
Issue #1139 fixed empty directory commit
2016-12-02 14:05:54 +11:00
7a741f93ee
Issue #1139 read command line from file
2016-11-30 21:20:50 +11:00
95eef4e98c
Issue #1139 set properties during --add-to-start
2016-11-30 20:33:34 +11:00
5aebf6c46c
Windows test case fix
2016-10-31 11:34:19 -07:00
8421a9b200
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-10-26 11:13:03 +02:00
338e924a5d
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-10-26 11:10:19 +02:00
4cc5178944
Updated ALPN version for JDK 8u111 and 8u112.
2016-10-26 11:03:43 +02:00
e1c72c26dc
fixed javadoc #984
2016-10-20 23:58:30 +11:00
97470c4736
Overlay directories for modules #1013
...
Implemented overlay directories for modules.
Implemented by extending the basehome initializer to be able to handle
directory to directory copies, with a default of jetty.base if no location
is specified.
2016-10-20 17:44:39 +11:00
6bc8717053
Improve logging modules and listing #984
...
Trim provider list and accept as default if only 1 available
2016-10-20 10:06:52 +11:00
ae228cc49a
Removed deprecated [name] section from ALPN modules.
...
The [name] section was only needed when ALPN coexisted with NPN.
2016-10-19 16:34:24 +02:00
a5d4518f94
Improved error messages.
2016-10-19 16:32:16 +02:00
582de49311
Improved error message for modules that are no longer available.
2016-10-19 15:56:28 +02:00
0e56cd4eb2
Fixed message formatting.
2016-10-19 11:36:21 +02:00
05a968b6fb
reverted accidental commit #984
2016-10-19 20:20:04 +11:00
631437060b
Improve logging modules and listing #984
...
Improved logging dependencies
2016-10-19 17:29:39 +11:00
b82d4ee2fe
Improve logging modules and listing #984
...
Avoid sorting all modules. Only sort enabled modules. This allows for
cycles to exist within all modules, but they are only seen as a problem if they
actually enabled.
2016-10-19 16:25:18 +11:00
69a676036d
Improve logging modules and listing #984
...
Improve usage text for property assignment
2016-10-19 16:25:18 +11:00
a0a1c83964
Improve logging modules and listing #984
...
Use ERROR instead of WARN for fatal start problems
improved log formatting
2016-10-19 16:25:18 +11:00
b11757a1e2
Issue #984 Improve module listing
...
Fixed cycle in logging from gcloud datastore
2016-10-14 15:42:12 +11:00
68e86e4d4e
Deprecated Modules #1003
...
Added deprecated.properties file to provide more details of deprecated modules
2016-10-14 10:48:51 +11:00
d9c2352966
Issue #984 Improve module listing
...
improved logging of file copies
renamed stderrout-logging to stderrout-capture
2016-10-14 10:17:39 +11:00
c7b833c595
Issue #984 Improve module listing
...
Changed |= to ?= for optional property set
2016-10-13 16:37:24 +11:00
d5a4f0f6d4
Issue #984 Improve module listing
...
Simplified start.jar ini mechanism
updated logging modules to have file handlers
2016-10-13 16:37:24 +11:00
438ecb8dc3
code cleanup
2016-10-13 16:37:24 +11:00
Simone Bordet
Greg Wilkins
Jan Bartel
Michael Hausegger
olivier lamy
Joakim Erdfelt
Olivier Lamy
Yanming Zhou
Kazuhiro Sera
Matthias Perktold
WalkerWatch
Lachlan Roberts
olivier lamy
Jesse McConnell