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:17 UTC
[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.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 74e5876eeee7a7b1798dd43b519f7d576fda2803
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 | 4 ++--
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, 120 insertions(+), 26 deletions(-)
diff --git a/build.xml b/build.xml
index 05ebace..2482dcd 100644
--- a/build.xml
+++ b/build.xml
@@ -3375,9 +3375,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 7c13124..b2ed4d3 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -13,11 +13,11 @@
# 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
Export-Package: \
jakarta.annotation,\
jakarta.annotation.security,\
- jakarta.annotation.sql
+ jakarta.annotation.sql
\ No newline at end of file
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 18cc1bc..cfb2da3 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 49c424b..d82d334 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 7442089..882107e 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 94ddded..7e50fd7 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 18cc1bc..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: jakarta.el
\ No newline at end of file
+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 d7b920a..6b8efaf 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 f0bc49b..58fee31 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: \
jakarta.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 53d1d52..0d6cadc 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 c7d0092..efe68b7 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: \
jakarta.websocket,\
jakarta.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 c433385..8e1fcb5 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 05dcd7d..ed6ee45 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -160,6 +160,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