This is an automated email from the ASF dual-hosted git repository. isapir 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 8b93b46 BZ-65951 Use the tomcat.output property instead of a relative path 8b93b46 is described below commit 8b93b46c9eb8c3bd931da6f8edffe66f71828edd Author: Igal Sapir <isa...@apache.org> AuthorDate: Sun Mar 13 13:38:23 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-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 ++++ 9 files changed, 15 insertions(+), 11 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 c7a6a70..43602ca 100644 --- a/res/bnd/servlet-api.jar.tmp.bnd +++ b/res/bnd/servlet-api.jar.tmp.bnd @@ -27,8 +27,8 @@ Provide-Capability: \ version:List<Version>="4.0,3.1,3,2.5";\ uses:='${packages;NAMED;javax.servlet.*;NAMED;!javax.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: javax/servlet*/;\ Specification-Title='Java API for Servlets';\ diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd b/res/bnd/tomcat-embed-core.jar.tmp.bnd index 96def91..c41a851 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-jasper.jar.tmp.bnd b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd index a81d4b3..c46114d 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 59285de..52fdc82 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 efca2c2..ca672ec 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -111,6 +111,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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org