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 2023/02/14 12:05:56 UTC
[tomcat] branch main updated (86a60a13a1 -> ca3b8ce15b)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 86a60a13a1 Implement clarification that setting a value of null removes the header
new 6e5a74c276 Update to Tomcat Native 2.0.3
new a32ebb7d9c Remove references to deleted package o.a.naming.factory.webservices
new ca3b8ce15b Update CheckStyle to 10.7.0
The 3 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.properties.default | 15 ++++++++-------
modules/stuffed/tomcat-resource.json | 1 -
res/bnd/catalina.jar.tmp.bnd | 3 ---
res/bnd/tomcat-embed-core.jar.tmp.bnd | 1 -
.../tomcat-embed-core/native-image/tomcat-resource.json | 1 -
res/spotbugs/filter-false-positives.xml | 7 -------
webapps/docs/changelog.xml | 4 ++++
7 files changed, 12 insertions(+), 20 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Update CheckStyle to 10.7.0
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ca3b8ce15b5c80e79a90d8ab026014a7dd6ccdbd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 14 12:05:25 2023 +0000
Update CheckStyle to 10.7.0
---
build.properties.default | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 3ea02aa671..39619919c1 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -253,10 +253,10 @@ unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# ----- Checkstyle, version 6.16 or later -----
-checkstyle.version=10.6.0
+checkstyle.version=10.7.0
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=424ec002f7246c081df0d24168ba3da20af06d001a1d77afead5a730fe2565bc7db5025ccdefe4d27b4545c4358cb20ac845365162011e63e216aabd6f7adf38
+checkstyle.checksum.value=5527f5fca9870d02f691b4d34459386d203558414bdbfb2a117af698101487b4ab6387174e600745a7d1acf0a0358d78bb219d0fba47e4b7ef9365395b0b41b6
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Update to Tomcat Native 2.0.3
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6e5a74c276b271f3ab0f17ed69d0462c7c517bf5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 14 11:50:56 2023 +0000
Update to Tomcat Native 2.0.3
---
build.properties.default | 11 ++++++-----
webapps/docs/changelog.xml | 4 ++++
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 49ee203385..3ea02aa671 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -139,19 +139,20 @@ jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
-tomcat-native.version=2.0.2
+tomcat-native.version=2.0.3
+tomcat-native-openssl.version=3.0.8
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=a0badfaa537dd8dc24901bbf2a11dbaab7cabe5c033eb9162daa5c748269c3dace08f99c0a477c0d0e051b7d226e2e2c6c3031ab7c45d007333cb53d72738c21
+tomcat-native.src.checksum.value=d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=137771f91ed7bb53da3a4d0c834d22551373066f44282bd2a74e6c1c5040c82d14033f8d74f38eb79ac46486e828d0dc73fc4815404dc3f8fae72db9cd457ff1
+tomcat-native.win.checksum.value=851a944ce21c3e1a21ec0ab252b9512ebd9d6ff45cedf8d62e913458aad8a8c86c67d77aa3b91dfb24b854584f255201f5a494497132cbc91b8893f40814dc89
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-3.0.7-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-3.0.7-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-${tomcat-native-openssl.version}-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-${tomcat-native-openssl.version}-win32-bin.zip
# ----- NSIS, version 3.0 or later -----
nsis.version=3.08
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 621366b7b2..736e0894c4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -238,6 +238,10 @@
<add>
Improvements to Korean translations. (woonsan)
</add>
+ <update>
+ Update the packaged version of the Apache Tomcat Native Library to 2.0.3
+ to pick up the Windows binaries built with with OpenSSL 3.0.8. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Remove references to deleted package o.a.naming.factory.webservices
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a32ebb7d9cb98e9a9e63ac1d4b5e91ba00cde30e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 14 11:54:48 2023 +0000
Remove references to deleted package o.a.naming.factory.webservices
---
modules/stuffed/tomcat-resource.json | 1 -
res/bnd/catalina.jar.tmp.bnd | 3 ---
res/bnd/tomcat-embed-core.jar.tmp.bnd | 1 -
res/graal/tomcat-embed-core/native-image/tomcat-resource.json | 1 -
res/spotbugs/filter-false-positives.xml | 7 -------
5 files changed, 13 deletions(-)
diff --git a/modules/stuffed/tomcat-resource.json b/modules/stuffed/tomcat-resource.json
index 0c41918d60..ff0c539734 100644
--- a/modules/stuffed/tomcat-resource.json
+++ b/modules/stuffed/tomcat-resource.json
@@ -50,7 +50,6 @@
{"name":"org.apache.jasper.resources.LocalStrings"},
{"name":"org.apache.naming.LocalStrings"},
{"name":"org.apache.naming.factory.LocalStrings"},
- {"name":"org.apache.naming.factory.webservices.LocalStrings"},
{"name":"org.apache.tomcat.dbcp.dbcp2.LocalStrings"},
{"name":"org.apache.tomcat.util.LocalStrings"},
{"name":"org.apache.tomcat.util.buf.LocalStrings"},
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 8720b37d7f..7579a233b1 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -46,9 +46,6 @@ Export-Package: \
org.apache.catalina.manager.util,\
org.apache.catalina
--includepackage: \
- org.apache.naming.factory.webservices
-
-jpms-module-info: \
${module.name};\
access=32;\
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 7e83e60f56..2c0f8e7495 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -89,7 +89,6 @@ Export-Package: \
org.apache.tomcat.util.threads
-includepackage: \
- org.apache.naming.factory.webservices,\
org.apache.tomcat.util.bcel,\
org.apache.tomcat.util.http.fileupload.util.mime,\
org.apache.tomcat.util.json,\
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json b/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
index f10d8f2785..ee0f815bcc 100644
--- a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
+++ b/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
@@ -30,7 +30,6 @@
{"name":"org.apache.coyote.http2.LocalStrings"},
{"name":"org.apache.naming.LocalStrings"},
{"name":"org.apache.naming.factory.LocalStrings"},
- {"name":"org.apache.naming.factory.webservices.LocalStrings"},
{"name":"org.apache.tomcat.util.LocalStrings"},
{"name":"org.apache.tomcat.util.buf.LocalStrings"},
{"name":"org.apache.tomcat.util.codec.binary.LocalStrings"},
diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml
index e7334c58c7..ba87039f5f 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -1178,13 +1178,6 @@
</Or>
<Bug pattern="DE_MIGHT_IGNORE" />
</Match>
- <Match>
- <!-- Simpler to catch Exception than to create dummy implementations of the
- necessary exception hierarchy -->
- <Class name="org.apache.naming.factory.webservices.ServiceProxy" />
- <Method name="<init>"/>
- <Bug code="ST" />
- </Match>
<Match>
<!-- Class name needs to start with a lower case letter in this case -->
<Class name="org.apache.naming.java.javaURLContextFactory" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org