Skip to content

Commit bc137a3

Browse files
authored
SOLR-17503: Comple javax to Jakarta EE migration (#3839)
* smokeTestRelease needn't suppress its violation search of java/javax in JARs in certain places. * forbidden-api; change javax.servlet->jakarta.servlet * exclude javax.inject in tests of gcs-repository * NOTICE.txt, remove obsolete references to servlet matters
1 parent 616c7d6 commit bc137a3

File tree

10 files changed

+26
-429
lines changed

10 files changed

+26
-429
lines changed

NOTICE.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,6 @@ LGPL and Creative Commons ShareAlike.
255255
Morfologic includes data from BSD-licensed dictionary of Polish (SGJP)
256256
(http://sgjp.pl/morfeusz/)
257257

258-
Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original
259-
source code for this can be found at http://www.eclipse.org/jetty/downloads.php
260-
261258
===========================================================================
262259
Kuromoji Japanese Morphological Analyzer - Apache Lucene Integration
263260
===========================================================================
@@ -377,9 +374,6 @@ This product includes software developed by the Eclipse Foundation
377374
(specifically, Jetty, the bundled servlet container in example),
378375
available under the Apache 2 License.
379376

380-
Servlet-api.jar is under the CDDL license, the original source
381-
code for this can be found at http://www.eclipse.org/jetty/downloads.php
382-
383377
=========================================================================
384378
== SLF4J Notice -- http://www.slf4j.org/license.html ==
385379
=========================================================================
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
2+
title: Completed javax to Jakarta EE transition
3+
type: other # added, changed, fixed, deprecated, removed, dependency_update, security, other
4+
authors:
5+
- name: David Smiley
6+
links:
7+
- name: SOLR-17503
8+
url: https://issues.apache.org/jira/browse/SOLR-17503
9+
- name: SOLR-17069
10+
url: https://issues.apache.org/jira/browse/SOLR-17069

dev-tools/scripts/smokeTestRelease.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,6 @@ def checkAllJARs(topDir, gitRevision, version):
209209

210210
for file in files:
211211
if file.lower().endswith('.jar'):
212-
if ((normRoot.endswith('/modules/extraction/lib') and (file.startswith('jakarta.activation-') or file.startswith('jakarta.xml')))
213-
or (normRoot.endswith('/modules/extraction/lib') and file.startswith('unit-api-'))
214-
or (normRoot.endswith('/server/solr-webapp/webapp/WEB-INF/lib') and file.startswith('jakarta.'))
215-
or (normRoot.endswith('/server/lib/ext') and file.startswith('jetty-servlet-api-'))):
216-
print(' **WARNING**: skipping check of %s/%s: it has javax.* classes' % (root, file))
217-
continue
218212
fullPath = '%s/%s' % (root, file)
219213
noJavaPackageClasses('JAR file "%s"' % fullPath, fullPath)
220214
if file.lower().find('solr') != -1:

gradle/validation/forbidden-apis/javax.servlet.javax.servlet-api.solr.txt renamed to gradle/validation/forbidden-apis/jakarta.servlet.jakarta.servlet-api.all.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515

1616
@defaultMessage Servlet API method is parsing request parameters without using the correct encoding if no extra configuration is given in the servlet container
1717

18-
javax.servlet.ServletRequest#getParameter(**)
19-
javax.servlet.ServletRequest#getParameterMap(**)
20-
javax.servlet.ServletRequest#getParameterNames(**)
21-
javax.servlet.ServletRequest#getParameterValues(**)
18+
jakarta.servlet.ServletRequest#getParameter(**)
19+
jakarta.servlet.ServletRequest#getParameterMap(**)
20+
jakarta.servlet.ServletRequest#getParameterNames(**)
21+
jakarta.servlet.ServletRequest#getParameterValues(**)
2222

23-
javax.servlet.http.HttpServletRequest#getSession() @ Servlet API getter has side effect of creating sessions
23+
jakarta.servlet.http.HttpServletRequest#getSession() @ Servlet API getter has side effect of creating sessions
2424

2525
@defaultMessage Servlet API method is broken and slow in some environments (e.g., Jetty's UTF-8 readers)
2626

27-
javax.servlet.ServletRequest#getReader()
28-
javax.servlet.ServletResponse#getWriter()
29-
javax.servlet.ServletInputStream#readLine(**)
30-
javax.servlet.ServletOutputStream#print(**)
31-
javax.servlet.ServletOutputStream#println(**)
27+
jakarta.servlet.ServletRequest#getReader()
28+
jakarta.servlet.ServletResponse#getWriter()
29+
jakarta.servlet.ServletInputStream#readLine(**)
30+
jakarta.servlet.ServletOutputStream#print(**)
31+
jakarta.servlet.ServletOutputStream#println(**)

solr/licenses/javax.inject-1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

solr/licenses/javax.inject-LICENSE-ASL.txt

Lines changed: 0 additions & 202 deletions
This file was deleted.

0 commit comments

Comments
 (0)