You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/06/23 10:43:34 UTC
[tomcat] branch 9.0.x updated (986e457 -> 12b0ce4)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 986e457 Fix BZ 64532 - update to bnd 5.1.1
new 393c022 Fix BZ 64540 - switch from bndwrap task to bnd task, begin generating a better manifest and make sure the resulting jar contents are correct.
new 12b0ce4 Fix BZ 64540 - add specification specific metadata
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 17 +++++--
res/bnd/annotations-api.jar.tmp.bnd | 20 ++++++--
res/bnd/build-defaults.bnd | 15 ++++++
res/bnd/catalina-tribes.jar.tmp.bnd | 5 +-
res/bnd/catalina.jar.tmp.bnd | 5 +-
res/bnd/el-api.jar.tmp.bnd | 18 +++++++-
res/bnd/jasper-el.jar.tmp.bnd | 8 +++-
res/bnd/jasper.jar.tmp.bnd | 7 ++-
res/bnd/jaspic-api.jar.tmp.bnd | 21 +++++++--
res/bnd/jsp-api.jar.tmp.bnd | 21 +++++++--
res/bnd/servlet-api.jar.tmp.bnd | 26 ++++++++---
.../bnd/spec-defaults.bnd | 7 ++-
res/bnd/tomcat-coyote.jar.tmp.bnd | 9 +++-
res/bnd/tomcat-embed-core.jar.tmp.bnd | 53 ++++++++++++++++++----
res/bnd/tomcat-embed-el.jar.tmp.bnd | 24 +++++++++-
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 26 +++++++++--
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 24 ++++++++--
res/bnd/tomcat-util.jar.tmp.bnd | 6 ++-
res/bnd/tomcat-websocket.jar.tmp.bnd | 7 ++-
res/bnd/websocket-api.jar.tmp.bnd | 19 ++++++--
webapps/docs/changelog.xml | 5 ++
21 files changed, 287 insertions(+), 56 deletions(-)
copy java/org/apache/catalina/connector/LocalStrings_pt_BR.properties => res/bnd/spec-defaults.bnd (85%)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Fix BZ 64540 - add specification specific metadata
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 12b0ce4e1c75fc1cb8a4f2bafbc9b5f467bdb390
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri Jun 19 11:52:40 2020 -0400
Fix BZ 64540 - add specification specific metadata
Signed-off-by: Raymond Augé <ro...@apache.org>
---
res/bnd/annotations-api.jar.tmp.bnd | 18 +++++++++++---
res/bnd/el-api.jar.tmp.bnd | 16 ++++++++++++-
res/bnd/jaspic-api.jar.tmp.bnd | 19 +++++++++++----
res/bnd/jsp-api.jar.tmp.bnd | 19 +++++++++++----
res/bnd/servlet-api.jar.tmp.bnd | 24 +++++++++++++++----
res/bnd/tomcat-embed-core.jar.tmp.bnd | 38 +++++++++++++++++++++++-------
res/bnd/tomcat-embed-el.jar.tmp.bnd | 20 +++++++++++++---
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 19 +++++++++++----
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 19 ++++++++++++---
res/bnd/websocket-api.jar.tmp.bnd | 17 +++++++++++--
10 files changed, 171 insertions(+), 38 deletions(-)
diff --git a/res/bnd/annotations-api.jar.tmp.bnd b/res/bnd/annotations-api.jar.tmp.bnd
index 9b2f84e..19db9f4 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -18,6 +18,18 @@
Bundle-Name: tomcat-annotations-api
Bundle-SymbolicName: org.apache.tomcat-annotations-api
Export-Package: \
- javax.annotation,\
- javax.annotation.security,\
- javax.annotation.sql
+ javax.annotation.*;version=1.3
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaAnnotation;\
+ version:List<Version>="1.3,1.2,1.1,1";\
+ uses:='${packages;NAMED;javax.annotation.*}'
+
+-namesection: javax/annotation*/;\
+ Implementation-Title=javax.annotation;\
+ Implementation-Vendor='Apache Software Foundation';\
+ Implementation-Version=1.3.${annotation.revision};\
+ Specification-Title='Common Annotations';\
+ Specification-Vendor='Oracle Corporation';\
+ Specification-Version=1.3
\ No newline at end of file
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index 1533ede..1c6481d 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -17,4 +17,18 @@
Bundle-Name: tomcat-el-api
Bundle-SymbolicName: org.apache.tomcat-el-api
-Export-Package: javax.el
+Export-Package: javax.el;version=3.0
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaEL;\
+ version:List<Version>="3.0,2.2,2.1";\
+ uses:='${packages;NAMED;javax.el.*}'
+
+-namesection: javax/el*/;\
+ Specification-Title='Expression Language';\
+ Specification-Version=3.0;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.el;\
+ Implementation-Version=3.0.${el.revision};\
+ Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index d911c38..aa964f7 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -18,7 +18,18 @@
Bundle-Name: tomcat-jaspic-api
Bundle-SymbolicName: org.apache.tomcat-jaspic-api
Export-Package: \
- javax.security.auth.message,\
- javax.security.auth.message.callback,\
- javax.security.auth.message.config,\
- javax.security.auth.message.module
\ No newline at end of file
+ javax.security.auth.message.*;version=1.1
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaJASPIC;\
+ version:List<Version>="1.1,1";\
+ uses:='${packages;NAMED;javax.security.auth.message.*}'
+
+-namesection: javax/security/auth/message*/;\
+ Specification-Title='Java Authentication SPI for Containers';\
+ Specification-Version=1.1;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.security.auth.message;\
+ Implementation-Version=1.1.${jaspic.revision};\
+ Implementation-Vendor='Apache Software Foundation'
\ No newline at end of file
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index 0746375..f522c57 100644
--- a/res/bnd/jsp-api.jar.tmp.bnd
+++ b/res/bnd/jsp-api.jar.tmp.bnd
@@ -18,7 +18,18 @@
Bundle-Name: tomcat-jsp-api
Bundle-SymbolicName: org.apache.tomcat-jsp-api
Export-Package: \
- javax.servlet.jsp,\
- javax.servlet.jsp.el,\
- javax.servlet.jsp.resources,\
- javax.servlet.jsp.tagext
\ No newline at end of file
+ javax.servlet.jsp.*;version=2.3
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaJSP;\
+ version:List<Version>="2.3,2.2,2.1,2";\
+ uses:='${packages;NAMED;javax.servlet.jsp.*}'
+
+-namesection: javax/servlet/jsp*/;\
+ Specification-Title='Java API for JavaServer Pages';\
+ Specification-Version=2.3;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.servlet.jsp;\
+ Implementation-Version=2.3.${jsp.revision};\
+ Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index 4c9b25d..cc5697e 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -18,8 +18,22 @@
Bundle-Name: tomcat-servlet-api
Bundle-SymbolicName: org.apache.tomcat-servlet-api
Export-Package: \
- javax.servlet,\
- javax.servlet.annotation,\
- javax.servlet.descriptor,\
- javax.servlet.http,\
- javax.servlet.resources
\ No newline at end of file
+ !javax.servlet.jsp.*,\
+ javax.servlet.*;version=4.0
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaServlet;\
+ version:List<Version>="4.0,3.1,3,2.5";\
+ uses:='${packages;NAMED;javax.servlet.*;NAMED;!javax.servlet.jsp.*}'
+
+-includeresource.notice2: META-INF/NOTICE;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
+-includeresource.license2: {META-INF/LICENSE=../META-INF/servlet-api.jar.license}
+
+-namesection: javax/servlet*/;\
+ Specification-Title='Java API for Servlets';\
+ Specification-Version=4.0;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.servlet;\
+ Implementation-Version=4.0.${servlet.revision};\
+ Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 07f84fe..355941e 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -19,15 +19,9 @@ Automatic-Module-Name: org.apache.tomcat.embed.core
Bundle-Name: tomcat-embed-core
Bundle-SymbolicName: org.apache.tomcat-embed-core
Export-Package: \
- javax.security.auth.message,\
- javax.security.auth.message.callback,\
- javax.security.auth.message.config,\
- javax.security.auth.message.module,\
- javax.servlet,\
- javax.servlet.annotation,\
- javax.servlet.descriptor,\
- javax.servlet.http,\
- javax.servlet.resources,\
+ !javax.servlet.jsp.*,\
+ javax.security.auth.message.*;version=1.1,\
+ javax.servlet.*;version=4.0,\
org.apache.catalina,\
org.apache.catalina.authenticator,\
org.apache.catalina.authenticator.jaspic,\
@@ -106,3 +100,29 @@ Export-Package: \
-includeresource.notice2: META-INF/NOTICE;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
-includeresource.license2: {META-INF/LICENSE=../META-INF/servlet-api.jar.license}
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaJASPIC;\
+ version:List<Version>="1.1,1";\
+ uses:='${packages;NAMED;javax.security.auth.message.*}',\
+ osgi.contract;\
+ osgi.contract=JavaServlet;\
+ version:List<Version>="4.0,3.1,3,2.5";\
+ uses:='${packages;NAMED;javax.servlet.*;NAMED;!javax.servlet.jsp.*}'
+
+-namesection: \
+ javax/security/auth/message*/;\
+ Specification-Title='Java Authentication SPI for Containers';\
+ Specification-Version=1.1;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.security.auth.message;\
+ Implementation-Version=1.1.${jaspic.revision};\
+ Implementation-Vendor='Apache Software Foundation',\
+ javax/servlet*/;\
+ Specification-Title='Java API for Servlets';\
+ Specification-Version=4.0;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.servlet;\
+ Implementation-Version=4.0.${servlet.revision};\
+ Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index 5ed8792..bebc44f 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -19,13 +19,27 @@ Automatic-Module-Name: org.apache.tomcat.embed.jasper.el
Bundle-Name: tomcat-embed-jasper-el
Bundle-SymbolicName: org.apache.tomcat-embed-jasper-el
Export-Package: \
- javax.el,\
+ javax.el;version=3.0,\
org.apache.el,\
org.apache.el.lang,\
org.apache.el.parser
-includepackage: \
- org.apache.el.stream,\
- org.apache.el.util
+ org.apache.el.stream,\
+ org.apache.el.util
-includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaEL;\
+ version:List<Version>="3.0,2.2,2.1";\
+ uses:='${packages;NAMED;javax.el.*}'
+
+-namesection: javax/el*/;\
+ Specification-Title='Expression Language';\
+ Specification-Version=3.0;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.el;\
+ Implementation-Version=3.0.${el.revision};\
+ Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index 070e273..5a0f1c1 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -19,10 +19,7 @@ Automatic-Module-Name: org.apache.tomcat.embed.jasper
Bundle-Name: tomcat-embed-jasper
Bundle-SymbolicName: org.apache.tomcat-embed-jasper
Export-Package: \
- javax.servlet.jsp,\
- javax.servlet.jsp.el,\
- javax.servlet.jsp.resources,\
- javax.servlet.jsp.tagext,\
+ javax.servlet.jsp.*;version=2.3,\
org.apache.jasper,\
org.apache.jasper.compiler,\
org.apache.jasper.compiler.tagplugin,\
@@ -38,3 +35,17 @@ Export-Package: \
org.apache.jasper.resources
-includeresource.meta-inf: /META-INF/=../META-INF/jasper.jar/
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaJSP;\
+ version:List<Version>="2.3,2.2,2.1,2";\
+ uses:='${packages;NAMED;javax.servlet.jsp.*}'
+
+-namesection: javax/servlet/jsp*/;\
+ Specification-Title='Java API for JavaServer Pages';\
+ Specification-Version=2.3;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.servlet.jsp;\
+ Implementation-Version=2.3.${jsp.revision};\
+ Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index f6470f0..889d4a2 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -19,12 +19,25 @@ Automatic-Module-Name: org.apache.tomcat.embed.websocket
Bundle-Name: tomcat-embed-websocket
Bundle-SymbolicName: org.apache.tomcat-embed-websocket
Export-Package: \
- javax.websocket,\
- javax.websocket.server,\
+ javax.websocket.*;version=1.1,\
org.apache.tomcat.websocket,\
org.apache.tomcat.websocket.server
-includepackage: \
- org.apache.tomcat.websocket.pojo
+ org.apache.tomcat.websocket.pojo
-includeresource.meta-inf: /META-INF/=../META-INF/tomcat-websocket.jar/
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaWebSockets;\
+ version:List<Version>="1.1,1";\
+ uses:='${packages;NAMED;javax.websocket.*}'
+
+-namesection: javax/websocket*/;\
+ Specification-Title=WebSocket;\
+ Specification-Version=1.1;\
+ Specification-Vendor='Oracle, Inc.';\
+ Implementation-Title=javax.websocket;\
+ Implementation-Version=1.1.${websocket.revision};\
+ Implementation-Vendor='Apache Software Foundation'
\ No newline at end of file
diff --git a/res/bnd/websocket-api.jar.tmp.bnd b/res/bnd/websocket-api.jar.tmp.bnd
index 0596155..cacaf01 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -18,5 +18,18 @@
Bundle-Name: tomcat-websocket-api
Bundle-SymbolicName: org.apache.tomcat-websocket-api
Export-Package: \
- javax.websocket,\
- javax.websocket.server
\ No newline at end of file
+ javax.websocket.*;version=1.1
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaWebSockets;\
+ version:List<Version>="1.1,1";\
+ uses:='${packages;NAMED;javax.websocket.*}'
+
+-namesection: javax/websocket*/;\
+ Specification-Title=WebSocket;\
+ Specification-Version=1.1;\
+ Specification-Vendor='Oracle, Inc.';\
+ Implementation-Title=javax.websocket;\
+ Implementation-Version=1.1.${websocket.revision};\
+ Implementation-Vendor='Apache Software Foundation'
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd
task, begin generating a better manifest and make sure the resulting jar
contents are correct.
Posted by Coty Sutherland <cs...@apache.org>.
Just FYI, I found that if I build when the aqute-bnd and aqute-bndlib
packages are installed from Fedora (version 3.5) then the classes are *not*
included in the jar, but if I remove them and use the aqute-bnd version
that tomcat requires (version 5.1) then they are present.
On Tue, Jul 21, 2020 at 10:26 AM Raymond Auge
<ra...@liferay.com.invalid> wrote:
> Hey all,
>
> Thanks for looking into this. I made sure using a binary comparison tool
> that the jars did in fact contained the correct bits before and after all
> my changes.
>
> But Mark is correct that some of the previously private packages are
> actually used externally and I had some changes coming to deal with those
> (but presently I'm on vacation so thanks for handling some of those those
> Mark.)
>
> Sincerely,
> - Ray
>
> On Tue, Jul 21, 2020 at 9:51 AM Coty Sutherland <cs...@apache.org>
> wrote:
>
>> <snip>
>>
>> That looks like an issue that will need fixing in Fedora's build system.
>>> Annotation scanning and the multipart upload API will be broken if those
>>> packages are missing.
>>>
>>
>> Hm, OK. I'll look into that and I guess other changes to ensure the
>> Fedora build isn't breaking stuff. I need to figure out why the step is
>> removing the classes and fix that issue since it doesn't seem to affect our
>> binary distro :(
>>
>> Going back to the fix I applied. The JSSE package was being used
>>> externally so that change looks to be OK. The modeler.modules package
>>> was not so I'm currently leaning towards reverting that part of the
>>> change.
>>>
>>> Overall, I don't mind exposing these packages externally if necessary
>>> but I'd prefer not to expose them if we don't have to.
>>>
>>
>> I agree and I'm fine with reverting your fix (I think) and continuing
>> with the patch I've applied in Fedora to keep that working. It's noteworthy
>> to mention again though that Debian had the same issue too, so whatever the
>> issue is that's causing the classes to be removed isn't just a Fedora
>> problem.
>>
>
>
> --
> *Raymond Augé* <http://www.liferay.com/web/raymond.auge/profile>
> (@rotty3000)
> Senior Software Architect *Liferay, Inc.* <http://www.liferay.com>
> (@Liferay)
>
Re: [tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd
task, begin generating a better manifest and make sure the resulting jar
contents are correct.
Posted by Raymond Auge <ra...@liferay.com.INVALID>.
Hey all,
Thanks for looking into this. I made sure using a binary comparison tool
that the jars did in fact contained the correct bits before and after all
my changes.
But Mark is correct that some of the previously private packages are
actually used externally and I had some changes coming to deal with those
(but presently I'm on vacation so thanks for handling some of those those
Mark.)
Sincerely,
- Ray
On Tue, Jul 21, 2020 at 9:51 AM Coty Sutherland <cs...@apache.org> wrote:
> <snip>
>
> That looks like an issue that will need fixing in Fedora's build system.
>> Annotation scanning and the multipart upload API will be broken if those
>> packages are missing.
>>
>
> Hm, OK. I'll look into that and I guess other changes to ensure the Fedora
> build isn't breaking stuff. I need to figure out why the step is removing
> the classes and fix that issue since it doesn't seem to affect our binary
> distro :(
>
> Going back to the fix I applied. The JSSE package was being used
>> externally so that change looks to be OK. The modeler.modules package
>> was not so I'm currently leaning towards reverting that part of the
>> change.
>>
>> Overall, I don't mind exposing these packages externally if necessary
>> but I'd prefer not to expose them if we don't have to.
>>
>
> I agree and I'm fine with reverting your fix (I think) and continuing with
> the patch I've applied in Fedora to keep that working. It's noteworthy to
> mention again though that Debian had the same issue too, so whatever the
> issue is that's causing the classes to be removed isn't just a Fedora
> problem.
>
--
*Raymond Augé* <http://www.liferay.com/web/raymond.auge/profile>
(@rotty3000)
Senior Software Architect *Liferay, Inc.* <http://www.liferay.com>
(@Liferay)
Re: [tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd
task, begin generating a better manifest and make sure the resulting jar
contents are correct.
Posted by Coty Sutherland <cs...@apache.org>.
<snip>
That looks like an issue that will need fixing in Fedora's build system.
> Annotation scanning and the multipart upload API will be broken if those
> packages are missing.
>
Hm, OK. I'll look into that and I guess other changes to ensure the Fedora
build isn't breaking stuff. I need to figure out why the step is removing
the classes and fix that issue since it doesn't seem to affect our binary
distro :(
Going back to the fix I applied. The JSSE package was being used
> externally so that change looks to be OK. The modeler.modules package
> was not so I'm currently leaning towards reverting that part of the change.
>
> Overall, I don't mind exposing these packages externally if necessary
> but I'd prefer not to expose them if we don't have to.
>
I agree and I'm fine with reverting your fix (I think) and continuing with
the patch I've applied in Fedora to keep that working. It's noteworthy to
mention again though that Debian had the same issue too, so whatever the
issue is that's causing the classes to be removed isn't just a Fedora
problem.
Re: [tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd
task, begin generating a better manifest and make sure the resulting jar
contents are correct.
Posted by Mark Thomas <ma...@apache.org>.
On 21/07/2020 14:21, Coty Sutherland wrote:
> On Tue, Jul 21, 2020 at 9:15 AM Mark Thomas <markt@apache.org
> <ma...@apache.org>> wrote:
>
> On 21/07/2020 14:06, Coty Sutherland wrote:
>
> <snip/>
>
> > Oh yeah, you're right. They were included in the ASF binaries, but
> > Fedora (and Debian I guess) built their own bits and that's where the
> > classes came up missing. I wasn't able to identify *why* the classes
> > weren't present, only that it was the OSGi step that was removing
> them.
> > I thought initially that it was because the Fedora version of
> aqute-bnd
> > in use is 3.5, but I don't see the classes in my local build from the
> > 9.0.37 tag (using bnd 5.1) either.
>
> OK. That means it isn't quite as bad as it could be.
>
> What about the other packages in the original list? Are:
>
> org.apache.tomcat.util.bcel
> org.apache.tomcat.util.http.fileupload.impl
> org.apache.tomcat.util.http.fileupload.util.mime
>
> still present?
>
>
> Nope.
That looks like an issue that will need fixing in Fedora's build system.
Annotation scanning and the multipart upload API will be broken if those
packages are missing.
Going back to the fix I applied. The JSSE package was being used
externally so that change looks to be OK. The modeler.modules package
was not so I'm currently leaning towards reverting that part of the change.
Overall, I don't mind exposing these packages externally if necessary
but I'd prefer not to expose them if we don't have to.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd
task, begin generating a better manifest and make sure the resulting jar
contents are correct.
Posted by Coty Sutherland <cs...@apache.org>.
On Tue, Jul 21, 2020 at 9:15 AM Mark Thomas <ma...@apache.org> wrote:
> On 21/07/2020 14:06, Coty Sutherland wrote:
>
> <snip/>
>
> > Oh yeah, you're right. They were included in the ASF binaries, but
> > Fedora (and Debian I guess) built their own bits and that's where the
> > classes came up missing. I wasn't able to identify *why* the classes
> > weren't present, only that it was the OSGi step that was removing them.
> > I thought initially that it was because the Fedora version of aqute-bnd
> > in use is 3.5, but I don't see the classes in my local build from the
> > 9.0.37 tag (using bnd 5.1) either.
>
> OK. That means it isn't quite as bad as it could be.
>
> What about the other packages in the original list? Are:
>
> org.apache.tomcat.util.bcel
> org.apache.tomcat.util.http.fileupload.impl
> org.apache.tomcat.util.http.fileupload.util.mime
>
> still present?
>
Nope.
Re: [tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd
task, begin generating a better manifest and make sure the resulting jar
contents are correct.
Posted by Mark Thomas <ma...@apache.org>.
On 21/07/2020 14:06, Coty Sutherland wrote:
<snip/>
> Oh yeah, you're right. They were included in the ASF binaries, but
> Fedora (and Debian I guess) built their own bits and that's where the
> classes came up missing. I wasn't able to identify *why* the classes
> weren't present, only that it was the OSGi step that was removing them.
> I thought initially that it was because the Fedora version of aqute-bnd
> in use is 3.5, but I don't see the classes in my local build from the
> 9.0.37 tag (using bnd 5.1) either.
OK. That means it isn't quite as bad as it could be.
What about the other packages in the original list? Are:
org.apache.tomcat.util.bcel
org.apache.tomcat.util.http.fileupload.impl
org.apache.tomcat.util.http.fileupload.util.mime
still present?
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd
task, begin generating a better manifest and make sure the resulting jar
contents are correct.
Posted by Coty Sutherland <cs...@apache.org>.
On Tue, Jul 21, 2020 at 7:52 AM Mark Thomas <ma...@apache.org> wrote:
> On 21/07/2020 12:43, Coty Sutherland wrote:
> > Hi Mark,
> >
> > On Tue, Jul 21, 2020 at 4:48 AM Mark Thomas <markt@apache.org
> > <ma...@apache.org>> wrote:
> >
> > On 20/07/2020 18:20, Coty Sutherland wrote:
> > > This commit is problematic :( It's broken some projects that
> depend on
> > > Tomcat because now the tomcat-coyote.jar doesn't contain the
> > > org.apache.tomcat.util.net <http://org.apache.tomcat.util.net>.jsse
> or
> > > org.apache.tomcat.util.modeler.modules packages which results in
> > > ClassNotFoundExceptions. I haven't seen any issues with other jars
> > yet.
> > > The removal of those packages from the jar looks intentional, but
> we
> > > aren't providing the classes anywhere else for users to use which
> is
> > > causing problems. Thoughts?
> >
> > Those packages are still present.
> >
> >
> > It seems that removing the packages from the exported packages list
> > actually removed them completely from the tomcat-coyote.jar (I
> > decompiled it to look and they were not present, nor were they included
> > in any other jars).
>
> I've just checked the 9.0.37 binaries and those packages (and the
> classes they contain) are present in tomcat-coyote.jar.
>
> I saw the same when I built 10.0.x locally (before my fix).
>
> From where did you obtain a JAR where those classes were missing?
>
Oh yeah, you're right. They were included in the ASF binaries, but Fedora
(and Debian I guess) built their own bits and that's where the classes came
up missing. I wasn't able to identify *why* the classes weren't present,
only that it was the OSGi step that was removing them. I thought initially
that it was because the Fedora version of aqute-bnd in use is 3.5, but I
don't see the classes in my local build from the 9.0.37 tag (using bnd 5.1)
either.
> > Thanks for looking into it, the fix you did was the same patch that I
> > added yesterday
> > (
> https://src.fedoraproject.org/rpms/tomcat/c/a8c5ea85614dca66b492fe030a7e7cfc10cd52de?branch=master
> )
> > :) I wish I'd proposed it upstream now, I just wasn't sure what the
> > criteria was for not exporting the packages.
> >
> > The packages that were pointed out to me as broken are FreeIPA server
> > (https://bugzilla.redhat.com/show_bug.cgi?id=1857043) and Debian's
> > libtomcat9-java package
> > (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=964433), both with
> > different CNFEs.
>
> Tx. I'm curious as whether the root cause was missing classes or missing
> exports - but that depends on figuring out why the classes were missing
> first.
>
> Mark
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: [tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd
task, begin generating a better manifest and make sure the resulting jar
contents are correct.
Posted by Mark Thomas <ma...@apache.org>.
On 21/07/2020 12:43, Coty Sutherland wrote:
> Hi Mark,
>
> On Tue, Jul 21, 2020 at 4:48 AM Mark Thomas <markt@apache.org
> <ma...@apache.org>> wrote:
>
> On 20/07/2020 18:20, Coty Sutherland wrote:
> > This commit is problematic :( It's broken some projects that depend on
> > Tomcat because now the tomcat-coyote.jar doesn't contain the
> > org.apache.tomcat.util.net <http://org.apache.tomcat.util.net>.jsse or
> > org.apache.tomcat.util.modeler.modules packages which results in
> > ClassNotFoundExceptions. I haven't seen any issues with other jars
> yet.
> > The removal of those packages from the jar looks intentional, but we
> > aren't providing the classes anywhere else for users to use which is
> > causing problems. Thoughts?
>
> Those packages are still present.
>
>
> It seems that removing the packages from the exported packages list
> actually removed them completely from the tomcat-coyote.jar (I
> decompiled it to look and they were not present, nor were they included
> in any other jars).
I've just checked the 9.0.37 binaries and those packages (and the
classes they contain) are present in tomcat-coyote.jar.
I saw the same when I built 10.0.x locally (before my fix).
From where did you obtain a JAR where those classes were missing?
> Thanks for looking into it, the fix you did was the same patch that I
> added yesterday
> (https://src.fedoraproject.org/rpms/tomcat/c/a8c5ea85614dca66b492fe030a7e7cfc10cd52de?branch=master)
> :) I wish I'd proposed it upstream now, I just wasn't sure what the
> criteria was for not exporting the packages.
>
> The packages that were pointed out to me as broken are FreeIPA server
> (https://bugzilla.redhat.com/show_bug.cgi?id=1857043) and Debian's
> libtomcat9-java package
> (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=964433), both with
> different CNFEs.
Tx. I'm curious as whether the root cause was missing classes or missing
exports - but that depends on figuring out why the classes were missing
first.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd
task, begin generating a better manifest and make sure the resulting jar
contents are correct.
Posted by Coty Sutherland <cs...@apache.org>.
Hi Mark,
On Tue, Jul 21, 2020 at 4:48 AM Mark Thomas <ma...@apache.org> wrote:
> On 20/07/2020 18:20, Coty Sutherland wrote:
> > This commit is problematic :( It's broken some projects that depend on
> > Tomcat because now the tomcat-coyote.jar doesn't contain the
> > org.apache.tomcat.util.net.jsse or
> > org.apache.tomcat.util.modeler.modules packages which results in
> > ClassNotFoundExceptions. I haven't seen any issues with other jars yet.
> > The removal of those packages from the jar looks intentional, but we
> > aren't providing the classes anywhere else for users to use which is
> > causing problems. Thoughts?
>
> Those packages are still present.
>
It seems that removing the packages from the exported packages list
actually removed them completely from the tomcat-coyote.jar (I decompiled
it to look and they were not present, nor were they included in any other
jars).
> Do you mean those packages are no longer listed as exported in the OSGi
> / JPMS meta-data? The following packages are currently listed as private
> (and I assume the JPMS metadata is the same):
> org.apache.tomcat.util.bcel
> org.apache.tomcat.util.http.fileupload.impl
> org.apache.tomcat.util.http.fileupload.util.mime
> org.apache.tomcat.util.modeler.modules
> org.apache.tomcat.util.net.jsse
>
> It should be fairly easy to get that fixed.
>
> Out of curiosity, what projects are broken? I'm surprised that something
> has dependencies that deep into Tomcat's internals. Is this an OSGi
> dependency or JPMS?
>
Thanks for looking into it, the fix you did was the same patch that I added
yesterday (
https://src.fedoraproject.org/rpms/tomcat/c/a8c5ea85614dca66b492fe030a7e7cfc10cd52de?branch=master)
:) I wish I'd proposed it upstream now, I just wasn't sure what the
criteria was for not exporting the packages.
The packages that were pointed out to me as broken are FreeIPA server (
https://bugzilla.redhat.com/show_bug.cgi?id=1857043) and Debian's
libtomcat9-java package (
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=964433), both with
different CNFEs.
Re: [tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd
task, begin generating a better manifest and make sure the resulting jar
contents are correct.
Posted by Mark Thomas <ma...@apache.org>.
On 21/07/2020 09:47, Mark Thomas wrote:
> On 20/07/2020 18:20, Coty Sutherland wrote:
>> This commit is problematic :( It's broken some projects that depend on
>> Tomcat because now the tomcat-coyote.jar doesn't contain the
>> org.apache.tomcat.util.net.jsse or
>> org.apache.tomcat.util.modeler.modules packages which results in
>> ClassNotFoundExceptions. I haven't seen any issues with other jars yet.
>> The removal of those packages from the jar looks intentional, but we
>> aren't providing the classes anywhere else for users to use which is
>> causing problems. Thoughts?
>
> Those packages are still present.
>
> Do you mean those packages are no longer listed as exported in the OSGi
> / JPMS meta-data? The following packages are currently listed as private
> (and I assume the JPMS metadata is the same):
>
> org.apache.tomcat.util.bcel
> org.apache.tomcat.util.http.fileupload.impl
> org.apache.tomcat.util.http.fileupload.util.mime
> org.apache.tomcat.util.modeler.modules
> org.apache.tomcat.util.net.jsse
>
> It should be fairly easy to get that fixed.
I think I've fixed this. Let me know how you get on with 10.0.x / 9.0.x
Mark
>
> Out of curiosity, what projects are broken? I'm surprised that something
> has dependencies that deep into Tomcat's internals. Is this an OSGi
> dependency or JPMS?
>
> Mark
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd
task, begin generating a better manifest and make sure the resulting jar
contents are correct.
Posted by Mark Thomas <ma...@apache.org>.
On 20/07/2020 18:20, Coty Sutherland wrote:
> This commit is problematic :( It's broken some projects that depend on
> Tomcat because now the tomcat-coyote.jar doesn't contain the
> org.apache.tomcat.util.net.jsse or
> org.apache.tomcat.util.modeler.modules packages which results in
> ClassNotFoundExceptions. I haven't seen any issues with other jars yet.
> The removal of those packages from the jar looks intentional, but we
> aren't providing the classes anywhere else for users to use which is
> causing problems. Thoughts?
Those packages are still present.
Do you mean those packages are no longer listed as exported in the OSGi
/ JPMS meta-data? The following packages are currently listed as private
(and I assume the JPMS metadata is the same):
org.apache.tomcat.util.bcel
org.apache.tomcat.util.http.fileupload.impl
org.apache.tomcat.util.http.fileupload.util.mime
org.apache.tomcat.util.modeler.modules
org.apache.tomcat.util.net.jsse
It should be fairly easy to get that fixed.
Out of curiosity, what projects are broken? I'm surprised that something
has dependencies that deep into Tomcat's internals. Is this an OSGi
dependency or JPMS?
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd
task, begin generating a better manifest and make sure the resulting jar
contents are correct.
Posted by Coty Sutherland <cs...@apache.org>.
This commit is problematic :( It's broken some projects that depend on
Tomcat because now the tomcat-coyote.jar doesn't contain the
org.apache.tomcat.util.net.jsse or org.apache.tomcat.util.modeler.modules
packages which results in ClassNotFoundExceptions. I haven't seen any
issues with other jars yet. The removal of those packages from the jar
looks intentional, but we aren't providing the classes anywhere else for
users to use which is causing problems. Thoughts?
On Tue, Jun 23, 2020 at 6:43 AM <ma...@apache.org> wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch 9.0.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
> commit 393c022c87e5cbebf1b96c3e1e7aa3b2ab4d5b74
> Author: Raymond Augé <ro...@apache.org>
> AuthorDate: Fri Jun 19 09:32:56 2020 -0400
>
> Fix BZ 64540 - switch from bndwrap task to bnd task, begin generating
> a better manifest and make sure the resulting jar contents are correct.
>
> Signed-off-by: Raymond Augé <ro...@apache.org>
> ---
> build.xml | 17 ++++++++++++++---
> res/bnd/annotations-api.jar.tmp.bnd | 2 +-
> res/bnd/build-defaults.bnd | 15 +++++++++++++++
> res/bnd/catalina-tribes.jar.tmp.bnd | 5 ++++-
> res/bnd/catalina.jar.tmp.bnd | 5 ++++-
> res/bnd/el-api.jar.tmp.bnd | 2 +-
> res/bnd/jasper-el.jar.tmp.bnd | 8 +++++++-
> res/bnd/jasper.jar.tmp.bnd | 7 ++++++-
> res/bnd/jaspic-api.jar.tmp.bnd | 2 +-
> res/bnd/jsp-api.jar.tmp.bnd | 2 +-
> res/bnd/servlet-api.jar.tmp.bnd | 2 +-
> res/bnd/{el-api.jar.tmp.bnd => spec-defaults.bnd} | 11 ++++++-----
> res/bnd/tomcat-coyote.jar.tmp.bnd | 9 ++++++++-
> res/bnd/tomcat-embed-core.jar.tmp.bnd | 15 ++++++++++++++-
> res/bnd/tomcat-embed-el.jar.tmp.bnd | 8 +++++++-
> res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 7 ++++++-
> res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 7 ++++++-
> res/bnd/tomcat-util.jar.tmp.bnd | 6 +++++-
> res/bnd/tomcat-websocket.jar.tmp.bnd | 7 ++++++-
> res/bnd/websocket-api.jar.tmp.bnd | 2 +-
> webapps/docs/changelog.xml | 5 +++++
> 21 files changed, 119 insertions(+), 25 deletions(-)
>
> diff --git a/build.xml b/build.xml
> index 1900b78..7dba702 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -3358,9 +3358,20 @@ Read the Building page on the Apache Tomcat
> documentation site for details on ho
>
> <target name="add-osgi" if="${addOSGi}" >
> <echo message="add-osgi ${jarfile} ${addOSGi}"></echo>
> - <bndwrap output="${jarfile}.tmp" definitions="${tomcat.bnd}" >
> - <fileset file="${jarfile}" />
> - </bndwrap>
> + <local name="filename"/>
> + <basename property="filename" file="${jarfile}"/>
> + <bnd
> + basedir="${basedir}"
> + output="${jarfile}.tmp"
> + >
> + <classpath>
> + <pathelement location="${jarfile}"/>
> + <pathelement location="${bnd.jar}"/>
> + </classpath>
> + <bndfiles>
> + <pathelement location="${tomcat.bnd}/${filename}.tmp.bnd"/>
> + </bndfiles>
> + </bnd>
> <delete file="${jarfile}" />
> <move file="${jarfile}.tmp" tofile="${jarfile}" />
> </target>
> diff --git a/res/bnd/annotations-api.jar.tmp.bnd
> b/res/bnd/annotations-api.jar.tmp.bnd
> index 9399b6c..9b2f84e 100644
> --- a/res/bnd/annotations-api.jar.tmp.bnd
> +++ b/res/bnd/annotations-api.jar.tmp.bnd
> @@ -13,7 +13,7 @@
> # See the License for the specific language governing permissions and
> # limitations under the License.
>
> --include: build-defaults.bnd
> +-include: build-defaults.bnd, spec-defaults.bnd
>
> Bundle-Name: tomcat-annotations-api
> Bundle-SymbolicName: org.apache.tomcat-annotations-api
> diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
> index 06e64c4..cdefb9c 100644
> --- a/res/bnd/build-defaults.bnd
> +++ b/res/bnd/build-defaults.bnd
> @@ -14,3 +14,18 @@
> # limitations under the License.
>
> Bundle-Version: ${version_cleanup;${version}}
> +
> +Specification-Title: Apache Tomcat
> +Specification-Version: ${version.major.minor}
> +Specification-Vendor: Apache Software Foundation
> +Implementation-Title: Apache Tomcat
> +Implementation-Version: ${version}
> +Implementation-Vendor: Apache Software Foundation
> +
> +X-Compile-Source-JDK: ${compile.source}
> +X-Compile-Target-JDK: ${compile.target}
> +
> +-includeresource.notice:
> META-INF/NOTICE;literal="${replace;${cat;../META-INF/default.notice};@YEAR
> @;${year}}\n"
> +-includeresource.license: {META-INF/LICENSE=../META-INF/default.license}
> +
> +-noclassforname: true
> \ No newline at end of file
> diff --git a/res/bnd/catalina-tribes.jar.tmp.bnd
> b/res/bnd/catalina-tribes.jar.tmp.bnd
> index 630169d..d6ae14a 100644
> --- a/res/bnd/catalina-tribes.jar.tmp.bnd
> +++ b/res/bnd/catalina-tribes.jar.tmp.bnd
> @@ -28,4 +28,7 @@ Export-Package: \
> org.apache.catalina.tribes.transport,\
> org.apache.catalina.tribes.transport.bio,\
> org.apache.catalina.tribes.transport.nio,\
> - org.apache.catalina.tribes.util
> \ No newline at end of file
> + org.apache.catalina.tribes.util
> +
> +-includepackage: \
> + org.apache.catalina.tribes.membership.cloud
> \ No newline at end of file
> diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
> index 556169f..dc94c42 100644
> --- a/res/bnd/catalina.jar.tmp.bnd
> +++ b/res/bnd/catalina.jar.tmp.bnd
> @@ -45,4 +45,7 @@ Export-Package: \
> org.apache.naming.java,\
> org.apache.catalina.webresources.war,\
> org.apache.catalina.manager.util,\
> - org.apache.catalina
> \ No newline at end of file
> + org.apache.catalina
> +
> +-includepackage: \
> + org.apache.naming.factory.webservices
> \ No newline at end of file
> diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
> index 70fdb91..1533ede 100644
> --- a/res/bnd/el-api.jar.tmp.bnd
> +++ b/res/bnd/el-api.jar.tmp.bnd
> @@ -13,7 +13,7 @@
> # See the License for the specific language governing permissions and
> # limitations under the License.
>
> --include: build-defaults.bnd
> +-include: build-defaults.bnd, spec-defaults.bnd
>
> Bundle-Name: tomcat-el-api
> Bundle-SymbolicName: org.apache.tomcat-el-api
> diff --git a/res/bnd/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd
> index 1550548..45b2744 100644
> --- a/res/bnd/jasper-el.jar.tmp.bnd
> +++ b/res/bnd/jasper-el.jar.tmp.bnd
> @@ -20,4 +20,10 @@ Bundle-SymbolicName: org.apache.tomcat-jasper-el
> Export-Package: \
> org.apache.el,\
> org.apache.el.lang,\
> - org.apache.el.parser
> \ No newline at end of file
> + org.apache.el.parser
> +
> +-includepackage: \
> + org.apache.el.stream,\
> + org.apache.el.util
> +
> +-includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
> \ No newline at end of file
> diff --git a/res/bnd/jasper.jar.tmp.bnd b/res/bnd/jasper.jar.tmp.bnd
> index 4cd16d2..fbcafcb 100644
> --- a/res/bnd/jasper.jar.tmp.bnd
> +++ b/res/bnd/jasper.jar.tmp.bnd
> @@ -27,4 +27,9 @@ Export-Package: \
> org.apache.jasper.servlet,\
> org.apache.jasper.tagplugins.jstl,\
> org.apache.jasper.tagplugins.jstl.core,\
> - org.apache.jasper.util
> \ No newline at end of file
> + org.apache.jasper.util
> +
> +-includepackage: \
> + org.apache.jasper.resources
> +
> +-includeresource.meta-inf: /META-INF/=../META-INF/jasper.jar/
> \ No newline at end of file
> diff --git a/res/bnd/jaspic-api.jar.tmp.bnd
> b/res/bnd/jaspic-api.jar.tmp.bnd
> index 7ac9368..d911c38 100644
> --- a/res/bnd/jaspic-api.jar.tmp.bnd
> +++ b/res/bnd/jaspic-api.jar.tmp.bnd
> @@ -13,7 +13,7 @@
> # See the License for the specific language governing permissions and
> # limitations under the License.
>
> --include: build-defaults.bnd
> +-include: build-defaults.bnd, spec-defaults.bnd
>
> Bundle-Name: tomcat-jaspic-api
> Bundle-SymbolicName: org.apache.tomcat-jaspic-api
> diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
> index ca2b47d..0746375 100644
> --- a/res/bnd/jsp-api.jar.tmp.bnd
> +++ b/res/bnd/jsp-api.jar.tmp.bnd
> @@ -13,7 +13,7 @@
> # See the License for the specific language governing permissions and
> # limitations under the License.
>
> --include: build-defaults.bnd
> +-include: build-defaults.bnd, spec-defaults.bnd
>
> Bundle-Name: tomcat-jsp-api
> Bundle-SymbolicName: org.apache.tomcat-jsp-api
> diff --git a/res/bnd/servlet-api.jar.tmp.bnd
> b/res/bnd/servlet-api.jar.tmp.bnd
> index 307d1bd..4c9b25d 100644
> --- a/res/bnd/servlet-api.jar.tmp.bnd
> +++ b/res/bnd/servlet-api.jar.tmp.bnd
> @@ -13,7 +13,7 @@
> # See the License for the specific language governing permissions and
> # limitations under the License.
>
> --include: build-defaults.bnd
> +-include: build-defaults.bnd, spec-defaults.bnd
>
> Bundle-Name: tomcat-servlet-api
> Bundle-SymbolicName: org.apache.tomcat-servlet-api
> diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/spec-defaults.bnd
> similarity index 85%
> copy from res/bnd/el-api.jar.tmp.bnd
> copy to res/bnd/spec-defaults.bnd
> index 70fdb91..65c2c3a 100644
> --- a/res/bnd/el-api.jar.tmp.bnd
> +++ b/res/bnd/spec-defaults.bnd
> @@ -13,8 +13,9 @@
> # See the License for the specific language governing permissions and
> # limitations under the License.
>
> --include: build-defaults.bnd
> -
> -Bundle-Name: tomcat-el-api
> -Bundle-SymbolicName: org.apache.tomcat-el-api
> -Export-Package: javax.el
> +Specification-Title:
> +Specification-Version:
> +Specification-Vendor:
> +Implementation-Title:
> +Implementation-Version:
> +Implementation-Vendor:
> \ No newline at end of file
> diff --git a/res/bnd/tomcat-coyote.jar.tmp.bnd
> b/res/bnd/tomcat-coyote.jar.tmp.bnd
> index 0c21cb4..f0557b8 100644
> --- a/res/bnd/tomcat-coyote.jar.tmp.bnd
> +++ b/res/bnd/tomcat-coyote.jar.tmp.bnd
> @@ -35,4 +35,11 @@ Export-Package: \
> org.apache.tomcat.util.modeler,\
> org.apache.tomcat.util.net,\
> org.apache.tomcat.util.net.openssl,\
> - org.apache.tomcat.util.net.openssl.ciphers
> \ No newline at end of file
> + org.apache.tomcat.util.net.openssl.ciphers
> +
> +-includepackage: \
> + org.apache.tomcat.util.bcel,\
> + org.apache.tomcat.util.http.fileupload.impl,\
> + org.apache.tomcat.util.http.fileupload.util.mime,\
> + org.apache.tomcat.util.modeler.modules,\
> + org.apache.tomcat.util.net.jsse
> \ No newline at end of file
> diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
> b/res/bnd/tomcat-embed-core.jar.tmp.bnd
> index 553de57..07f84fe 100644
> --- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
> +++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
> @@ -92,4 +92,17 @@ Export-Package: \
> org.apache.tomcat.util.res,\
> org.apache.tomcat.util.scan,\
> org.apache.tomcat.util.security,\
> - org.apache.tomcat.util.threads
> \ No newline at end of file
> + org.apache.tomcat.util.threads
> +
> +-includepackage: \
> + org.apache.naming.factory.webservices,\
> + org.apache.tomcat.util.bcel,\
> + org.apache.tomcat.util.http.fileupload.impl,\
> + org.apache.tomcat.util.http.fileupload.util.mime,\
> + org.apache.tomcat.util.json,\
> + org.apache.tomcat.util.modeler.modules,\
> + org.apache.tomcat.util.net.jsse,\
> + org.apache.tomcat.util.threads.res
> +
> +-includeresource.notice2:
> META-INF/NOTICE;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR
> @;${year}}\n"
> +-includeresource.license2:
> {META-INF/LICENSE=../META-INF/servlet-api.jar.license}
> diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd
> b/res/bnd/tomcat-embed-el.jar.tmp.bnd
> index 19589ea..5ed8792 100644
> --- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
> +++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
> @@ -22,4 +22,10 @@ Export-Package: \
> javax.el,\
> org.apache.el,\
> org.apache.el.lang,\
> - org.apache.el.parser
> \ No newline at end of file
> + org.apache.el.parser
> +
> +-includepackage: \
> + org.apache.el.stream,\
> + org.apache.el.util
> +
> +-includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
> diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
> b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
> index e7eafe8..070e273 100644
> --- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
> +++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
> @@ -32,4 +32,9 @@ Export-Package: \
> org.apache.jasper.servlet,\
> org.apache.jasper.tagplugins.jstl,\
> org.apache.jasper.tagplugins.jstl.core,\
> - org.apache.jasper.util
> \ No newline at end of file
> + org.apache.jasper.util
> +
> +-includepackage: \
> + org.apache.jasper.resources
> +
> +-includeresource.meta-inf: /META-INF/=../META-INF/jasper.jar/
> diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
> b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
> index 1a8f762..f6470f0 100644
> --- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
> +++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
> @@ -22,4 +22,9 @@ Export-Package: \
> javax.websocket,\
> javax.websocket.server,\
> org.apache.tomcat.websocket,\
> - org.apache.tomcat.websocket.server
> \ No newline at end of file
> + org.apache.tomcat.websocket.server
> +
> +-includepackage: \
> + org.apache.tomcat.websocket.pojo
> +
> +-includeresource.meta-inf: /META-INF/=../META-INF/tomcat-websocket.jar/
> diff --git a/res/bnd/tomcat-util.jar.tmp.bnd
> b/res/bnd/tomcat-util.jar.tmp.bnd
> index 3c456d8..d1011d9 100644
> --- a/res/bnd/tomcat-util.jar.tmp.bnd
> +++ b/res/bnd/tomcat-util.jar.tmp.bnd
> @@ -26,4 +26,8 @@ Export-Package: \
> org.apache.tomcat.util.file,\
> org.apache.tomcat.util.res,\
> org.apache.tomcat.util.security,\
> - org.apache.tomcat.util.threads
> \ No newline at end of file
> + org.apache.tomcat.util.threads
> +
> +-includepackage: \
> + org.apache.tomcat.util.json,\
> + org.apache.tomcat.util.threads.res
> \ No newline at end of file
> diff --git a/res/bnd/tomcat-websocket.jar.tmp.bnd
> b/res/bnd/tomcat-websocket.jar.tmp.bnd
> index 623c32c..13f1423 100644
> --- a/res/bnd/tomcat-websocket.jar.tmp.bnd
> +++ b/res/bnd/tomcat-websocket.jar.tmp.bnd
> @@ -19,4 +19,9 @@ Bundle-Name: tomcat-websocket
> Bundle-SymbolicName: org.apache.tomcat-websocket
> Export-Package: \
> org.apache.tomcat.websocket,\
> - org.apache.tomcat.websocket.server
> \ No newline at end of file
> + org.apache.tomcat.websocket.server
> +
> +-includepackage: \
> + org.apache.tomcat.websocket.pojo
> +
> +-includeresource.meta-inf: /META-INF/=../META-INF/tomcat-websocket.jar/
> \ No newline at end of file
> diff --git a/res/bnd/websocket-api.jar.tmp.bnd
> b/res/bnd/websocket-api.jar.tmp.bnd
> index cad59c2..0596155 100644
> --- a/res/bnd/websocket-api.jar.tmp.bnd
> +++ b/res/bnd/websocket-api.jar.tmp.bnd
> @@ -13,7 +13,7 @@
> # See the License for the specific language governing permissions and
> # limitations under the License.
>
> --include: build-defaults.bnd
> +-include: build-defaults.bnd, spec-defaults.bnd
>
> Bundle-Name: tomcat-websocket-api
> Bundle-SymbolicName: org.apache.tomcat-websocket-api
> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
> index e23e4a1..6ec6c69 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -142,6 +142,11 @@
> <bug>64532</bug>: Update to bnd 5.1.1. Pull request provided by
> Raymond
> Augé. (markt)
> </fix>
> + <fix>
> + <bug>64540</bug>: Switch from bndwrap task to bnd task, begin
> generating
> + a better manifest and make sure the resulting jar contents are
> correct.
> + Pull request provided by Raymond Augé. (markt)
> + </fix>
> </changelog>
> </subsection>
> </section>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
[tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd task,
begin generating a better manifest and make sure the resulting jar contents
are correct.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 393c022c87e5cbebf1b96c3e1e7aa3b2ab4d5b74
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri Jun 19 09:32:56 2020 -0400
Fix BZ 64540 - switch from bndwrap task to bnd task, begin generating a better manifest and make sure the resulting jar contents are correct.
Signed-off-by: Raymond Augé <ro...@apache.org>
---
build.xml | 17 ++++++++++++++---
res/bnd/annotations-api.jar.tmp.bnd | 2 +-
res/bnd/build-defaults.bnd | 15 +++++++++++++++
res/bnd/catalina-tribes.jar.tmp.bnd | 5 ++++-
res/bnd/catalina.jar.tmp.bnd | 5 ++++-
res/bnd/el-api.jar.tmp.bnd | 2 +-
res/bnd/jasper-el.jar.tmp.bnd | 8 +++++++-
res/bnd/jasper.jar.tmp.bnd | 7 ++++++-
res/bnd/jaspic-api.jar.tmp.bnd | 2 +-
res/bnd/jsp-api.jar.tmp.bnd | 2 +-
res/bnd/servlet-api.jar.tmp.bnd | 2 +-
res/bnd/{el-api.jar.tmp.bnd => spec-defaults.bnd} | 11 ++++++-----
res/bnd/tomcat-coyote.jar.tmp.bnd | 9 ++++++++-
res/bnd/tomcat-embed-core.jar.tmp.bnd | 15 ++++++++++++++-
res/bnd/tomcat-embed-el.jar.tmp.bnd | 8 +++++++-
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 7 ++++++-
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 7 ++++++-
res/bnd/tomcat-util.jar.tmp.bnd | 6 +++++-
res/bnd/tomcat-websocket.jar.tmp.bnd | 7 ++++++-
res/bnd/websocket-api.jar.tmp.bnd | 2 +-
webapps/docs/changelog.xml | 5 +++++
21 files changed, 119 insertions(+), 25 deletions(-)
diff --git a/build.xml b/build.xml
index 1900b78..7dba702 100644
--- a/build.xml
+++ b/build.xml
@@ -3358,9 +3358,20 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
<target name="add-osgi" if="${addOSGi}" >
<echo message="add-osgi ${jarfile} ${addOSGi}"></echo>
- <bndwrap output="${jarfile}.tmp" definitions="${tomcat.bnd}" >
- <fileset file="${jarfile}" />
- </bndwrap>
+ <local name="filename"/>
+ <basename property="filename" file="${jarfile}"/>
+ <bnd
+ basedir="${basedir}"
+ output="${jarfile}.tmp"
+ >
+ <classpath>
+ <pathelement location="${jarfile}"/>
+ <pathelement location="${bnd.jar}"/>
+ </classpath>
+ <bndfiles>
+ <pathelement location="${tomcat.bnd}/${filename}.tmp.bnd"/>
+ </bndfiles>
+ </bnd>
<delete file="${jarfile}" />
<move file="${jarfile}.tmp" tofile="${jarfile}" />
</target>
diff --git a/res/bnd/annotations-api.jar.tmp.bnd b/res/bnd/annotations-api.jar.tmp.bnd
index 9399b6c..9b2f84e 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
--include: build-defaults.bnd
+-include: build-defaults.bnd, spec-defaults.bnd
Bundle-Name: tomcat-annotations-api
Bundle-SymbolicName: org.apache.tomcat-annotations-api
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index 06e64c4..cdefb9c 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -14,3 +14,18 @@
# limitations under the License.
Bundle-Version: ${version_cleanup;${version}}
+
+Specification-Title: Apache Tomcat
+Specification-Version: ${version.major.minor}
+Specification-Vendor: Apache Software Foundation
+Implementation-Title: Apache Tomcat
+Implementation-Version: ${version}
+Implementation-Vendor: Apache Software Foundation
+
+X-Compile-Source-JDK: ${compile.source}
+X-Compile-Target-JDK: ${compile.target}
+
+-includeresource.notice: META-INF/NOTICE;literal="${replace;${cat;../META-INF/default.notice};@YEAR@;${year}}\n"
+-includeresource.license: {META-INF/LICENSE=../META-INF/default.license}
+
+-noclassforname: true
\ No newline at end of file
diff --git a/res/bnd/catalina-tribes.jar.tmp.bnd b/res/bnd/catalina-tribes.jar.tmp.bnd
index 630169d..d6ae14a 100644
--- a/res/bnd/catalina-tribes.jar.tmp.bnd
+++ b/res/bnd/catalina-tribes.jar.tmp.bnd
@@ -28,4 +28,7 @@ Export-Package: \
org.apache.catalina.tribes.transport,\
org.apache.catalina.tribes.transport.bio,\
org.apache.catalina.tribes.transport.nio,\
- org.apache.catalina.tribes.util
\ No newline at end of file
+ org.apache.catalina.tribes.util
+
+-includepackage: \
+ org.apache.catalina.tribes.membership.cloud
\ No newline at end of file
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 556169f..dc94c42 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -45,4 +45,7 @@ Export-Package: \
org.apache.naming.java,\
org.apache.catalina.webresources.war,\
org.apache.catalina.manager.util,\
- org.apache.catalina
\ No newline at end of file
+ org.apache.catalina
+
+-includepackage: \
+ org.apache.naming.factory.webservices
\ No newline at end of file
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index 70fdb91..1533ede 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
--include: build-defaults.bnd
+-include: build-defaults.bnd, spec-defaults.bnd
Bundle-Name: tomcat-el-api
Bundle-SymbolicName: org.apache.tomcat-el-api
diff --git a/res/bnd/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd
index 1550548..45b2744 100644
--- a/res/bnd/jasper-el.jar.tmp.bnd
+++ b/res/bnd/jasper-el.jar.tmp.bnd
@@ -20,4 +20,10 @@ Bundle-SymbolicName: org.apache.tomcat-jasper-el
Export-Package: \
org.apache.el,\
org.apache.el.lang,\
- org.apache.el.parser
\ No newline at end of file
+ org.apache.el.parser
+
+-includepackage: \
+ org.apache.el.stream,\
+ org.apache.el.util
+
+-includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
\ No newline at end of file
diff --git a/res/bnd/jasper.jar.tmp.bnd b/res/bnd/jasper.jar.tmp.bnd
index 4cd16d2..fbcafcb 100644
--- a/res/bnd/jasper.jar.tmp.bnd
+++ b/res/bnd/jasper.jar.tmp.bnd
@@ -27,4 +27,9 @@ Export-Package: \
org.apache.jasper.servlet,\
org.apache.jasper.tagplugins.jstl,\
org.apache.jasper.tagplugins.jstl.core,\
- org.apache.jasper.util
\ No newline at end of file
+ org.apache.jasper.util
+
+-includepackage: \
+ org.apache.jasper.resources
+
+-includeresource.meta-inf: /META-INF/=../META-INF/jasper.jar/
\ No newline at end of file
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index 7ac9368..d911c38 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
--include: build-defaults.bnd
+-include: build-defaults.bnd, spec-defaults.bnd
Bundle-Name: tomcat-jaspic-api
Bundle-SymbolicName: org.apache.tomcat-jaspic-api
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index ca2b47d..0746375 100644
--- a/res/bnd/jsp-api.jar.tmp.bnd
+++ b/res/bnd/jsp-api.jar.tmp.bnd
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
--include: build-defaults.bnd
+-include: build-defaults.bnd, spec-defaults.bnd
Bundle-Name: tomcat-jsp-api
Bundle-SymbolicName: org.apache.tomcat-jsp-api
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index 307d1bd..4c9b25d 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
--include: build-defaults.bnd
+-include: build-defaults.bnd, spec-defaults.bnd
Bundle-Name: tomcat-servlet-api
Bundle-SymbolicName: org.apache.tomcat-servlet-api
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/spec-defaults.bnd
similarity index 85%
copy from res/bnd/el-api.jar.tmp.bnd
copy to res/bnd/spec-defaults.bnd
index 70fdb91..65c2c3a 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/spec-defaults.bnd
@@ -13,8 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
--include: build-defaults.bnd
-
-Bundle-Name: tomcat-el-api
-Bundle-SymbolicName: org.apache.tomcat-el-api
-Export-Package: javax.el
+Specification-Title:
+Specification-Version:
+Specification-Vendor:
+Implementation-Title:
+Implementation-Version:
+Implementation-Vendor:
\ No newline at end of file
diff --git a/res/bnd/tomcat-coyote.jar.tmp.bnd b/res/bnd/tomcat-coyote.jar.tmp.bnd
index 0c21cb4..f0557b8 100644
--- a/res/bnd/tomcat-coyote.jar.tmp.bnd
+++ b/res/bnd/tomcat-coyote.jar.tmp.bnd
@@ -35,4 +35,11 @@ Export-Package: \
org.apache.tomcat.util.modeler,\
org.apache.tomcat.util.net,\
org.apache.tomcat.util.net.openssl,\
- org.apache.tomcat.util.net.openssl.ciphers
\ No newline at end of file
+ org.apache.tomcat.util.net.openssl.ciphers
+
+-includepackage: \
+ org.apache.tomcat.util.bcel,\
+ org.apache.tomcat.util.http.fileupload.impl,\
+ org.apache.tomcat.util.http.fileupload.util.mime,\
+ org.apache.tomcat.util.modeler.modules,\
+ org.apache.tomcat.util.net.jsse
\ No newline at end of file
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 553de57..07f84fe 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -92,4 +92,17 @@ Export-Package: \
org.apache.tomcat.util.res,\
org.apache.tomcat.util.scan,\
org.apache.tomcat.util.security,\
- org.apache.tomcat.util.threads
\ No newline at end of file
+ org.apache.tomcat.util.threads
+
+-includepackage: \
+ org.apache.naming.factory.webservices,\
+ org.apache.tomcat.util.bcel,\
+ org.apache.tomcat.util.http.fileupload.impl,\
+ org.apache.tomcat.util.http.fileupload.util.mime,\
+ org.apache.tomcat.util.json,\
+ org.apache.tomcat.util.modeler.modules,\
+ org.apache.tomcat.util.net.jsse,\
+ org.apache.tomcat.util.threads.res
+
+-includeresource.notice2: META-INF/NOTICE;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
+-includeresource.license2: {META-INF/LICENSE=../META-INF/servlet-api.jar.license}
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index 19589ea..5ed8792 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -22,4 +22,10 @@ Export-Package: \
javax.el,\
org.apache.el,\
org.apache.el.lang,\
- org.apache.el.parser
\ No newline at end of file
+ org.apache.el.parser
+
+-includepackage: \
+ org.apache.el.stream,\
+ org.apache.el.util
+
+-includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index e7eafe8..070e273 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -32,4 +32,9 @@ Export-Package: \
org.apache.jasper.servlet,\
org.apache.jasper.tagplugins.jstl,\
org.apache.jasper.tagplugins.jstl.core,\
- org.apache.jasper.util
\ No newline at end of file
+ org.apache.jasper.util
+
+-includepackage: \
+ org.apache.jasper.resources
+
+-includeresource.meta-inf: /META-INF/=../META-INF/jasper.jar/
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index 1a8f762..f6470f0 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -22,4 +22,9 @@ Export-Package: \
javax.websocket,\
javax.websocket.server,\
org.apache.tomcat.websocket,\
- org.apache.tomcat.websocket.server
\ No newline at end of file
+ org.apache.tomcat.websocket.server
+
+-includepackage: \
+ org.apache.tomcat.websocket.pojo
+
+-includeresource.meta-inf: /META-INF/=../META-INF/tomcat-websocket.jar/
diff --git a/res/bnd/tomcat-util.jar.tmp.bnd b/res/bnd/tomcat-util.jar.tmp.bnd
index 3c456d8..d1011d9 100644
--- a/res/bnd/tomcat-util.jar.tmp.bnd
+++ b/res/bnd/tomcat-util.jar.tmp.bnd
@@ -26,4 +26,8 @@ Export-Package: \
org.apache.tomcat.util.file,\
org.apache.tomcat.util.res,\
org.apache.tomcat.util.security,\
- org.apache.tomcat.util.threads
\ No newline at end of file
+ org.apache.tomcat.util.threads
+
+-includepackage: \
+ org.apache.tomcat.util.json,\
+ org.apache.tomcat.util.threads.res
\ No newline at end of file
diff --git a/res/bnd/tomcat-websocket.jar.tmp.bnd b/res/bnd/tomcat-websocket.jar.tmp.bnd
index 623c32c..13f1423 100644
--- a/res/bnd/tomcat-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-websocket.jar.tmp.bnd
@@ -19,4 +19,9 @@ Bundle-Name: tomcat-websocket
Bundle-SymbolicName: org.apache.tomcat-websocket
Export-Package: \
org.apache.tomcat.websocket,\
- org.apache.tomcat.websocket.server
\ No newline at end of file
+ org.apache.tomcat.websocket.server
+
+-includepackage: \
+ org.apache.tomcat.websocket.pojo
+
+-includeresource.meta-inf: /META-INF/=../META-INF/tomcat-websocket.jar/
\ No newline at end of file
diff --git a/res/bnd/websocket-api.jar.tmp.bnd b/res/bnd/websocket-api.jar.tmp.bnd
index cad59c2..0596155 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
--include: build-defaults.bnd
+-include: build-defaults.bnd, spec-defaults.bnd
Bundle-Name: tomcat-websocket-api
Bundle-SymbolicName: org.apache.tomcat-websocket-api
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e23e4a1..6ec6c69 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -142,6 +142,11 @@
<bug>64532</bug>: Update to bnd 5.1.1. Pull request provided by Raymond
Augé. (markt)
</fix>
+ <fix>
+ <bug>64540</bug>: Switch from bndwrap task to bnd task, begin generating
+ a better manifest and make sure the resulting jar contents are correct.
+ Pull request provided by Raymond Augé. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org