Commit Graph

238 Commits

Author SHA1 Message Date
Joakim Erdfelt 3590bfcfd1
separate javadoc no longer necessary
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-25 13:45:16 -05:00
Joakim Erdfelt 35bca82e35
Issue #5264 - Addressing (some) aggregate-javadoc issues
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 20:20:27 -05:00
Greg Wilkins eedcac314b Merge branch 'jetty-10.0.x' into jetty-10.0.x-5264-demo-modules 2020-09-23 15:27:56 +02:00
Joakim Erdfelt 817533f460
Issue #5264 - Removing compact3 build
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-21 14:56:48 -05:00
olivier lamy 7318443a8f Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-09-18 14:22:53 +10:00
olivier lamy e3ed05fc1c jdk15 build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-18 14:19:28 +10:00
olivier lamy 6b250a7dc2 use our nexus
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-16 17:42:48 +10:00
Joakim Erdfelt 9a5ba1e876
Reverting changes to Jenkinsfile causing build/test issues
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-11 13:40:11 -05:00
olivier lamy d8a7a13140 fix wrong merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-11 16:38:35 +10:00
olivier lamy cf4621e6ba temporary ignore failure til we found the issue
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-11 15:53:09 +10:00
olivier lamy 9e43d4a1f3 fix jenkinsfile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-11 13:19:10 +10:00
olivier lamy a2342ac055 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-09-11 13:15:24 +10:00
Olivier Lamy 26d50c8e29
Jetty 9.4.x not skipping tests failure and fix jaas test (#5255)
* remove -Dmaven.test.failure.ignore=true

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

* get JAASLdapLoginServiceTest working

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

* increase memory

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

* use only single thread to have more readable log in Jenkins

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

* disable java8

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

* test only java8

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

* increase memory

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

* try -T3

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

* restore jdk11/14

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

* try more memory

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

* archive logs from Jenkins

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

* archive logs from Jenkins

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

* more memory

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

* skip jacoco

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

* test useManifestOnlyJar true

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

* junit

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

* useManifestOnlyJar false

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

* debug maven surefire

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

* very simple build to debug

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

* try M5

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

* try not using withMaven

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

* no debug surefire M4

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

* all jdk and M5

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

* enable jacoco only for java8

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

* reduce memory usage for test

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

* avoid duplications of warnings parsing

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

* fix my bad

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-11 13:11:04 +10:00
olivier lamy 57d4714a08 remove test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-06-04 14:35:48 +10:00
olivier lamy 1aaf22cdc1 temporary debug
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-06-04 13:30:16 +10:00
olivier lamy 09d1a7a024 no more need of this mongodb profile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-29 07:09:39 +10:00
olivier lamy 634470bd5a slack for 11 branch as well
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 12:49:45 +10:00
olivier lamy fa6fa6db84 only jdk8 in 10 branch
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 12:48:52 +10:00
olivier lamy 8771360425 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-08 11:02:14 +10:00
olivier lamy cba05a3db0 increase surefire memory
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 11:00:49 +10:00
olivier lamy f7628e8258 fix Jenkinsfile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 10:30:36 +10:00
olivier lamy 537cfd2105 fix Jenkinsfile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 10:26:15 +10:00
olivier lamy 972cd95ec0 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-08 10:21:41 +10:00
olivier lamy a818a3551b a bit more memory to see if that fix heap space issue with jdk14 build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 07:31:06 +10:00
olivier lamy 5ee6b67e0a align with 10.0.x to ease merging
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 07:29:56 +10:00
Olivier Lamy 78992a126c
Start a mongo instance for testing using docker via java code (#4840)
* remove slow mongo maven plugin which was forking an external process and now run mongodb in a container so we can even now test with different version using -Dmongo.docker.version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 07:06:03 +10:00
Olivier Lamy 56f92adcc6
Jetty 10.0.x graphviz container (#4783)
* configure build using image jettyproject/jetty-build:latest

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-18 09:59:04 +10:00
Olivier Lamy fb8c8270b3 upgrade spifly to 1.2.4 and replace jdk13 build with jdk14 (#4780)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-16 11:20:43 +10:00
Olivier Lamy d681f10853
upgrade spifly to 1.2.4 and replace jdk13 build with jdk14 (#4780)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-16 11:19:47 +10:00
Olivier Lamy 0541c5efb4
fix javadoc aggregate generation by using last maven javadoc plugin 3.2.0 (#4675)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-19 07:06:13 +10:00
Joakim Erdfelt d4f72256e7
Removing javadoc:aggregate-jar due to MJAVADOC-618
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-15 12:54:20 -06:00
Joakim Erdfelt 01a5974f4b
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	Jenkinsfile
#	examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java
#	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/HttpTester.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartParserTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/matchers/HttpFieldsMatchersTest.java
#	jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterLenientTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletLifeCycleTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultNoRecompressTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
#	jetty-unixsocket/src/test/java/org/eclipse/jetty/unixsocket/UnixSocketClient.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/B64CodeTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java
#	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/ClasspathPatternTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/LargeMessageTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerGoodSignaturesTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerInvalidSignaturesTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadataSetTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/utils/ReflectUtilsTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/RestartContextTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerGoodSignaturesTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerInvalidSignaturesTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/SessionTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
#	jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfigTest.java
#	jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilQuoteTest.java
#	jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilTest.java
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ConnectionManagerTest.java
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/GeneratorTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ParserTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/TextPayloadParserTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase11.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase12.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase2.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase4.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase73.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventDriverTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedScannerTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ConnectionStateTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/http/HttpResponseHeaderParserTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageDebug.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/Utf8CharBufferTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/UnitGenerator.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8PartialBuilderTest.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/RedirectWebSocketClientTest.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/SimpleServletServer.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6BadUTF.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6GoodUTF.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7BadStatusCodes.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7GoodStatusCodes.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase9.java
#	pom.xml
#	tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationsTest.java
#	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java
#	tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
#	tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java
2020-01-15 12:20:20 -06:00
Joakim Erdfelt d701065c20
Skipping pmd/checkstyle on javadoc stage
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-15 08:38:49 -06:00
Joakim Erdfelt 33ed4713eb
Moving maven threading to individual stages.
+ Javadoc stage is sensitive to multi-threaded execution

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-15 08:37:25 -06:00
Joakim Erdfelt aecc9a4af6
Bumping up javadoc stage timeout to 40 minutes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 16:56:06 -06:00
Joakim Erdfelt 1c00006ca7
Checkstyle now mandatory on build
+ Removed checkstyle suppressions
+ Force scan on source directories (main and test)
+ Excluding generated / filtered / copied sources
+ Removed Jenkins job for checkstyle

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 14:47:16 -06:00
Joakim Erdfelt cfa476b65f
Removing Checkstyle jenkins stage (checkstyle is now always on)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-09 15:57:09 -06:00
Simone Bordet 04dc257641 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-19 10:50:31 +01:00
olivier lamy 6db5f3be8d force clean
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-19 18:13:18 +10:00
Lachlan Roberts 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
Joakim Erdfelt 7413483fc5 Removing JDK12 build
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-24 15:35:00 -05:00
Joakim Erdfelt cf993e579e Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-09-23 12:07:43 -05:00
Joakim Erdfelt a6b1922473 Adding JDK13 to build
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-23 10:30:35 -05:00
Joakim Erdfelt ceff82ac57 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-08-22 15:09:44 -05:00
olivier lamy 595e058fa3 touch to test github/jenkins
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-22 20:53:46 +10:00
olivier lamy 2cbdb27e5b touch to test github/jenkins
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-22 20:51:34 +10:00
olivier lamy 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
Joakim Erdfelt 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
Olivier Lamy 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
olivier lamy ae004171e0 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-07-30 11:21:31 +10:00