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 2022/01/26 15:58:22 UTC
[tomcat] 02/08: Reproducible builds. Use the prefiltered files for consistency
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3cf06a09978a8e309693337126bc43dcb18a9581
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 24 12:15:07 2022 +0000
Reproducible builds. Use the prefiltered files for consistency
The prefiltered files have the correct contents and consistent
line endings (LF) across all build platforms
Also removes the need to pre-process these files to perform filtering
---
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 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index d07caa5..753d08f 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;literal="${replace;${cat;../META-INF/default.notice};@YEAR@;${year}}\n"
--includeresource.license: {META-INF/LICENSE=../META-INF/default.license}
+-includeresource.notice: META-INF/NOTICE=../../output/manifests/default.notice
+-includeresource.license: META-INF/LICENSE=../../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 67a2384..1b96a38 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/=../META-INF/jasper-el.jar/
+-includeresource.meta-inf: /META-INF/=../../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 d235799..006c721 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/=../META-INF/jasper.jar/
+-includeresource.meta-inf: /META-INF/=../../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 6877d3f..d925761 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;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
--includeresource.license2: {META-INF/LICENSE=../META-INF/servlet-api.jar.license}
+-includeresource.notice2: META-INF/NOTICE=../../output/manifests/servlet-api.jar.notice
+-includeresource.license2: META-INF/LICENSE=../../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 40e7f17..fa509b8 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;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
--includeresource.license2: {META-INF/LICENSE=../META-INF/servlet-api.jar.license}
+-includeresource.notice2: META-INF/NOTICE=../../output/manifests/servlet-api.jar.notice
+-includeresource.license2: META-INF/LICENSE=../../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 1567ec9..03d75a5 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/=../META-INF/jasper-el.jar/
+-includeresource.meta-inf: /META-INF/=../../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 4ae7954..3987ceb 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/=../META-INF/jasper.jar/
+-includeresource.meta-inf: /META-INF/=../../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 b175946..b87985b 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/=../META-INF/tomcat-websocket.jar/
+-includeresource.meta-inf: /META-INF/=../../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 66dc99b..31c0337 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/=../META-INF/tomcat-websocket.jar/
+-includeresource.meta-inf: /META-INF/=../../output/manifests/tomcat-websocket.jar/
-jpms-module-info: \
${module.name};\
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org