Commit Graph

185 Commits

Author SHA1 Message Date
Jan Bartel 89045959ac
Issue #5013 Classloader.getResources resolves preferentially from osgi bundle loader (#5034)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-07-20 11:05:18 +02:00
Jan Bartel 6c161ca5c0 Fix checkstyle violation. 2020-07-08 09:04:53 +02:00
Jan Bartel 0808b5c0fc
Issue #4989 Prevent parsing of module-info.class in osgi bundles (#4991)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-07-07 14:07:19 +02:00
Jan Bartel e2af6419ae
Issue #4820 jetty-deployer.xml should be jetty-deploy.xml for osgi (#4821)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-28 11:38:38 +02:00
Simone Bordet 9bb92f81bd Issue #4443 - Track backport of ALPN APIs to Java 8.
Modified jetty-alpn-openjdk8-* classes to support both
pre 8u252 (via alpn-boot) and post 8u252 (via standard API).

Replaced usages of -Xbootclasspath with -javaagent, and
using Jetty ALPN Agent jar rather than Jetty ALPN boot jar.

Removed all alpn-1.8.0*.mod files since now it is
possible to use a fixed version of the ALPN Agent
to cover all the versions.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 11:40:29 +01:00
Joakim Erdfelt 8c65309963
Addressing Checkstyle violations in src/test/java
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 12:33:34 -06:00
Simone Bordet 923ec38adf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-07 16:51:25 +01:00
Simone Bordet e3c8546667 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-07 16:35:05 +01:00
Simone Bordet de890bb1b7 Happy New Year 2020.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
olivier lamy e1371a1c13 happy new year
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
Jan Bartel cfd21864cf
Issue #4350 Remove exclude of MultiInputStreamParser from jetty-util osgi (#4356)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 11:45:33 +11:00
Lachlan c336616c96
Issue #2709 - reduce default headerCacheSize to 1024 (#4292)
make headerCacheSize on HttpReceiverOverHTTP configurable

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-08 21:57:49 +11:00
康智冬 3a6b26d292 fix typo (#4055)
Signed-off-by: KangZhiDong <worldkzd@gmail.com>
2019-09-05 13:17:30 -04:00
康智冬 49ba6d1acb fix typo and grammar (#4045)
Signed-off-by: KangZhiDong <worldkzd@gmail.com>
2019-09-02 14:29:50 -04:00
Olivier Lamy fe3d3f7158
fix checkstyle in test sources (#4013)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-22 19:56:41 +10:00
Olivier Lamy 1b6bf389d6
Jetty 9.4.x pax exam upgrade for central repo https, pre download all artifacts for maven its (#3902)
* ensure we use local repository first to avoid download, upgrade pax versions
pre download artifacts to avoid download by maven invoker its

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

* force using local repository first see https://issues.apache.org/jira/browse/MINVOKER-249

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

* use local setttings to use mirrors

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

* use https

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

* install build resources first to avoid checkstyle build issue

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

* downgrade pax-swissbox-framework as the pax exam seems to use this one and want to download it...

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

* fix enforcer rule RequireUpperBoundDeps...

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

* not used anymore

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

* force pax url to use provided settings via Jenkins withMvn

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

* renove debugging System.out

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

* version is defined in the project

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

* cleanup after Jan review comments

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-30 11:13:54 +10:00
Greg Wilkins 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
Simone Bordet 6fb243ff6c Issue #3464 - Split SslContextFactory into Client and Server
Introduced SslContextFactory subclasses Client and Server.
Replaced all usages of SslContextFactory with either Client or Server
as required.

Refactored configuration checking so that warnings are not emitted
when non necessary.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-21 14:42:42 +01:00
Simone Bordet 123918018e Issue #3425 - Upgrade conscrypt version to 2.0.0 and remove usage of reflection.
Small fixes after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-15 09:19:16 +01:00
olivier lamy a21dab222f fix simone review comments
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 16:29:21 +01:00
olivier lamy e2ddfbde00 Issue #3425 upgrade conscrypt to 2.0.0 disable TLSv1.3 for jdk8 tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 11:35:10 +01:00
Joakim Erdfelt f5b3ddc1a5 Adding optionalRemoteDebug feature to test-jetty-osgi 2019-02-28 16:10:46 -05:00
Simone Bordet 13cee0bc4d Issue #3049 - Warn on common SslContextFactory problematic configurations.
Updating SslContextFactory configuration for tests, take 2.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-31 16:51:20 +01:00
Jan Bartel 9f3f3b78ae
Issue #3250 Ease osgi debugging (#3251)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-01-15 14:38:16 +11:00
Olivier Lamy 9b7afd8a03
Happy new year!! (#3232)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
Jan Bartel 54319589a4 Fix conscrypt version for osgi 2018-11-23 16:13:30 +01:00
Jan Bartel 10622f3455
Issue #3109 Remove unnecessary aries-util. (#3110)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-11-19 15:19:14 +01:00
Olivier Lamy 3ef33764cb
Issue #3054 Jetty 9.4.x spifly upgrade (#3079)
* spifly 1.0.15-SNAPSHOT

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

* upgrade org.apache.aries.spifly.dynamic.bundle to 1.1

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

* Make osgi work with spifly 1.1

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-11-08 07:24:42 +10:00
Simone Bordet 44ac57040a Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-10-17 12:36:56 +02:00
Joakim Erdfelt 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
Olivier Lamy 74e30605ed
should fix osgi test with missing dependencies (#2809)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-15 22:10:26 +10:00
lachan-roberts e05c11ae30 Changing default Http headerCacheSize from 512 to 4096
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2018-07-10 10:39:45 +10:00
Carter Kozak cd60da7a12 fix #2342 Upgrade Conscrypt to 1.1.4
Fixes https://github.com/google/conscrypt/issues/491

Signed-off-by: Carter Kozak <c4kofony@gmail.com>
2018-06-29 08:41:34 -04:00
Simone Bordet 4f1dd352d6
Issue #2468 - Remove SoLinger. (#2644)
* Issue #2468 - Remove SoLinger.

For non-blocking sockets, StandardSocketOptions#SO_LINGER javadocs
report that the behavior is undefined. In JDK 11 setting SoLinger
for non-blocking sockets will be ignored.

As such, there is no point in allowing SoLinger to be configured
in Jetty that only uses non-blocking sockets.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-09 13:21:24 +02:00
Jan Bartel a6532f7116 Fix osgi jetty-testrealm.xml file. 2018-06-08 10:52:15 +02:00
Jan Bartel 72404d15d6 Make mavenRepoPath system property optional for osgi tests 2018-04-05 14:02:38 +10:00
Greg Wilkins 2905d081b4
Merge pull request #2265 from eclipse/jetty-9.4.x-2262-sanitize-osgi-code
Jetty 9.4.x 2262 sanitize osgi code
2018-03-06 17:36:57 +11:00
Jan Bartel c73ecae431
Jetty 9.4.x 2059 make osgi tests work jre9 (#2264)
* Issue #2059 WIP: make osgi tests work with jdk9

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-03-06 11:04:50 +11:00
olivier lamy ee61f381ba add pax property with local maven repo used
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-02 20:26:17 +10:00
Jan Bartel 05e2527b5c Issue #2262 Sanitize osgi code
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-03-01 17:31:39 +11:00
Jan Bartel 8cf357a17d
Jetty 9.4.x 2247 2256 modernize osgi test code (#2258)
* Issue #2247 Ensure random unused ssl port for osgi tests

Signed-off-by: Jan Bartel <janb@webtide.com>

* Issue #2256 code cleanup of osgi tests

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-03-01 10:14:37 +11:00
Jan Bartel 0b89ffd055 Issue #2247 Ensure random unused ssl port for osgi tests
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-28 15:03:44 +11:00
Jan Bartel 1e8422935c Issue #2164 Add test for javax.websocket in osgi
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-20 16:28:39 +11:00
Jan Bartel 17f518ffb1 Issue #2164 Update websocket manifests for osgi and add test in osgi
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-20 16:28:39 +11:00
Greg Wilkins ab5fc29cca Jetty 9.4.x 1803 proposal 0 - single ReservedThreadExecutor (#2119)
Issue #1803 - Review usage of scheduling strategies

Use a single ReservedThreadExecutor built into the QueuedThreadPool
via new interface TryExecutor.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-02-08 11:08:48 +01:00
Joakim Erdfelt 21365234f8 Issue #2108 - Updating license headers for year 2018 2018-01-09 09:44:41 -06:00
Joakim Erdfelt 41ed9f29f4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-01-09 09:37:25 -06:00
Joakim Erdfelt fa4c7b0ca9 Issue #2108 - Updating license headers for year 2018 2018-01-09 08:39:37 -06:00
Joakim Erdfelt 067fc5d2d8 Issue #2108 - Upgrade licenses for 2018 2018-01-09 07:42:06 -06:00
Jan Bartel 18cd1fb8df
Issue #2057 Add conscrypt test in osgi (#2058)
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-14 09:48:12 +01:00