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

15 Commits

Author SHA1 Message Date
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
olivier lamy 63f2023e05 happy new year!! 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-01 12:17:53 +10:00
Simone Bordet bfa2dbf68c Issue #3162 - Use Jetty specific Servlet API jar. 
* Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
  to match the new Jetty Servlet API jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-29 16:51:29 +01:00
Joakim Erdfelt 61c2bb362a Happy New Year (2018) 
+ Fixing some overlooked entries

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-05-02 14:27:28 -05:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Greg Wilkins 55f92e8229 updated NOTICE.txt for possible ALPN inclusion 2015-03-26 14:24:38 +11:00
Jan Bartel cc44952cc8 Update NOTICE.txt 2015-02-19 10:56:56 +11:00
Joakim Erdfelt b46c3d1fe1 459681 Remove Glassfish JSP in favor of Apache JSP 
+ Removing references in NOTICE.txt
 2015-02-18 11:49:18 -07:00
Jesse McConnell a187608013 update the notice.txt file to reflect updated ip info 2015-02-10 16:25:00 -06:00
Joakim Erdfelt 6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Joakim Erdfelt 333ac73d5e Cleaning up some New Years leftovers 2014-01-03 08:18:24 -07:00
Joakim Erdfelt 706023fbc0 Fixing NOTICE.txt copyright, as all of the mentioned companies are one in the same. 2012-02-02 15:50:00 -07:00
Joakim Erdfelt f376cf46a1 Updating NOTICE.txt with new year + license urls 2012-02-01 15:15:04 -07:00
Greg Wilkins da627b843f jetty @ eclipse initial commit 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@8 7e9141cc-0065-0410-87d8-b60c137991c4
 2009-03-24 21:07:27 +00:00