Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,902 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

593 Commits

Author SHA1 Message Date
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 343cf732b9
Issue #3789 XmlConfiguration Set Property (#3790) 
Issue #3789 XmlConfiguration Set Property

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-21 21:04:53 +02:00
Joakim Erdfelt 60d8661890 Merge `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java
#	jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebInfConfiguration.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/QuotedCSVTest.java
#	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
#	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java
#	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java
#	jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/StringUtilTest.java
#	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
#	jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
#	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/XmlBasedJettyServer.java
 2019-06-13 14:14:42 -05:00
Joakim Erdfelt 40e9e053b9
Merge pull request #3768 from eclipse/jetty-9.4.x-3708-stringutil-replace 
Issue #3708 - use StringUtil alternatives for known slow JVM impls.
 2019-06-13 14:01:35 -05:00
Joakim Erdfelt 877815e195 Issue #3708 - Adding new methods and converting codebase to use them 
+ StringUtil.replace(String, char, char)
+ StringUtil.strip(String, String)
+ URIUtil.encodeSpecific(String, String)
+ URIUtil.decodeSpecific(String, String)
+ TypeUtil.toClassReference(Class)
+ TypeUtil.toClassReference(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-12 09:56:41 -05:00
Joakim Erdfelt ae21126cad Updating to version 9.4.20-SNAPSHOT 2019-06-10 13:40:17 -05:00
Joakim Erdfelt c73f849711 Fixing post-merge test errors 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 12:43:26 -05:00
Joakim Erdfelt 68a9498092 Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 11:51:55 -05:00
Joakim Erdfelt afcf563148 Updating to version 9.4.19.v20190610 2019-06-10 11:17:56 -05:00
Simone Bordet 826d68e80a Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-10 11:41:47 +02:00
Simone Bordet a510ed31cb Issue #3713 - Emit warning when invoking deprecated method in Jetty XML. 
Fixed references to deprecated methods WebAppContext.prependServerClass(),
WebAppContext.addServerClass() and WebAppContext.addSystemClass().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-07 09:22:31 +02:00
olivier lamy 97b7be113c fix maven it 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-05-31 21:16:28 +10:00
Simone Bordet 567c5a4f55 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-05-30 12:49:47 +02:00
Miron Balcerzak 4c11f245c9 Fixes #3332 jetty-maven-plugin - transitive deps in single war project (#3349) 
* Issue #3332 jetty-maven-plugin - transitive deps in single war project

Signed-off-by: Miron Balcerzak <mironbalcerzak@gmail.com>

* Issue #3332 jetty-maven-plugin - code review fixes

Signed-off-by: Miron Balcerzak <mironbalcerzak@gmail.com>

* Issue #3332 jetty-maven-plugin - code review fixes

Signed-off-by: Miron Balcerzak <mironbalcerzak@gmail.com>
 2019-05-30 20:12:47 +10:00
olivier lamy 2ba8542ed1 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-05-09 07:12:27 +10:00
Olivier Lamy 45468988ea
Issue #3583 maven plugin do not use testOutputDirectory directory for test dependencies within reactor (#3606) 
* Issue #3583 maven plugin do not use testOutputDirectory directory for test dependencies within reactor

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

* use same spaces formatting

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-05-09 07:00:20 +10: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 5658bf96f6 Issue #1676 - Removing Deprecated Resource.getURL() 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-01 10:21:42 -05:00
Joakim Erdfelt e476cec6d3 Issue #1676 - Removing deprecated methods and classes 
+ Changing usages of JVM deprecated classes / methods as well
+ Cleaning up test cases and javadoc
+ Removing test methods that rely on deprecated and now removed concepts

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-02-28 17:54:28 -05:00
Joakim Erdfelt cff63f2b6a Merge of `jetty-9.4.x` to `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
 2019-02-21 09:45:12 -05:00
Joakim Erdfelt 0e7a2738d5 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2019-02-18 16:53:53 -05:00
olivier lamy 8973f01dc4 ensure we use a random for this integration test 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-02-18 17:28:51 +10: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
Simone Bordet 1c55e2bf79 Issue #3303 - Update to jakarta ee javax artifacts for jetty-10. 
Updated javax.annotation -> jakarta.annotation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-12 18:56:16 +01:00
Simone Bordet a1e6d5856a Issue #3303 - Update to jakarta ee javax artifacts for jetty-10. 
Updated javax.transaction -> jakarta.transaction.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-12 14:41:05 +01:00
Simone Bordet 9286cdcf09 Issue #3162 - Use Jetty specific Servlet API jar. 
Updated references to Servlet jar to "jetty-servlet-api".

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-07 13:08:26 +01:00
Simone Bordet 33f314e9f5 Issue #3162 - Use Jetty specific Servlet API jar. 
Updated to jetty-servlet-api:4.0.1, based on javax.servlet 4.0.1.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-04 18:51:51 +01:00
Joakim Erdfelt c30c8d4339 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-client/pom.xml
#	jetty-http/pom.xml
#	jetty-http2/http2-client/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-http2/http2-server/pom.xml
#	jetty-osgi/test-jetty-osgi/pom.xml
#	jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
#	jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
#	jetty-quickstart/pom.xml
#	jetty-servlets/pom.xml
#	jetty-util/pom.xml
#	jetty-websocket/javax-websocket-client/pom.xml
#	jetty-websocket/javax-websocket-server/pom.xml
#	jetty-websocket/jetty-websocket-server/pom.xml
#	pom.xml
 2019-01-30 11:56:58 -06:00
Joakim Erdfelt 02dd7d1887
Merge pull request #3289 from eclipse/jetty-10.0.x-websocket-artifact-ids 
Issue #3288 - Correcting Jetty WebSocket API artifactIds
 2019-01-24 10:47:12 -06:00
olivier lamy 3ffdd9427d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-01-24 14:41:39 +10:00
Olivier Lamy 34b2678e6d
issue #3254 add jsp test need to remove cdi-api and exclude it fron upperBound rule (#3268) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-24 14:34:41 +10:00
Joakim Erdfelt 5095c8a7b2 Issue #3288 - Correcting Jetty WebSocket API artifactIds 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-23 15:58:11 -06:00
Olivier Lamy 826c27a2b2
- move duplicate configuration to parent pom (#3265) 
- upgrade invoker plugin version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-24 07:29:49 +10:00
Olivier Lamy 69dc0059d1
use jackson-databind 2.9.8 (#3252) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-10 22:12:12 +13:00
olivier lamy 63f2023e05 happy new year!! 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-01 12:17:53 +10: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
olivier lamy 6ff23e296d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-12-22 22:00:07 +10:00
Olivier Lamy 72ebcc51af
interpolate version from main pom for maven plugin it test (#3223) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-22 21:55:31 +10:00
Olivier Lamy ab2a8b0fe3
upgrade logback and log4j-slf4j (new artifact log4j-slf4j18-impl) to support slf4j api 1.8 (#3209) 
* upgrade logback and version of log4j-slf4j support slf4j 1.8 (new artifact log4j-slf4j18-impl)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-22 10:01:48 +10:00
olivier lamy bd4933b33c Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-12-21 21:48:36 +10:00
Olivier Lamy 63820e5405
activate Maven enforcer Upper bound dependencies check (#3116) 
* add requireUpperBoundDeps rule

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-21 21:35:31 +10:00
olivier lamy df92c7d5ec fix it with declaring correct version of slf4j and excluding logback as we are now slf4j api 1.8.0-beta2 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-19 10:15:14 +10:00
Jan Bartel 4abc4f8dd4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-12-19 10:54:41 +11:00
Olivier Lamy 9ca77a23aa issue #3186 add it to override javax.annotation provided by maven core (#3194) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-18 17:38:11 +10:00