Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,241 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

1153 Commits

Author SHA1 Message Date
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
Joakim Erdfelt 40e9e053b9
Merge pull request #3768 from eclipse/jetty-9.4.x-3708-stringutil-replace 
Issue #3708 - use StringUtil alternatives for known slow JVM impls.
 2019-06-13 14:01:35 -05:00
Joakim Erdfelt 877815e195 Issue #3708 - Adding new methods and converting codebase to use them 
+ StringUtil.replace(String, char, char)
+ StringUtil.strip(String, String)
+ URIUtil.encodeSpecific(String, String)
+ URIUtil.decodeSpecific(String, String)
+ TypeUtil.toClassReference(Class)
+ TypeUtil.toClassReference(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-12 09:56:41 -05:00
Joakim Erdfelt 33fe55c339 Issue #3708 - use StringUtil alternatives for known slow JVM impls. 
+ StringUtil.replace()
+ StringUtil.replaceFirst()
+ StringUtil.sanitizeFileSystemPath()

Change existing usages of String.replace() to either
use new StringUtil.replace() or other methods elsewhere
that better suit that specific need.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-11 11:25:50 -05:00
Joakim Erdfelt ae21126cad Updating to version 9.4.20-SNAPSHOT 2019-06-10 13:40:17 -05:00
Joakim Erdfelt afcf563148 Updating to version 9.4.19.v20190610 2019-06-10 11:17:56 -05:00
Joakim Erdfelt 6686083462 Issue #3743 - Using only Location based XmlConfiguration in Jetty itself 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-06 11:55:01 -05:00
Joakim Erdfelt 734be56938 Updating to version 9.4.19-SNAPSHOT 2019-04-29 16:27:23 -05:00
Joakim Erdfelt e1bc35120a Updating to version 9.4.18.v20190429 2019-04-29 15:40:33 -05:00
Joakim Erdfelt 05bb111580 Updating to version 9.4.18-SNAPSHOT 2019-04-18 15:59:49 -05:00
Joakim Erdfelt aa1c656c31 Updating to version 9.4.17.v20190418 2019-04-18 14:44:28 -05:00
Joakim Erdfelt 5882d63ba7 Updating to version 9.3.28-SNAPSHOT 2019-04-18 13:54:17 -05:00
Joakim Erdfelt d3e249f869 Updating to version 9.3.27.v20190418 2019-04-18 13:10:03 -05:00
Joakim Erdfelt 2c14d93885 Updating to version 9.2.29-SNAPSHOT 2019-04-18 12:17:07 -05:00
Joakim Erdfelt 1dffa36fe3 Updating to version 9.2.28.v20190418 2019-04-18 11:23:17 -05:00
Joakim Erdfelt 79537a5f51 Updating to version 9.4.17-SNAPSHOT 2019-04-11 11:00:24 -05:00
Joakim Erdfelt e0aa4ae4c0 Updating to version 9.4.16.v20190411 2019-04-11 10:01:26 -05:00
Joakim Erdfelt 9b19374c5d Updating to version 9.2.28-SNAPSHOT 2019-04-03 19:38:05 -05:00
Joakim Erdfelt 84dfe74b97 Updating to version 9.2.27.v20190403 2019-04-03 19:04:45 -05:00
Joakim Erdfelt c70034766e Updating to version 9.3.27-SNAPSHOT 2019-04-03 18:46:31 -05:00
Joakim Erdfelt dae476e369 Updating to version 9.3.26.v20190403 2019-04-03 18:16:32 -05:00
Joakim Erdfelt 2ccde9772b Undoing bad release-9.3.26 2019-04-03 18:11:16 -05:00
Joakim Erdfelt 81356d9d18 Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-03 17:47:45 -05:00
Joakim Erdfelt cd3e8f0cd2 Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-03 17:47:33 -05:00
Greg Wilkins 9f4b3542cb Updating to version 9.3.27-SNAPSHOT 2019-04-03 17:32:08 +11:00
Greg Wilkins 7ec6d2fb32 Updating to version 9.3.26.v20190403 2019-04-03 13:06:51 +11: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
Joakim Erdfelt 9cdb59d4d7 Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
Joakim Erdfelt eb70b24016 Updating to version 9.4.15.v20190215 2019-02-15 11:53:00 -05:00
Simone Bordet 875af5c692 Restored Automatic-Module-Name that was removed in 471dab752. 
Cleaned up pom.xml files that required a correct JPMS module name.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-11 10:16:07 +01: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 60158edd2b
Issue #3280 Remove unused build.properties from osgi (#3281) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-01-22 12:41:28 +11: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
Olivier Lamy 63820e5405
activate Maven enforcer Upper bound dependencies check (#3116) 
* add requireUpperBoundDeps rule

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-21 21:35:31 +10:00
Raymond Augé 7ef8f882bd fixes #3141 Upgrade jetty osgi tests to use spifly 1.2 (#3142) 
Signed-off-by: Raymond Auge <raymond.auge@liferay.com>
 2018-11-28 15:00:31 +01:00
Greg Wilkins 00e2026594 Fix conscrypt version for osgi jdk8 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-24 21:16:19 +01:00
Jan Bartel 54319589a4 Fix conscrypt version for osgi 2018-11-23 16:13:30 +01:00
Simone Bordet 14c2431b1d Updated Conscrypt to 1.4.1. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-22 12:46:11 +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
Joakim Erdfelt 29fd18e046 Updating to version 9.4.15-SNAPSHOT 2018-11-14 16:42:40 -06:00
Joakim Erdfelt c4550056e7 Updating to version 9.4.14.v20181114 2018-11-14 15:19:10 -06:00
Joakim Erdfelt a903017f5f Updating to version 9.4.14-SNAPSHOT 2018-11-11 21:06:50 -06:00
Joakim Erdfelt 49123a3313 Updating to version 9.4.13.v20181111 2018-11-11 20:02:42 -06: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 9d7d47f0a8 Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass. 
Updated ASM Import-Package version to be "5", which means from ASM 5 onwards.
Updated ASM version in the main POM to 7.0.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-01 17:40:15 +01:00
Simone Bordet 5d837309c3 Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass. 
Downgraded OSGi ASM version to 6.2.
Waiting for the SPI Fly library to support JDK 11.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-10-30 17:42:11 +01:00
Simone Bordet 44ac57040a Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-10-17 12:36:56 +02:00
Olivier Lamy a094dbaa69
fix osgi tests not running as paxexam is not junit5 ready (#2945) 
* fix osgi tests not running as paxexam is not junit5 ready

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

* upgrade pax exam to 4.12.0

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

* cleanup comment, using transitive deps from pax-exam-junit4

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-10-02 16:44:24 +10:00
Olivier Lamy 71a1801433
Issue #2918 restore a TestTracker with junit5 (#2927) 
* add TestTracker junit5 extension #2918

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-09-21 14:03:05 +10:00
Jan Bartel 2dd5fec4f4
Issue #2740 Ensure OSGiWebappClassLoader uses bundleloader for all loadClass methods. (#2804) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-09-11 12:04:31 +10: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
Jesse McConnell 863a19bccf
Updating to version 9.3.26-SNAPSHOT 2018-09-04 17:23:31 -05:00
Jesse McConnell 3ce520221d
Updating to version 9.3.25.v20180904 2018-09-04 16:08:21 -05:00
Jesse McConnell dcf6a8fa9f
Updating to version 9.4.13-SNAPSHOT 2018-08-30 10:48:22 -05:00
Jesse McConnell 2720868475
Updating to version 9.4.12.v20180830 2018-08-30 08:56:44 -05: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
Kazuhiro Sera 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
Joakim Erdfelt 516d93c488 Updating to version 9.2.27-SNAPSHOT 2018-08-06 11:33:22 -05:00
Joakim Erdfelt 8c637489ae Updating to version 9.2.26.v20180806 2018-08-06 10:51:25 -05:00
Joakim Erdfelt 0b69f00665 Updating to version 9.4.12-SNAPSHOT 2018-07-11 17:32:16 -05:00
Joakim Erdfelt 260596dd10 Updating to version 9.4.12.RC0 2018-07-11 16:30:55 -05: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
Jan Bartel 80c311fb3d Issue #2656 remove forced Import-Package statements in osgi test poms 2018-06-12 18:26:59 +02: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
Joakim Erdfelt 0e6c91b604 Updating to version 9.2.26-SNAPSHOT 2018-06-06 18:54:58 -05:00
Joakim Erdfelt 4830fd15e9 Updating to version 9.2.25.v20180606 2018-06-06 16:42:54 -05:00
Joakim Erdfelt e4bfe00dce Updating to version 9.4.12-SNAPSHOT 2018-06-05 14:18:37 -05:00
Joakim Erdfelt d5fc0523cf Updating to version 9.4.11.v20180605 2018-06-05 13:23:02 -05:00
Joakim Erdfelt 5eefa90e05 Updating to version 9.3.25-SNAPSHOT 2018-06-05 13:13:07 -05:00
Joakim Erdfelt 84205aa28f Updating to version 9.3.24.v20180605 2018-06-05 12:11:03 -05:00
Joakim Erdfelt f0ff571c98 Reverting version to 9.3.24-SNAPSHOT 2018-06-05 12:06:58 -05:00
Joakim Erdfelt 13640c297c Bumping version to 9.3.25-SNAPSHOT 2018-06-05 11:58:37 -05:00
Joakim Erdfelt 79935b92ae Issue #2575 - Work around bad Bundle.getEntry() behavior with unescaped URLs (#2590) 
* Adding test case to verify existing PathResource behavior
* Skipping Resource class usage in OSGi entirely
* Only using the URL class, and removing of conversions to
  other more correct forms (File and URI)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-06-05 10:12:50 +02:00
Jan Bartel 1509d1c9aa
Issue #2586 update to asm6.2 (#2588) 
Issue #2586 update to asm6.2
 2018-05-30 11:29:18 +02:00
Greg Wilkins 2bcc528920 expand spruious tabs in java sources 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-29 10:40:09 +02:00
Jan Bartel 9aa645cf98 Remove jdk-10 and alltests profiles for test-jetty-osgi 2018-05-10 15:43:54 +10:00
Joakim Erdfelt 1732ffca51 Updating to version 9.4.11-SNAPSHOT 2018-05-03 11:48:05 -05:00
Joakim Erdfelt daa59876e6 Updating to version 9.4.10.v20180503 2018-05-03 10:55:19 -05:00
Olivier Lamy c7e78ae896
update logging versions #2461 (#2465) 
* update logging versions #2461

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-04-19 15:45:11 +10:00
Jan Bartel 0e88849a68
Issue #2164 Make osgi.serviceloader mostly optional (#2408) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-04-18 14:48:53 +10:00
Olivier Lamy f36eba4577
class.newInstance is deprecated #2435 (#2437) 
* Class.newInstance() is deprecated in Java 9+ #2435

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-04-17 19:07:20 +10:00
olivier lamy 5f2306c9cd add a profile to run all tests even those disable with some jdks 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-04-14 13:03:50 +10:00
olivier lamy ffa270b6c8 disable failing tests for jdk11 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-04-13 21:49:02 +10:00
olivier lamy f6268ec919 add jdk10 profile to disable some tests 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-04-06 11:04:27 +10:00
Jan Bartel 09bfb77e5f
Issue #2409 Ensure no duplicate config classes in osgi (#2416) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-04-06 09:18:47 +10:00
Jan Bartel 72404d15d6 Make mavenRepoPath system property optional for osgi tests 2018-04-05 14:02:38 +10:00
Joakim Erdfelt a74a328024 Merge branch 'release-9.4.9' into jetty-9.4.x 2018-03-21 16:33:56 -05:00
Joakim Erdfelt c3cc138a3b Updating to version 9.4.10-SNAPSHOT 2018-03-20 08:25:59 -05:00
Joakim Erdfelt 1f8159b1e4 Updating to version 9.4.9.v20180320 2018-03-20 07:18:24 -05:00
olivier lamy 16699214c6 fix using -DskipTests not skipping tests #2359 
Signed-off-by: olivier lamy <olamy@webtide.com>

use -DskipTests

Signed-off-by: olivier lamy <olamy@webtide.com>
 2018-03-20 21:19:02 +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