(tomcat) branch main updated: Avoid spotbugs classpath complaints
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 5a5faf8efe Avoid spotbugs classpath complaints 5a5faf8efe is described below commit 5a5faf8efe4be2299639396a4859df850bb6d116 Author: remm AuthorDate: Thu Jan 25 12:19:00 2024 +0100 Avoid spotbugs classpath complaints --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 2daf02fe1c..9aa28ffab7 100644 --- a/build.xml +++ b/build.xml @@ -2122,7 +2122,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Avoid spotbugs classpath complaints
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 98d08824f4 Avoid spotbugs classpath complaints 98d08824f4 is described below commit 98d08824f4b254653d461274ea833a27f3f78f32 Author: remm AuthorDate: Thu Jan 25 12:19:00 2024 +0100 Avoid spotbugs classpath complaints --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index f694eb022d..8e09578164 100644 --- a/build.xml +++ b/build.xml @@ -2147,7 +2147,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Avoid spotbugs classpath complaints
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 5ba814a8ed Avoid spotbugs classpath complaints 5ba814a8ed is described below commit 5ba814a8ed8847d6a952b56077e28151bba202ac Author: remm AuthorDate: Thu Jan 25 12:19:00 2024 +0100 Avoid spotbugs classpath complaints --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 2dc1d67144..94e80620e2 100644 --- a/build.xml +++ b/build.xml @@ -2092,7 +2092,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: Avoid spotbugs classpath complaints
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new ec50118cb8 Avoid spotbugs classpath complaints ec50118cb8 is described below commit ec50118cb819c77168bf9fbbebea655e6091caae Author: remm AuthorDate: Thu Jan 25 12:19:00 2024 +0100 Avoid spotbugs classpath complaints --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 370591a1a6..c6dc752f89 100644 --- a/build.xml +++ b/build.xml @@ -1722,7 +1722,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-10.1.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/1115 Blamelist: remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 10.1.x] 98d08824f4b254653d461274ea833a27f3f78f32 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68495] Unable to find match between the canonical context and the URI presented by the user agent
https://bz.apache.org/bugzilla/show_bug.cgi?id=68495 --- Comment #2 from Mark Thomas --- No response after a week. If the requested information is not provided, the issue will be closed as WORKSFORME. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Update to use JakartaExpressionLanguage osgi.contract [tomcat]
markt-asf commented on PR #685: URL: https://github.com/apache/tomcat/pull/685#issuecomment-1910670058 Thanks for reporting this. Looks like most of the embedded JARs got missed but EL was updated for embedded but not the standalone JAR in BZ 66834. I have a fix I'll push shortly that fixes all of those. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix the OSGi remaining references to Java EE contract names
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new de3ff9edaa Fix the OSGi remaining references to Java EE contract names
de3ff9edaa is described below
commit de3ff9edaaa85bd510549b64461a24211de26bfc
Author: Mark Thomas
AuthorDate: Thu Jan 25 17:33:31 2024 +
Fix the OSGi remaining references to Java EE contract names
Should be using Jakarta EE names for these
---
res/bnd/el-api.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-core.jar.tmp.bnd | 4 ++--
res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 2 +-
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 +-
webapps/docs/changelog.xml | 11 +++
5 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index ca57dbacbf..23451d4792 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -21,7 +21,7 @@ Export-Package: jakarta.el;version=${el.spec.version}
Provide-Capability: \
osgi.contract;\
-osgi.contract=JavaEL;\
+osgi.contract=JakartaExpressionLanguage;\
version:Version=${el.spec.version};\
uses:='${packages;NAMED;jakarta.el.*}'
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 0e6c768997..e3cce68d88 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -98,11 +98,11 @@ Export-Package: \
Provide-Capability: \
osgi.contract;\
-osgi.contract=JavaJASPIC;\
+osgi.contract=JakartaAuthentication;\
version:Version=${jaspic.spec.version};\
uses:='${packages;NAMED;jakarta.security.auth.message.*}',\
osgi.contract;\
-osgi.contract=JavaServlet;\
+osgi.contract=JakartaServlet;\
version:Version=${servlet.spec.version};\
uses:='${packages;NAMED;jakarta.servlet.*;NAMED;!jakarta.servlet.jsp.*}'
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index a0bbe6d065..ca0953ec17 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -39,7 +39,7 @@ Export-Package: \
Provide-Capability: \
osgi.contract;\
-osgi.contract=JavaJSP;\
+osgi.contract=JakartaServerPages;\
version:Version=${jsp.spec.version};\
uses:='${packages;NAMED;jakarta.servlet.jsp.*}'
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index e4d8a8fd3e..e3b938de83 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -29,7 +29,7 @@ Export-Package: \
Provide-Capability: \
osgi.contract;\
-osgi.contract=JavaWebSockets;\
+osgi.contract=JakartaWebSocket;\
version:Version=${websocket.spec.version};\
uses:='${packages;NAMED;jakarta.websocket.*}'
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 86ddca1546..5138229157 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -167,6 +167,17 @@
+
+
+
+Correct the remaining OSGi contract references in the manifest files to
+refer to the Jakarta EE contract names rather than the Java EE contract
+names. Based on pull request 685 provided by Paul A.
Nicolucci.
+(markt)
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Fix the OSGi remaining references to Java EE contract names
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 2803dd3029 Fix the OSGi remaining references to Java EE contract names
2803dd3029 is described below
commit 2803dd3029077b6182d3d806ac153a176f9b5cec
Author: Mark Thomas
AuthorDate: Thu Jan 25 17:33:31 2024 +
Fix the OSGi remaining references to Java EE contract names
Should be using Jakarta EE names for these
---
res/bnd/el-api.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-core.jar.tmp.bnd | 4 ++--
res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 2 +-
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 +-
webapps/docs/changelog.xml | 10 ++
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index ca57dbacbf..23451d4792 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -21,7 +21,7 @@ Export-Package: jakarta.el;version=${el.spec.version}
Provide-Capability: \
osgi.contract;\
-osgi.contract=JavaEL;\
+osgi.contract=JakartaExpressionLanguage;\
version:Version=${el.spec.version};\
uses:='${packages;NAMED;jakarta.el.*}'
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 558c2b43d6..bf5f844e2f 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -99,11 +99,11 @@ Export-Package: \
Provide-Capability: \
osgi.contract;\
-osgi.contract=JavaJASPIC;\
+osgi.contract=JakartaAuthentication;\
version:Version=${jaspic.spec.version};\
uses:='${packages;NAMED;jakarta.security.auth.message.*}',\
osgi.contract;\
-osgi.contract=JavaServlet;\
+osgi.contract=JakartaServlet;\
version:Version=${servlet.spec.version};\
uses:='${packages;NAMED;jakarta.servlet.*;NAMED;!jakarta.servlet.jsp.*}'
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index a0bbe6d065..ca0953ec17 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -39,7 +39,7 @@ Export-Package: \
Provide-Capability: \
osgi.contract;\
-osgi.contract=JavaJSP;\
+osgi.contract=JakartaServerPages;\
version:Version=${jsp.spec.version};\
uses:='${packages;NAMED;jakarta.servlet.jsp.*}'
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index e4d8a8fd3e..e3b938de83 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -29,7 +29,7 @@ Export-Package: \
Provide-Capability: \
osgi.contract;\
-osgi.contract=JavaWebSockets;\
+osgi.contract=JakartaWebSocket;\
version:Version=${websocket.spec.version};\
uses:='${packages;NAMED;jakarta.websocket.*}'
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8d17927e31..961a6a4b90 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -148,6 +148,16 @@
+
+
+
+Correct the remaining OSGi contract references in the manifest files to
+refer to the Jakarta EE contract names rather than the Java EE contract
+names. Based on pull request 685 provided by Paul A.
Nicolucci.
+(markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Update to use JakartaExpressionLanguage osgi.contract [tomcat]
markt-asf commented on PR #685: URL: https://github.com/apache/tomcat/pull/685#issuecomment-1910685730 Broader fix applied. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Update to use JakartaExpressionLanguage osgi.contract [tomcat]
markt-asf closed pull request #685: Update to use JakartaExpressionLanguage osgi.contract URL: https://github.com/apache/tomcat/pull/685 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-10.1.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/1116 Blamelist: Mark Thomas , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 10.1.x] 2803dd3029077b6182d3d806ac153a176f9b5cec Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
