04dc257641
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-19 10:50:31 +01:00
6db5f3be8d
force clean
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-19 18:13:18 +10:00
af081459ee
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-25 15:06:17 +10:00
7413483fc5
Removing JDK12 build
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-24 15:35:00 -05:00
cf993e579e
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-09-23 12:07:43 -05:00
a6b1922473
Adding JDK13 to build
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-23 10:30:35 -05:00
ceff82ac57
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-08-22 15:09:44 -05:00
595e058fa3
touch to test github/jenkins
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-22 20:53:46 +10:00
2cbdb27e5b
touch to test github/jenkins
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-22 20:51:34 +10:00
7e961b2c99
javadoc:aggregate-jar cannot run on jetty-10 because of bug in javadoc plugin or javadoc in jdk still need to figure out..
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-15 07:12:30 +10:00
3544283865
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# jetty-server/src/test/java/org/eclipse/jetty/server/ForwardedRequestCustomizerTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/ReadState.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ReadStateTest.java
# tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java
2019-08-14 09:39:06 -05:00
8761b345b5
Jetty 9.4.x timeout to build only do not include time to get node ( #3975 )
...
* fix timeout to apply on build time not on getting node time
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* fix typo
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-14 20:30:54 +10:00
ae004171e0
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-07-30 11:21:31 +10:00
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
ba05117a0d
use build-resources released version
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-22 21:23:04 +10:00
c26bf34edb
try to avoid issue with the checkstyle check branch so install first the artifacts
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-22 21:03:11 +10:00
e5f7967116
Fix duplicate stage (wrong merge from 9.4.x)
2019-07-22 17:17:58 +10:00
d0963178d4
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-07-18 17:06:38 +10:00
4ebf4b7477
Jetty 9.4.x invoker maven plugin use junit result files ( #3887 )
...
* invoker plugin can now generate junit report file so use that to ease reading of results
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-18 16:46:59 +10:00
1dc1aa59be
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-06-28 18:38:21 +10:00
01a02cc15b
catch exception in slack notification to avoid any build failure due to this ( #3794 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 18:04:43 +10:00
afaf678c6f
javadoc:aggregate-jar do not work with java 11 and modules
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 17:20:16 +10:00
3a5e6511dd
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-06-28 17:19:34 +10:00
e19cc68a38
test no issue building the aggregated javadoc jar
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 17:18:52 +10:00
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
644aeca364
checkstyle report enabled
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:05:50 +10:00
69b6160445
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-06-27 07:04:06 +10:00
a1d292da58
only checkstyle:check no need of building site
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
b54dbcff63
fix merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
2443423eff
simplify checkstyle check with not using site generation but only check as jenkins only need checkstyle result
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
484c7538d6
fix version of build-resources module
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
8cf00f7226
disable autobahn for every build
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-26 20:29:58 +10: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
e2193a303b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-23 10:50:47 +02:00
3030ccb2df
Merge branch 'jetty-9.4.x-checkstyle' into jetty-9.4.x
2019-06-22 09:00:15 -05:00
d109242bc0
store autobahn results as they are not stored automatically by junitPublisher ( #3792 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-18 20:41:10 +10:00
2a2a11cd2e
Improvements after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-13 10:23:55 +02:00
2e9aa24d02
Fixing Jenkinsfile
2019-06-10 09:28:28 -05:00
ad3be199e8
Disabling broken slack notifications
2019-05-31 10:43:56 -05:00
7aa2307bb7
slack notifications are broken atm - disabling
2019-05-31 10:41:57 -05:00
bad09ac560
fix typo
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-31 20:27:02 +10:00
cba9a5fa93
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-05-31 19:48:25 +10:00
bea7806c77
single line notification
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-31 19:47:56 +10:00
9802e7dca5
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-05-31 19:45:15 +10:00
62fed86430
slack notification only for main branches ( #3717 )
...
* slack notification only for main branches
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-31 14:24:13 +10:00
d6dbf7cae0
this when is not working
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-30 21:34:10 +10:00
d466da2c95
this when is not working
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-30 21:33:08 +10:00
117bf3834b
slack notif only for main branches
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-30 20:54:14 +10:00
567c5a4f55
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-05-30 12:49:47 +02:00
5def2dff97
slack notif only for main branches
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-30 20:34:42 +10:00
Simone Bordet
olivier lamy
Lachlan Roberts
Joakim Erdfelt
Greg Wilkins