Joakim Erdfelt
|
7478c04351
|
Merge branch `jetty-9.3.x` into `jetty-9.4.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-http-spi/pom.xml
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpContext.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpExchangeDelegate.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
# jetty-monitor/pom.xml
# jetty-nosql/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java
# jetty-server/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
# jetty-servlet/pom.xml
# jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
# jetty-servlets/pom.xml
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ThreadStarvationTest.java
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java
# jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2019-04-03 17:47:18 -05:00 |
Greg Wilkins
|
61b1a217de
|
updated release script versions
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-04-03 12:34:46 +11:00 |
|
Joakim Erdfelt
|
a259285e3f
|
Adding git log to csv example script for @jmcc0nn3ll
|
2018-02-08 08:47:11 -06:00 |
|
Greg Wilkins
|
0f8bf0a64f
|
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
|
2017-10-17 14:08:36 +11:00 |
olivier lamy
|
44e1b7b02b
|
upgrade versions-maven-plugin version to 2.5 to avoid manual update of the bom file
Signed-off-by: olivier lamy <olamy@webtide.com>
|
2017-09-26 10:25:50 +10:00 |
|
Joakim Erdfelt
|
bfc21f23e0
|
Merge branch 'jetty-9.3.x' into jetty-9.4.x
|
2016-12-27 13:33:41 -07:00 |
|
Joakim Erdfelt
|
a917ed5124
|
Updating release-jetty.sh script for tag commit message improvements on github
|
2016-12-22 10:45:45 -07:00 |
|
Greg Wilkins
|
81d98407a4
|
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
|
2016-10-17 12:01:45 +11:00 |
|
Joakim Erdfelt
|
7a2548ea72
|
Fixing script
|
2016-10-14 10:33:33 -07:00 |
|
Joakim Erdfelt
|
49c28e958e
|
Merge branch 'jetty-9.3.x' into jetty-9.4.x
|
2016-06-20 09:56:39 -07:00 |
|
Joakim Erdfelt
|
4d85e1f82c
|
Adding release-jetty.sh script (for those that want it)
|
2016-06-20 09:08:53 -07:00 |
Jesse McConnell
|
20c1301203
|
Merge branch 'jetty-9.3.x' into jetty-9.4.x
|
2016-06-07 11:56:27 -05:00 |
|
Joakim Erdfelt
|
6e3d85e15e
|
Merge branch 'feature/looptest' into jetty-9.3.x
|
2016-06-06 07:02:25 -07:00 |
|
Joakim Erdfelt
|
4ce35feb41
|
Adding OPTS
|
2016-06-06 07:01:48 -07:00 |
|
Joakim Erdfelt
|
40526513f4
|
More looptest experimentation
|
2016-06-03 14:27:33 -07:00 |
|
Joakim Erdfelt
|
5e3a534d5d
|
More looptest experimentation
|
2016-06-03 14:17:28 -07:00 |
Simone Bordet
|
58f8d44ae2
|
Improved looptest.sh.
Fixed reference to test class.
Added DEBUG logging.
|
2016-06-03 23:14:18 +02:00 |
|
Joakim Erdfelt
|
f495053e9b
|
More looptest experimentation
|
2016-06-03 13:13:53 -07:00 |
|
Joakim Erdfelt
|
661a5aeef4
|
Experimenting with looptest and jenkins
|
2016-06-03 11:42:08 -07:00 |
|
Joakim Erdfelt
|
f814c3d46c
|
Adding looptest for help with CI only flappy test failures
|
2016-06-03 10:14:09 -07:00 |
Joakim Erdfelt
|
4ca7673c3f
|
api-change profile now works with master
+ Adding script to collect all clirr:clirr into single html report
|
2016-03-24 15:56:32 -07:00 |
|
Joakim Erdfelt
|
14052742d0
|
Adding some git query scripts for information gathering
|
2016-03-18 10:42:17 -07:00 |