This is an automated email from the ASF dual-hosted git repository.
isapir pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new e38672a BZ-65951 Use the tomcat.output property instead of a relative
path
e38672a is described below
commit e38672aa1a0beaf7ffa285b120fb048f4609ca75
Author: Igal Sapir <[email protected]>
AuthorDate: Mon Mar 14 20:32:56 2022 -0700
BZ-65951 Use the tomcat.output property instead of a relative path
---
res/bnd/build-defaults.bnd | 4 ++--
res/bnd/jasper-el.jar.tmp.bnd | 2 +-
res/bnd/jasper.jar.tmp.bnd | 2 +-
res/bnd/servlet-api.jar.tmp.bnd | 4 ++--
res/bnd/tomcat-embed-core.jar.tmp.bnd | 4 ++--
res/bnd/tomcat-embed-el.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 +-
res/bnd/tomcat-websocket.jar.tmp.bnd | 2 +-
webapps/docs/changelog.xml | 4 ++++
10 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index 753d08f..be3f26f 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -25,8 +25,8 @@ Implementation-Vendor: Apache Software Foundation
X-Compile-Source-JDK: ${compile.release}
X-Compile-Target-JDK: ${compile.release}
--includeresource.notice: META-INF/NOTICE=../../output/manifests/default.notice
--includeresource.license:
META-INF/LICENSE=../../output/manifests/default.license
+-includeresource.notice:
META-INF/NOTICE=${tomcat.output}/manifests/default.notice
+-includeresource.license:
META-INF/LICENSE=${tomcat.output}/manifests/default.license
-noclassforname: true
diff --git a/res/bnd/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd
index 1b96a38..94536a4 100644
--- a/res/bnd/jasper-el.jar.tmp.bnd
+++ b/res/bnd/jasper-el.jar.tmp.bnd
@@ -26,7 +26,7 @@ Export-Package: \
org.apache.el.stream,\
org.apache.el.util
--includeresource.meta-inf: /META-INF/=../../output/manifests/jasper-el.jar/
+-includeresource.meta-inf: /META-INF/=${tomcat.output}/manifests/jasper-el.jar/
-jpms-module-info: \
${module.name};\
diff --git a/res/bnd/jasper.jar.tmp.bnd b/res/bnd/jasper.jar.tmp.bnd
index 006c721..9747933 100644
--- a/res/bnd/jasper.jar.tmp.bnd
+++ b/res/bnd/jasper.jar.tmp.bnd
@@ -33,7 +33,7 @@ Export-Package: \
-includepackage: \
org.apache.jasper.resources
--includeresource.meta-inf: /META-INF/=../../output/manifests/jasper.jar/
+-includeresource.meta-inf: /META-INF/=${tomcat.output}/manifests/jasper.jar/
-jpms-module-info: \
${module.name};\
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index d925761..30ff375 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -27,8 +27,8 @@ Provide-Capability: \
version:Version=${servlet.spec.version};\
uses:='${packages;NAMED;jakarta.servlet.*;NAMED;!jakarta.servlet.jsp.*}'
--includeresource.notice2:
META-INF/NOTICE=../../output/manifests/servlet-api.jar.notice
--includeresource.license2:
META-INF/LICENSE=../../output/manifests/servlet-api.jar.license
+-includeresource.notice2:
META-INF/NOTICE=${tomcat.output}/manifests/servlet-api.jar.notice
+-includeresource.license2:
META-INF/LICENSE=${tomcat.output}/manifests/servlet-api.jar.license
-namesection: jakarta/servlet*/;\
Specification-Title=Jakarta Servlet;\
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index fa509b8..0a09ef4 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -96,8 +96,8 @@ Export-Package: \
org.apache.tomcat.util.net.jsse,\
org.apache.tomcat.util.threads.res
--includeresource.notice2:
META-INF/NOTICE=../../output/manifests/servlet-api.jar.notice
--includeresource.license2:
META-INF/LICENSE=../../output/manifests/servlet-api.jar.license
+-includeresource.notice2:
META-INF/NOTICE=${tomcat.output}/manifests/servlet-api.jar.notice
+-includeresource.license2:
META-INF/LICENSE=${tomcat.output}/manifests/servlet-api.jar.license
Provide-Capability: \
osgi.contract;\
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd
b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index 03d75a5..ff3d1133 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -27,7 +27,7 @@ Export-Package: \
org.apache.el.stream,\
org.apache.el.util
--includeresource.meta-inf: /META-INF/=../../output/manifests/jasper-el.jar/
+-includeresource.meta-inf: /META-INF/=${tomcat.output}/manifests/jasper-el.jar/
Provide-Capability: \
osgi.contract;\
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index 3987ceb..921cc9d 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -35,7 +35,7 @@ Export-Package: \
-includepackage: \
org.apache.jasper.resources
--includeresource.meta-inf: /META-INF/=../../output/manifests/jasper.jar/
+-includeresource.meta-inf: /META-INF/=${tomcat.output}/manifests/jasper.jar/
Provide-Capability: \
osgi.contract;\
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index b87985b..bb9d3b2 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -25,7 +25,7 @@ Export-Package: \
-includepackage: \
org.apache.tomcat.websocket.pojo
--includeresource.meta-inf:
/META-INF/=../../output/manifests/tomcat-websocket.jar/
+-includeresource.meta-inf:
/META-INF/=${tomcat.output}/manifests/tomcat-websocket.jar/
Provide-Capability: \
osgi.contract;\
diff --git a/res/bnd/tomcat-websocket.jar.tmp.bnd
b/res/bnd/tomcat-websocket.jar.tmp.bnd
index 31c0337..5429d0c 100644
--- a/res/bnd/tomcat-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-websocket.jar.tmp.bnd
@@ -24,7 +24,7 @@ Export-Package: \
-includepackage: \
org.apache.tomcat.websocket.pojo
--includeresource.meta-inf:
/META-INF/=../../output/manifests/tomcat-websocket.jar/
+-includeresource.meta-inf:
/META-INF/=${tomcat.output}/manifests/tomcat-websocket.jar/
-jpms-module-info: \
${module.name};\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6a6778f..5dac898 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,6 +120,10 @@
Correct a spelling mistake in the German translations. Thanks to Thomas
Hoffmann. (markt)
</fix>
+ <fix>
+ <bug>65951</bug>: Use the <code>tomcat.output</code> property for OSGi
+ bundle manifest paths. (isapir)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
