Commit Graph

38 Commits

Author SHA1 Message Date
Joakim Erdfelt a11f6a0304 Merging build-resources from `jetty-9.4.x` to `jetty-10.0.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-14 09:40:46 -05:00
olivier lamy bf5f4c860c do not try to deploy this one
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-14 20:43:28 +10:00
Simone Bordet 62758122c3 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-08-10 00:39:54 +02:00
Joakim Erdfelt 3b5543b575 Removing `AbbreviationAsWordInName` module
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-07 18:08:07 -05:00
olivier lamy ae004171e0 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-07-30 11:21:31 +10:00
olivier lamy 6df9ef3a15 Updating to version 10.0.0-SNAPSHOT 2019-07-12 06:54:56 +10:00
olivier lamy 8cbfd51e80 Updating to version 10.0.0-alpha0 2019-07-12 06:54:56 +10:00
Olivier Lamy 9923fdfefc
Jetty 10.0.x fix dependency in jetty-all (#3864)
* fix wrong dependency

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-11 20:16:57 +10:00
olivier lamy a34e641a27 Updating to version 10.0.0-SNAPSHOT 2019-07-11 17:20:27 +10:00
olivier lamy 2e58f2f515 Updating to version 10.0.0-alpha0 2019-07-11 14:19:45 +10:00
Greg Wilkins 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
Olivier Lamy 38a3a51a54
Jetty 10.0.x javadoc fix (testing javadoc plugin SNAPSHOT) (#3831)
* fix javadoc generation with jdk11

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

* currently disable javadoc:aggregate-jar as do not work yet

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 10:00:57 +10:00
olivier lamy 69b6160445 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-06-27 07:04:06 +10:00
Joakim Erdfelt 0047740af6 Limiting target suppressions 2019-06-26 09:13:34 -05:00
olivier lamy 390033edfc Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-06-26 13:00:45 +10:00
olivier lamy eb64d2e9fd add missing checks attribute
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-26 11:03:19 +10:00
Joakim Erdfelt 94a0154be7 Adding supression on /target/ files 2019-06-25 19:07:26 -05:00
Joakim Erdfelt 9f49fa5da7 Adding supression on /target/ files 2019-06-25 19:02:44 -05:00
Joakim Erdfelt c97403fb0d Merge branch `jetty-9.4.x` into `jetty-10.0.x` 2019-06-25 16:01:02 -05:00
Joakim Erdfelt 7071c53bdd
Merge pull request #3814 from eclipse/jetty-9.4.x-checkstyle-suppress-tests
Adding CheckStyle suppression's for src/test/java
2019-06-25 16:00:36 -05:00
Joakim Erdfelt 8121f9773c Adding jetty-jmh to suppressions 2019-06-25 13:32:26 -05:00
Greg Wilkins 9c6c1990b4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-25 11:16:53 +02:00
Jan Bartel 0781e0af3d
Fix Eclipse java style for jetty (#3813)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-06-25 11:06:52 +02:00
Joakim Erdfelt fd952d42ff Removing redundant check
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 14:30:33 -05:00
Joakim Erdfelt 81894fb4ed Using property based lookup for Checkstyle suppressions filter.
+ This is to be maximally compatible across all plugins and scenarios
  where the Checkstyle suppressions filter can be used.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 13:58:23 -05:00
Joakim Erdfelt 16cf6a34e1 Adapting suppressions filter for various plugin's expectations.
Each plugin finds the suppressions in different ways.

+ Eclipse CS finds it via property ${config_loc}
+ Newest IntelliJ CS finds it via same property
+ Maven plugin finds it via classloader.getResource()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 13:27:14 -05:00
Joakim Erdfelt 0cb56a8e21 Adding CheckStyle suppression's for src/test/java
+ No MethodNameCheck
+ No TypeNameCheck
+ No LocalVariableNameCheck

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 13:04:30 -05:00
Joakim Erdfelt 7b941098d0 Fixing version of build-resources 2019-06-24 11:12:47 -05:00
Greg Wilkins 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
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 6e44a7cfd1 More changes from PR feedback
Both Formatters / CodeStyles
+ Maximum Line Length for wrapping is now 128
  (Sorry, cannot turn it off, but we can set it high)

Eclipse Formatter
+ javadoc formatting turned off
+ line comment formatting turned off
+ block comment formatting is turned off
+ preserving whitespace between code and comments
+ don't join already wrapped lines of code or comments
+ keeping empty array initializers on one line
+ brace position for array inializers are on next line

IntelliJ Formatter
+ turn off various javadoc / block / line formatting
+ consecutive blank lines capped at 1
+ align multiline array initializers
+ turned off brace force on if statements
+ array initializer braces on new line

Checkstyle Rules
+ disabled NeedBraces
+ NoWhitespaceAfter now allows lineBreaks without a violation

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-21 11:08:15 -05:00
Joakim Erdfelt 9cb8fb30fd Updating checkstyle rules from PR feedback.
+ NeedBraces is turned on, but excluded for single line IF statements
+ OperatorWrap is split into 2 rules.
  1. (OperatorWrapNextLine) for "?" and ":" tokens.
  2. (OperatorWrapSameLine) for all other tokens
+ NoWhitespaceAfter enabled with default tokens + TYPECAST
2019-05-20 14:40:53 -05:00
Joakim Erdfelt 3cb588b28b Updating IDE formatters / codestyles from PR feedback.
+ Lambda braces are always on new line
+ Space after (cast) is removed
+ Do not force braces on single line if statements, only on multi-line.
2019-05-20 14:23:44 -05:00
Joakim Erdfelt 40cdbc4056 Revert LeftCurly setting
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-08 16:51:12 -05:00
Joakim Erdfelt d50ed94baa Adding Eclipse IDE Code Style XML 2019-05-08 15:40:54 -05:00
Joakim Erdfelt 62ebcedc59 Updating checkstyle for lambdas 2019-05-08 15:40:41 -05:00
Joakim Erdfelt 371f828378 Update to jetty-checkstyle.xml + Intellij Style Def
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-08 14:22:04 -05:00
Joakim Erdfelt 8246011020 Initial /build-resources/ with jetty-checkstyle.xml
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-08 10:57:15 -05:00