Commit Graph

770 Commits

Author SHA1 Message Date
Jan Bartel bb7fb48f08
Fix checkstyle warnings for tests. (#3846)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-03 16:42:20 +02:00
Greg Wilkins 1a6ceb2fa8
Issue #3805 Trim space on around XmlConfiguration fields (#3820)
Issue #3805 Trim space on around XmlConfiguration fields (#3820)
2019-07-01 09:32:00 +02: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
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 5dbc0bdaa5
Merge pull request #3745 from eclipse/jetty-9.4.x-3743-xmlconfig-locations
Issue #3743 - Using Location based XmlConfiguration where possible
2019-06-10 11:08:51 -05:00
Joakim Erdfelt 59ce0ea0e3 Issue #3743 - Cleanup requested from PR
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 10:12:39 -05:00
Joakim Erdfelt ff43fd3de4 Issue #3743 - More changes from review of PR
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 09:58:53 -05:00
Joakim Erdfelt a8d008b851 Issue #3743 - Making new ConfigurationProcessor interface default
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 08:19:59 -05:00
Joakim Erdfelt bb0c87a42a Issue #3743 - Addressing PR review items
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 07:56:46 -05:00
Joakim Erdfelt 63109108a8 Issue #3751 - Use Modern DTD/FPI consistently
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-07 07:21:59 -05:00
Joakim Erdfelt 66aa966596 Revert "Issue #3743 - Updating usages of configure_9_3.dtd to use proper syntax"
This reverts commit fc97acf1ea.
2019-06-07 07:03:44 -05:00
Joakim Erdfelt 0c23808827 Issue #3743 - Applying changes from PR feedback.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 17:38:54 -05:00
Joakim Erdfelt fc97acf1ea Issue #3743 - Updating usages of configure_9_3.dtd to use proper syntax
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 14:06:46 -05:00
Joakim Erdfelt c065eaa3cc Issue #3743 - Handling StringReader using try-with-resources
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 14:06:23 -05:00
Joakim Erdfelt a72a6ab875 Issue #3743 - Using Location based XmlConfiguration where possible
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 12:27:41 -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
Simone Bordet 2688ed55e5 Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Added warnings for deprecated field get/set.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-04 10:24:13 +02:00
Simone Bordet 4058abd7c7 Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Improved test case to test for log lines with deprecation warnings.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-03 16:08:33 +02:00
Simone Bordet 8dc9f745ff Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Fixed return value from varargs methods.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-03 16:07:45 +02:00
Simone Bordet fe94da9e46 Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Added warnings for invocation of deprecated constructors and methods.
Moved methods exclusively used by XmlConfiguration from TypeUtil.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-30 22:27:27 +02:00
Simone Bordet 4bc4a60e8d Code cleanup and reformatting.
Javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-30 19:22:37 +02:00
Joakim Erdfelt 41ab9baf8c Standardizing on hamcrest Matchers (not CoreMatchers from junit4)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 14:39:57 -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 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 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
Olivier Lamy 9b7afd8a03
Happy new year!! (#3232)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10: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
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 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
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
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 6b0652c499 Issue #2556 - bad "file:" scheme present in Xml usage of "jetty.base" and "jetty.home" properties
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-04 13:00:49 -05: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
Mat Booth c316cf1cfe Make the requirement on "osgi.serviceloader.processor" optional (#2377)
This allows Eclipse to continue to make use of jetty-* bundles
without requiring the presence of Apache Aries.

This fixes a problem introduced by the resolution to #2164 and
the same solution is used as in 10cdf16

See also the discussion at Eclipse:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=532294

Signed-off-by: Mat Booth <mat.booth@redhat.com>
2018-04-03 12:25:50 +10:00
Joakim Erdfelt f7953573b5 Removing old (no longer used) jetty-start reference
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-26 15:17:31 -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