Autocommit issue with JDK 1.8, Tomcat 9.0.60, ojdbc8.jar and Oracle DB 19c (19.14.0.0)
Hello everyone, Recently we have done an environment setup upgradation/migration as mentioned below for our application: JDK 1.7 ---> JDK 1.8 Tomcat 7.0.47 ---> Tomcat 9.0.60 (Also using Apache HTTP Server along with Apache Tomcat for new setup) ojdbc7.jar ---> ojdbc8.jar Oracle 12c (12.1.0.2.0) ---> Oracle 19c (19.14.0.0) We have been facing a JDBC autocommit issue since then in this new environment setup: Issue: For the first time AutoCommit is true by default. We update the value of autocommit to false and manually commit the transaction. After that, we also close the connection. Now if we try to create another connection object with "DataSource.getConnection()" within 10 seconds (in debug mode), the previous connection object is getting assigned with autocommit value to false. But, we expect a new connection object to be assigned with autocommit value set to true. During debugging, we found that in the "GenericObjectPool" class, inside the method "borrowObject", the line "p = idleObjects.pollFirst();" assigns (i) if within 10 seconds=> the value of p is the previous connection object; or, (ii) if after 10 seconds=> the value of p is null and thus one new connection object is created for p with autocommit value to true public T borrowObject(final Duration borrowMaxWaitDuration) throws Exception { ... ... ... while (p == null) { create = false; p = idleObjects.pollFirst(); if (p == null) { p = create(); if (p != null) { create = true; } } } . . . } -- Regards, Promit Banik 8013671665
JDK 20 Release Candidate and Deprecation
Welcome to the latest OpenJDK Quality Outreach update! The first Release Candidates of JDK 20 have been released [1] as per the schedule [2]. At this stage, only P1 issues will be evaluated. And with the JDK 20 General Availability sets for March 21st, it is now time to fully focus on JDK 21. I'd like to thank those of you who have already provided feedback on the Early Builds of JDK 21. Feedback is always extremely useful, even more, when it comes early in the development cycle. We are always thinking about the future but the future is not limited to new features (pun intended). Properly removing legacy features from the platform is also critical. Deprecation has always been an important, phased, and ongoing effort. To name just two recent examples, `Thread.stop()` is removed in JDK 20 [3], and the URL Public Constructors are deprecated in JDK 20 (see the related heads-up below). It is important to prepare your codebase for such upcoming evolutions sooner rather than later. To conclude on deprecation, I'll mention my colleague Nicolai who recently did a full video on this exact topic, i.e. "Prepare your Codebase for the Future Now!" [4]. [1] https://mail.openjdk.org/pipermail/jdk-dev/2023-February/007364.html [2] https://openjdk.org/projects/jdk/20/ [3] https://inside.java/2022/11/09/quality-heads-up/ [4] https://inside.java/2023/02/02/newscast-41/ ## Heads-Up - JDK 20 - Deprecate URL Public Constructors The `java.net.URL` class, dating from Java SE 1.0, does not encode or decode any URL components according to the RFC2396 escaping mechanism. It is the responsibility of the caller to encode any fields, which need to be escaped prior to calling URL, and also to decode any escaped fields that are returned from URL. This has led to many usability issues, including some potential vulnerabilities when the calling code did not take this into consideration. In Java SE 1.4, the `java.net.URI` class has been added to mitigate some of the `java.net.URL` shortcomings. It also offers methods to create an URL from an URI. JDK 20 will deprecate all public constructors of `java.net.URL`. This will provide a strong warning and discourage developers from using them. To construct a URL, the `URI::toURL` alternative should instead be preferred. To construct a `file:` based URL, `Path::toURI` should be used prior to `URI::toURL`. For more details, see https://bugs.openjdk.org/browse/JDK-8294241 ## Heads-Up - JDK 20 - JMX Connections Use an ObjectInputFilter by Default The default JMX agent now sets an ObjectInputFilter on the RMI connection to restrict the types that the server will deserialize. This should not affect normal usage of the MBeans in the JDK. Applications which register their own MBeans in the platform MBeanServer may need to extend the serialization filter to support any additional types that their custom MBeans accept as parameters. The default filter already covers any type that OpenMBeans and MXBeans might use. The serialization filter pattern is set in `JDK/conf/management/management.properties` using the property `com.sun.management.jmxremote.serial.filter.pattern`. If additional Java types need to be passed, the default can be overridden by running with `-Dcom.sun.management.jmxremote.serial.filter.pattern=.` Serialization Filtering and the filter pattern format are described in detail in the Core Libraries Guide [5]. [5] https://docs.oracle.com/en/java/javase/19/core/serialization-filtering1.html#GUID-55BABE96-3048-4A9F-A7E6-781790FF3480 ## Heads-Up - Testing Loom: Scoped Values and Structured Concurrency With one JEP in Preview (Virtual Threads - 2nd Preview) and two JEPs incubating (Scoped Values - Incubator & Structured Concurrency - 2nd Incubator) Loom made considerable progress in JDK 20. The Loom team is always eager to hear from developers experimenting with those APIs, especially given that both Scoped Values and Structured Concurrency might become Preview in JDK 21. Feedback should be reported to the loom-dev [6] mailing list. [6] https://mail.openjdk.org/pipermail/loom-dev/ ## JDK 20 Release Candidate builds The Release Candidate builds (builds 36) are available [7] and are provided under the GNU General Public License v2, with the Classpath Exception. The Release Notes are available here [8]. [7] https://jdk.java.net/20/ [8] https://jdk.java.net/20/release-notes ### Changes in recent JDK 20 builds that may be of interest: - JDK-8300623: Lambda deserialization regression involving Enum method reference - JDK-8298400: Virtual thread instability when stack overflows - JDK-8298377: JfrVframeStream causes deadlocks in ZGC ## JDK 21 Early-Access builds The JDK 21 Early-Access (builds 9) are available [9], and are provided under the GNU General Public License v2, with the Classpath Exception. The related Javadocs are available here [10] and the Release Notes here [11]. [9] https://jdk.java.net/21/ [10]
[Bug 66476] org.apache.tomcat.util.net.Acceptor.run Socket accept failed java.io.IOException: Duplicate accept detected.
https://bz.apache.org/bugzilla/show_bug.cgi?id=66476 Omkar changed: What|Removed |Added Resolution|DUPLICATE |--- Ever confirmed|1 |0 Status|RESOLVED|UNCONFIRMED --- Comment #2 from Omkar --- (In reply to Mark Thomas from comment #1) > I suspect this is triggered by local port re-use. Possible scenarios for > that are described in bug 65776. > > I suspect what you really need is an update to Tomcat 9.0.59 or later. > > It might be possible to reduce the frequency via configuration (e.g. disable > HTTP keep-alive) but those changes may cone with performance impacts. > > The users list is the place to discuss possible workarounds if a Tomcat > upgrade is not possible. > > *** This bug has been marked as a duplicate of bug 65776 *** Hi Thomas, Thank you for prompt response. I really appreciate that. But I am still marking the status as "Unconfirmed" because, we have still not been able to find cause of the weird behavior. I mean, we can "assume" reuse of local port,... but why this happens "ONLY" for requests coming from outside network ? Why this does not happen for requests sent from within the internal company network. I mean, i would agree if the behaviour is same across different requests, but here the distinction is clear. The issue occurs "ONLY" for external requests and not internal requests. Why is it so ? What can we do to confirm that local port is re-used ONLY for external requests ? In other words, if i upgrade to Tomcat above 9.0.59 or above and if it still continues the wierd behavior for external requests then ? How can we be sure that upgrade is the only solution ? The bug 65776 you have referred definetly talks about similar issue, but it says nothing about external or internal requests. We need your help to understand this unusual behavior. Let us know what more diagnostics we can perform to find the root cause. Together we can find the cause. One more information i would like to provide you here: - The machine on which the Tomcat is running has local IP and public IP (for external network or world). When requests comes from within the company network it is via local IP and when the request comes from external world, it comes via public IP. Thanks and Regards Omkar Patkar -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-8.5.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/36/builds/390 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 8.5.x] e627164acdd4aaae3056e7acdec694e477bba17a Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 0 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-9.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/452 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 9.0.x] 4ff0e72d4f0bfc8d41f2ddaca2af650723124ec4 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65776] "Duplicate accept detected" error from a subsequent request with the same local port
https://bz.apache.org/bugzilla/show_bug.cgi?id=65776 Mark Thomas changed: What|Removed |Added CC||patkarom...@gmail.com --- Comment #17 from Mark Thomas --- *** Bug 66476 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66476] org.apache.tomcat.util.net.Acceptor.run Socket accept failed java.io.IOException: Duplicate accept detected.
https://bz.apache.org/bugzilla/show_bug.cgi?id=66476 Mark Thomas changed: What|Removed |Added Resolution|--- |DUPLICATE Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- I suspect this is triggered by local port re-use. Possible scenarios for that are described in bug 65776. I suspect what you really need is an update to Tomcat 9.0.59 or later. It might be possible to reduce the frequency via configuration (e.g. disable HTTP keep-alive) but those changes may cone with performance impacts. The users list is the place to discuss possible workarounds if a Tomcat upgrade is not possible. *** This bug has been marked as a duplicate of bug 65776 *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Rename to avoid Ant trying to run it as a test
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit e627164acdd4aaae3056e7acdec694e477bba17a Author: Mark Thomas AuthorDate: Tue Feb 14 18:51:28 2023 + Rename to avoid Ant trying to run it as a test --- .../authenticator/TestJaspicCallbackHandlerInAuthenticator.java | 2 +- .../{TestCallbackHandlerImpl.java => TesterCallbackHandlerImpl.java} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java index 3902aee559..64b293c748 100644 --- a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java +++ b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java @@ -48,7 +48,7 @@ public class TestJaspicCallbackHandlerInAuthenticator { @Test public void testCustomCallbackHandlerCreation() throws Exception { testCallbackHandlerCreation("org.apache.catalina.authenticator.TestCallbackHandlerImpl", -TestCallbackHandlerImpl.class); +TesterCallbackHandlerImpl.class); } diff --git a/test/org/apache/catalina/authenticator/TestCallbackHandlerImpl.java b/test/org/apache/catalina/authenticator/TesterCallbackHandlerImpl.java similarity index 92% rename from test/org/apache/catalina/authenticator/TestCallbackHandlerImpl.java rename to test/org/apache/catalina/authenticator/TesterCallbackHandlerImpl.java index 44eb0598f0..b9893635c7 100644 --- a/test/org/apache/catalina/authenticator/TestCallbackHandlerImpl.java +++ b/test/org/apache/catalina/authenticator/TesterCallbackHandlerImpl.java @@ -22,9 +22,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -public class TestCallbackHandlerImpl implements CallbackHandler { +public class TesterCallbackHandlerImpl implements CallbackHandler { -public TestCallbackHandlerImpl() { +public TesterCallbackHandlerImpl() { // Default constructor required by reflection } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (0c8057da9a -> e627164acd)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 0c8057da9a Update CheckStyle to 10.7.0 new 1110ab4771 Expand CheckStyle to include test code new 4c111f250f Remove redundant modifiers new e627164acd Rename to avoid Ant trying to run it as a test 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.xml | 5 +- java/javax/annotation/Generated.java | 6 +- java/javax/annotation/Resource.java| 16 +- java/javax/annotation/Resources.java | 2 +- java/javax/annotation/security/DeclareRoles.java | 2 +- java/javax/annotation/security/RolesAllowed.java | 2 +- java/javax/annotation/security/RunAs.java | 2 +- java/javax/el/ArrayELResolver.java | 4 +- java/javax/el/BeanELResolver.java | 8 +- java/javax/el/CompositeELResolver.java | 2 +- java/javax/el/ELContextListener.java | 2 +- java/javax/el/ELProcessor.java | 2 +- java/javax/el/ExpressionFactory.java | 6 +- java/javax/el/ListELResolver.java | 2 +- java/javax/el/StandardELContext.java | 4 +- java/javax/el/Util.java| 12 +- .../javax/security/auth/message/MessagePolicy.java | 10 +- .../auth/message/callback/PrivateKeyCallback.java | 2 +- .../auth/message/callback/SecretKeyCallback.java | 2 +- .../auth/message/config/AuthConfigFactory.java | 2 +- java/javax/servlet/AsyncContext.java | 10 +- java/javax/servlet/Filter.java | 6 +- java/javax/servlet/FilterChain.java| 2 +- java/javax/servlet/FilterConfig.java | 8 +- java/javax/servlet/FilterRegistration.java | 10 +- java/javax/servlet/ReadListener.java | 6 +- java/javax/servlet/Registration.java | 16 +- java/javax/servlet/RequestDispatcher.java | 36 +- java/javax/servlet/Servlet.java| 10 +- java/javax/servlet/ServletConfig.java | 8 +- java/javax/servlet/ServletContext.java | 108 +++--- .../servlet/ServletContextAttributeListener.java | 6 +- java/javax/servlet/ServletContextListener.java | 4 +- java/javax/servlet/ServletRegistration.java| 16 +- java/javax/servlet/ServletRequest.java | 74 ++-- .../servlet/ServletRequestAttributeListener.java | 6 +- java/javax/servlet/ServletRequestListener.java | 4 +- java/javax/servlet/ServletResponse.java| 32 +- java/javax/servlet/SessionCookieConfig.java| 28 +- java/javax/servlet/WriteListener.java | 4 +- .../servlet/descriptor/JspConfigDescriptor.java| 4 +- .../descriptor/JspPropertyGroupDescriptor.java | 24 +- .../javax/servlet/descriptor/TaglibDescriptor.java | 4 +- java/javax/servlet/http/HttpServlet.java | 4 +- java/javax/servlet/http/HttpServletRequest.java| 72 ++-- java/javax/servlet/http/HttpServletResponse.java | 124 +++--- java/javax/servlet/http/HttpSession.java | 34 +- .../http/HttpSessionActivationListener.java| 4 +- .../servlet/http/HttpSessionAttributeListener.java | 6 +- .../servlet/http/HttpSessionBindingListener.java | 4 +- java/javax/servlet/http/HttpSessionContext.java| 4 +- java/javax/servlet/http/HttpSessionIdListener.java | 2 +- java/javax/servlet/http/HttpSessionListener.java | 4 +- java/javax/servlet/http/Part.java | 20 +- java/javax/servlet/jsp/HttpJspPage.java| 2 +- java/javax/servlet/jsp/JspApplicationContext.java | 6 +- java/javax/servlet/jsp/JspPage.java| 4 +- java/javax/servlet/jsp/el/FunctionMapper.java | 2 +- .../servlet/jsp/el/ImplicitObjectELResolver.java | 4 +- java/javax/servlet/jsp/el/VariableResolver.java| 2 +- java/javax/servlet/jsp/tagext/BodyTag.java | 4 +- .../servlet/jsp/tagext/DynamicAttributes.java | 2 +- java/javax/servlet/jsp/tagext/IterationTag.java| 3 +- java/javax/servlet/jsp/tagext/JspIdConsumer.java | 2 +- java/javax/servlet/jsp/tagext/SimpleTag.java | 10 +- java/javax/servlet/jsp/tagext/Tag.java | 8 +- java/javax/websocket/ClientEndpoint.java | 2 +- java/javax/websocket/ClientEndpointConfig.java | 6 +- java/javax/websocket/Decoder.java | 4 +- .../websocket/DefaultClientEndpointConfig.java | 2 +- java/javax/websocket/Encoder.java | 4 +-
[tomcat] 01/03: Expand CheckStyle to include test code
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 1110ab4771a4a50746dfdaaf41dad043020ab15e Author: Mark Thomas AuthorDate: Tue Feb 14 17:21:36 2023 + Expand CheckStyle to include test code --- build.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 4788636fc0..5a3a72c822 100644 --- a/build.xml +++ b/build.xml @@ -619,7 +619,10 @@ - + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Rename to avoid Ant trying to run it as a test
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 The following commit(s) were added to refs/heads/9.0.x by this push: new 0a6d57e92e Rename to avoid Ant trying to run it as a test 0a6d57e92e is described below commit 0a6d57e92eb1abf542bf200c13a8c79c20e5f8a1 Author: Mark Thomas AuthorDate: Tue Feb 14 18:51:28 2023 + Rename to avoid Ant trying to run it as a test --- .../authenticator/TestJaspicCallbackHandlerInAuthenticator.java | 2 +- .../{TestCallbackHandlerImpl.java => TesterCallbackHandlerImpl.java} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java index b655aed073..299471bca2 100644 --- a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java +++ b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java @@ -48,7 +48,7 @@ public class TestJaspicCallbackHandlerInAuthenticator { @Test public void testCustomCallbackHandlerCreation() throws Exception { testCallbackHandlerCreation("org.apache.catalina.authenticator.TestCallbackHandlerImpl", -TestCallbackHandlerImpl.class); +TesterCallbackHandlerImpl.class); } diff --git a/test/org/apache/catalina/authenticator/TestCallbackHandlerImpl.java b/test/org/apache/catalina/authenticator/TesterCallbackHandlerImpl.java similarity index 92% rename from test/org/apache/catalina/authenticator/TestCallbackHandlerImpl.java rename to test/org/apache/catalina/authenticator/TesterCallbackHandlerImpl.java index 44eb0598f0..b9893635c7 100644 --- a/test/org/apache/catalina/authenticator/TestCallbackHandlerImpl.java +++ b/test/org/apache/catalina/authenticator/TesterCallbackHandlerImpl.java @@ -22,9 +22,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -public class TestCallbackHandlerImpl implements CallbackHandler { +public class TesterCallbackHandlerImpl implements CallbackHandler { -public TestCallbackHandlerImpl() { +public TesterCallbackHandlerImpl() { // Default constructor required by reflection } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #582: Enabled headless build configuration
markt-asf closed pull request #582: Enabled headless build configuration URL: https://github.com/apache/tomcat/pull/582 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #582: Enabled headless build configuration
markt-asf commented on PR #582: URL: https://github.com/apache/tomcat/pull/582#issuecomment-1430228290 I don't see any benefit to adding these extra settings. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update to Tomcat Native 1.2.36
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit baba3ec8519763bff2d33b39a53bf36f34cebbbe Author: Mark Thomas AuthorDate: Tue Feb 14 12:14:19 2023 + Update to Tomcat Native 1.2.36 --- build.properties.default | 11 ++- webapps/docs/changelog.xml | 5 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build.properties.default b/build.properties.default index 8aea996315..c228570aa7 100644 --- a/build.properties.default +++ b/build.properties.default @@ -166,19 +166,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=1.2.35 +tomcat-native.version=1.2.36 +tomcat-native-openssl.version=1.1.1t tomcat-native.src.checksum.enabled=true tomcat-native.src.checksum.algorithm=SHA-512 -tomcat-native.src.checksum.value=a290eb0cd940e1f8de0caba72517dd4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d +tomcat-native.src.checksum.value=ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094 tomcat-native.win.checksum.enabled=true tomcat-native.win.checksum.algorithm=SHA-512 -tomcat-native.win.checksum.value=03d53bb61bcdf3d67d9cccb7ef4fe09f341cd4900d38b7661bb019260e320c231e07092f8063a2811adcf2eb7b64325cfbfcdf008cb8d7ea73ffc1a00c751de3 +tomcat-native.win.checksum.value=c72ff5d69dadaa75bac07c2fb1bd7c97afc9bc26bb26b7e1c92ae3eec3ec9ad801461a69164424b1e98a7fc5171509d0027586f4519d9090847fc3e0c02b438d 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-1.1.1q-win32-bin.zip -tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1q-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 47e1242485..e1290b3714 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -164,6 +164,11 @@ Improvements to Korean translations. (woonsan) + +Update the packaged version of the Apache Tomcat Native Library to +1.2.36 to pick up the Windows binaries built with with OpenSSL 1.1.1t. +(markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (c27ba30116 -> 0c8057da9a)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from c27ba30116 Code clean-up (reformatting) - no functional change new baba3ec851 Update to Tomcat Native 1.2.36 new 0c8057da9a Update CheckStyle to 10.7.0 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.properties.default | 15 --- webapps/docs/changelog.xml | 5 + 2 files changed, 13 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Rename to avoid Ant trying to run it as a test
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 The following commit(s) were added to refs/heads/main by this push: new c520ffa5c4 Rename to avoid Ant trying to run it as a test c520ffa5c4 is described below commit c520ffa5c4bd11bd436cfba13928b1c4995e0bc9 Author: Mark Thomas AuthorDate: Tue Feb 14 18:51:28 2023 + Rename to avoid Ant trying to run it as a test --- .../authenticator/TestJaspicCallbackHandlerInAuthenticator.java | 2 +- .../{TestCallbackHandlerImpl.java => TesterCallbackHandlerImpl.java} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java index 1f05720769..102cd37be8 100644 --- a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java +++ b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java @@ -49,7 +49,7 @@ public class TestJaspicCallbackHandlerInAuthenticator { @Test public void testCustomCallbackHandlerCreation() throws Exception { testCallbackHandlerCreation("org.apache.catalina.authenticator.TestCallbackHandlerImpl", -TestCallbackHandlerImpl.class); +TesterCallbackHandlerImpl.class); } diff --git a/test/org/apache/catalina/authenticator/TestCallbackHandlerImpl.java b/test/org/apache/catalina/authenticator/TesterCallbackHandlerImpl.java similarity index 92% rename from test/org/apache/catalina/authenticator/TestCallbackHandlerImpl.java rename to test/org/apache/catalina/authenticator/TesterCallbackHandlerImpl.java index 44eb0598f0..b9893635c7 100644 --- a/test/org/apache/catalina/authenticator/TestCallbackHandlerImpl.java +++ b/test/org/apache/catalina/authenticator/TesterCallbackHandlerImpl.java @@ -22,9 +22,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -public class TestCallbackHandlerImpl implements CallbackHandler { +public class TesterCallbackHandlerImpl implements CallbackHandler { -public TestCallbackHandlerImpl() { +public TesterCallbackHandlerImpl() { // Default constructor required by reflection } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Update CheckStyle to 10.7.0
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 0c8057da9a477390b621416fa6256ace74b3d7c7 Author: Mark Thomas AuthorDate: Tue Feb 14 12:05:25 2023 + 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 c228570aa7..2b5a45e4d4 100644 --- a/build.properties.default +++ b/build.properties.default @@ -280,10 +280,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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Rename to avoid Ant trying to run it as a test
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 26a2708557 Rename to avoid Ant trying to run it as a test 26a2708557 is described below commit 26a2708557e736d59dc42cef6513a94189201ca3 Author: Mark Thomas AuthorDate: Tue Feb 14 18:51:28 2023 + Rename to avoid Ant trying to run it as a test --- .../authenticator/TestJaspicCallbackHandlerInAuthenticator.java | 2 +- .../{TestCallbackHandlerImpl.java => TesterCallbackHandlerImpl.java} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java index 1f05720769..102cd37be8 100644 --- a/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java +++ b/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java @@ -49,7 +49,7 @@ public class TestJaspicCallbackHandlerInAuthenticator { @Test public void testCustomCallbackHandlerCreation() throws Exception { testCallbackHandlerCreation("org.apache.catalina.authenticator.TestCallbackHandlerImpl", -TestCallbackHandlerImpl.class); +TesterCallbackHandlerImpl.class); } diff --git a/test/org/apache/catalina/authenticator/TestCallbackHandlerImpl.java b/test/org/apache/catalina/authenticator/TesterCallbackHandlerImpl.java similarity index 92% rename from test/org/apache/catalina/authenticator/TestCallbackHandlerImpl.java rename to test/org/apache/catalina/authenticator/TesterCallbackHandlerImpl.java index 44eb0598f0..b9893635c7 100644 --- a/test/org/apache/catalina/authenticator/TestCallbackHandlerImpl.java +++ b/test/org/apache/catalina/authenticator/TesterCallbackHandlerImpl.java @@ -22,9 +22,9 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -public class TestCallbackHandlerImpl implements CallbackHandler { +public class TesterCallbackHandlerImpl implements CallbackHandler { -public TestCallbackHandlerImpl() { +public TesterCallbackHandlerImpl() { // Default constructor required by reflection } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (e1f3563016 -> 4ff0e72d4f)
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 e1f3563016 Update CheckStyle to 10.7.0 new 8868352a17 Expand CheckStyle to include test code new 4ff0e72d4f Remove redundant modifiers 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 | 5 +- java/javax/annotation/Generated.java | 6 +- java/javax/annotation/Resource.java| 16 +- java/javax/annotation/Resources.java | 2 +- java/javax/annotation/security/DeclareRoles.java | 2 +- java/javax/annotation/security/RolesAllowed.java | 2 +- java/javax/annotation/security/RunAs.java | 2 +- java/javax/el/ArrayELResolver.java | 4 +- java/javax/el/BeanELResolver.java | 8 +- java/javax/el/CompositeELResolver.java | 2 +- java/javax/el/ELContextListener.java | 2 +- java/javax/el/ELProcessor.java | 2 +- java/javax/el/ExpressionFactory.java | 6 +- java/javax/el/ListELResolver.java | 2 +- java/javax/el/StandardELContext.java | 4 +- java/javax/el/Util.java| 12 +- .../javax/security/auth/message/MessagePolicy.java | 10 +- .../auth/message/callback/PrivateKeyCallback.java | 2 +- .../auth/message/callback/SecretKeyCallback.java | 2 +- .../auth/message/config/AuthConfigFactory.java | 2 +- java/javax/servlet/AsyncContext.java | 12 +- java/javax/servlet/Filter.java | 6 +- java/javax/servlet/FilterChain.java| 2 +- java/javax/servlet/FilterConfig.java | 8 +- java/javax/servlet/FilterRegistration.java | 10 +- java/javax/servlet/ReadListener.java | 6 +- java/javax/servlet/Registration.java | 16 +- java/javax/servlet/RequestDispatcher.java | 40 +- java/javax/servlet/Servlet.java| 10 +- java/javax/servlet/ServletConfig.java | 8 +- java/javax/servlet/ServletContext.java | 126 +++--- .../servlet/ServletContextAttributeListener.java | 6 +- java/javax/servlet/ServletContextListener.java | 4 +- java/javax/servlet/ServletRegistration.java| 16 +- java/javax/servlet/ServletRequest.java | 75 ++-- .../servlet/ServletRequestAttributeListener.java | 6 +- java/javax/servlet/ServletRequestListener.java | 4 +- java/javax/servlet/ServletResponse.java| 32 +- java/javax/servlet/SessionCookieConfig.java| 28 +- java/javax/servlet/WriteListener.java | 4 +- .../servlet/descriptor/JspConfigDescriptor.java| 4 +- .../descriptor/JspPropertyGroupDescriptor.java | 24 +- .../javax/servlet/descriptor/TaglibDescriptor.java | 4 +- java/javax/servlet/http/HttpServlet.java | 4 +- java/javax/servlet/http/HttpServletRequest.java| 80 ++-- java/javax/servlet/http/HttpServletResponse.java | 128 +++--- java/javax/servlet/http/HttpSession.java | 39 +- .../http/HttpSessionActivationListener.java| 4 +- .../servlet/http/HttpSessionAttributeListener.java | 6 +- .../servlet/http/HttpSessionBindingListener.java | 4 +- java/javax/servlet/http/HttpSessionContext.java| 6 +- java/javax/servlet/http/HttpSessionIdListener.java | 2 +- java/javax/servlet/http/HttpSessionListener.java | 4 +- java/javax/servlet/http/Part.java | 20 +- java/javax/servlet/jsp/HttpJspPage.java| 2 +- java/javax/servlet/jsp/JspApplicationContext.java | 6 +- java/javax/servlet/jsp/JspPage.java| 4 +- java/javax/servlet/jsp/el/FunctionMapper.java | 2 +- .../servlet/jsp/el/ImplicitObjectELResolver.java | 4 +- java/javax/servlet/jsp/el/VariableResolver.java| 2 +- java/javax/servlet/jsp/tagext/BodyTag.java | 4 +- .../servlet/jsp/tagext/DynamicAttributes.java | 2 +- java/javax/servlet/jsp/tagext/IterationTag.java| 3 +- java/javax/servlet/jsp/tagext/JspIdConsumer.java | 2 +- java/javax/servlet/jsp/tagext/SimpleTag.java | 10 +- java/javax/servlet/jsp/tagext/Tag.java | 8 +- java/javax/transaction/Status.java | 20 +- java/javax/transaction/Synchronization.java| 4 +- java/javax/transaction/Transaction.java| 14 +- java/javax/transaction/TransactionManager.java | 18 +- java/javax/websocket/ClientEndpoint.java | 2 +- java/javax/websocket/ClientEndpointConfig.java | 6 +-
[tomcat] 01/02: Expand CheckStyle to include test code
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 8868352a1726601c6b85a1d4e13e570b468e6fb2 Author: Mark Thomas AuthorDate: Tue Feb 14 17:21:36 2023 + Expand CheckStyle to include test code --- build.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index b8879ab427..899346bf18 100644 --- a/build.xml +++ b/build.xml @@ -859,7 +859,10 @@ - + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Expand CheckStyle to include test code
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit efc083c065817fefd1842aa5e1b1d03a31dfb8cf Author: Mark Thomas AuthorDate: Tue Feb 14 17:21:36 2023 + Expand CheckStyle to include test code --- build.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 8051b42a85..62b838ea18 100644 --- a/build.xml +++ b/build.xml @@ -866,7 +866,10 @@ - + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated (111fb67b0c -> e5519e446b)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 111fb67b0c Update CheckStyle to 10.7.0 new efc083c065 Expand CheckStyle to include test code new e5519e446b Remove redundant modifiers 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 | 5 +- java/jakarta/annotation/Generated.java | 6 +- java/jakarta/annotation/Resource.java | 16 +- java/jakarta/annotation/Resources.java | 2 +- java/jakarta/annotation/security/DeclareRoles.java | 2 +- java/jakarta/annotation/security/RolesAllowed.java | 2 +- java/jakarta/annotation/security/RunAs.java| 2 +- java/jakarta/el/ArrayELResolver.java | 4 +- java/jakarta/el/BeanELResolver.java| 8 +- java/jakarta/el/CompositeELResolver.java | 2 +- java/jakarta/el/ELContextListener.java | 2 +- java/jakarta/el/ELProcessor.java | 2 +- java/jakarta/el/ExpressionFactory.java | 6 +- java/jakarta/el/ListELResolver.java| 2 +- java/jakarta/el/StandardELContext.java | 4 +- java/jakarta/el/Util.java | 12 +- .../security/auth/message/MessagePolicy.java | 10 +- .../auth/message/callback/PrivateKeyCallback.java | 2 +- .../auth/message/callback/SecretKeyCallback.java | 2 +- .../auth/message/config/AuthConfigFactory.java | 2 +- java/jakarta/servlet/AsyncContext.java | 12 +- java/jakarta/servlet/Filter.java | 6 +- java/jakarta/servlet/FilterChain.java | 2 +- java/jakarta/servlet/FilterConfig.java | 8 +- java/jakarta/servlet/FilterRegistration.java | 10 +- java/jakarta/servlet/ReadListener.java | 6 +- java/jakarta/servlet/Registration.java | 16 +- java/jakarta/servlet/RequestDispatcher.java| 40 +- java/jakarta/servlet/Servlet.java | 10 +- java/jakarta/servlet/ServletConfig.java| 8 +- java/jakarta/servlet/ServletContext.java | 114 +++--- .../servlet/ServletContextAttributeListener.java | 6 +- java/jakarta/servlet/ServletContextListener.java | 4 +- java/jakarta/servlet/ServletRegistration.java | 16 +- java/jakarta/servlet/ServletRequest.java | 72 ++-- .../servlet/ServletRequestAttributeListener.java | 6 +- java/jakarta/servlet/ServletRequestListener.java | 4 +- java/jakarta/servlet/ServletResponse.java | 32 +- java/jakarta/servlet/SessionCookieConfig.java | 34 +- java/jakarta/servlet/WriteListener.java| 4 +- .../servlet/descriptor/JspConfigDescriptor.java| 4 +- .../descriptor/JspPropertyGroupDescriptor.java | 26 +- .../servlet/descriptor/TaglibDescriptor.java | 4 +- java/jakarta/servlet/http/HttpServlet.java | 4 +- java/jakarta/servlet/http/HttpServletRequest.java | 78 ++-- java/jakarta/servlet/http/HttpServletResponse.java | 122 +++--- java/jakarta/servlet/http/HttpSession.java | 24 +- .../http/HttpSessionActivationListener.java| 4 +- .../servlet/http/HttpSessionAttributeListener.java | 6 +- .../servlet/http/HttpSessionBindingListener.java | 4 +- .../servlet/http/HttpSessionIdListener.java| 2 +- java/jakarta/servlet/http/HttpSessionListener.java | 4 +- java/jakarta/servlet/http/Part.java| 20 +- java/jakarta/servlet/jsp/HttpJspPage.java | 2 +- .../jakarta/servlet/jsp/JspApplicationContext.java | 6 +- java/jakarta/servlet/jsp/JspPage.java | 4 +- java/jakarta/servlet/jsp/el/FunctionMapper.java| 2 +- .../servlet/jsp/el/ImplicitObjectELResolver.java | 4 +- java/jakarta/servlet/jsp/el/VariableResolver.java | 2 +- java/jakarta/servlet/jsp/tagext/BodyTag.java | 4 +- .../servlet/jsp/tagext/DynamicAttributes.java | 2 +- java/jakarta/servlet/jsp/tagext/IterationTag.java | 3 +- java/jakarta/servlet/jsp/tagext/JspIdConsumer.java | 2 +- java/jakarta/servlet/jsp/tagext/SimpleTag.java | 10 +- java/jakarta/servlet/jsp/tagext/Tag.java | 8 +- java/jakarta/transaction/Status.java | 20 +- java/jakarta/transaction/Synchronization.java | 4 +- java/jakarta/transaction/Transaction.java | 14 +- java/jakarta/transaction/TransactionManager.java | 18 +- java/jakarta/websocket/ClientEndpoint.java | 2 +- java/jakarta/websocket/ClientEndpointConfig.java | 6 +- .../websocket/DefaultClientEndpointConfig.java | 2 +-
Buildbot failure in on tomcat-11.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/190 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch main] 2b6061151eb4c6d353d70b040391341c046305f7 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] ChristopherSchultz commented on pull request #582: Enabled headless build configuration
ChristopherSchultz commented on PR #582: URL: https://github.com/apache/tomcat/pull/582#issuecomment-1430168053 It does not guarantee that no AWT components are used. It only guarantees that anything which requires an actual screen will fail (such as trying to open a Frame, etc.). AWT is still perfectly usable when "headless". In fact, that's the whole point of putting the JVM into "headless" mode: to allow AWT to be used even when there isn't a "head" (screen). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #578: Remove redundant modifiers for interface members
markt-asf closed pull request #578: Remove redundant modifiers for interface members URL: https://github.com/apache/tomcat/pull/578 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #578: Remove redundant modifiers for interface members
markt-asf commented on PR #578: URL: https://github.com/apache/tomcat/pull/578#issuecomment-1430113794 I've applied this change via a combination of IDE tools and manual review as the CheckStyle test for redundant modifiers covers more than just interface methods. I was initially in two minds whether to apply this but as I worked through it, I could see the benefits it offers in making the visibility - particularly of constructors - clearer. Prior to this patch, many were marked as public even though there were effectively package private. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (9def5c49d6 -> 2b6061151e)
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 9def5c49d6 Regenerate with updated jextract new b3b1cd21c8 Remove redundant modifiers new 2b6061151e Expand CheckStyle to include test code 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 | 5 +- java/jakarta/annotation/Generated.java | 6 +- java/jakarta/annotation/Resource.java | 16 +- java/jakarta/annotation/Resources.java | 2 +- java/jakarta/annotation/security/DeclareRoles.java | 2 +- java/jakarta/annotation/security/RolesAllowed.java | 2 +- java/jakarta/annotation/security/RunAs.java| 2 +- java/jakarta/el/ArrayELResolver.java | 4 +- java/jakarta/el/BeanELResolver.java| 8 +- java/jakarta/el/ELContextListener.java | 2 +- java/jakarta/el/ELProcessor.java | 2 +- java/jakarta/el/ExpressionFactory.java | 6 +- java/jakarta/el/ListELResolver.java| 2 +- java/jakarta/el/StandardELContext.java | 4 +- java/jakarta/el/Util.java | 12 +- .../security/auth/message/MessagePolicy.java | 10 +- .../auth/message/callback/PrivateKeyCallback.java | 2 +- .../auth/message/callback/SecretKeyCallback.java | 2 +- .../auth/message/config/AuthConfigFactory.java | 2 +- java/jakarta/servlet/AsyncContext.java | 12 +- java/jakarta/servlet/Filter.java | 6 +- java/jakarta/servlet/FilterChain.java | 2 +- java/jakarta/servlet/FilterConfig.java | 8 +- java/jakarta/servlet/FilterRegistration.java | 10 +- java/jakarta/servlet/ReadListener.java | 6 +- java/jakarta/servlet/Registration.java | 16 +- java/jakarta/servlet/RequestDispatcher.java| 42 +- java/jakarta/servlet/Servlet.java | 10 +- java/jakarta/servlet/ServletConfig.java| 8 +- java/jakarta/servlet/ServletContext.java | 118 +++--- .../servlet/ServletContextAttributeListener.java | 6 +- java/jakarta/servlet/ServletContextListener.java | 4 +- java/jakarta/servlet/ServletRegistration.java | 16 +- java/jakarta/servlet/ServletRequest.java | 74 ++-- .../servlet/ServletRequestAttributeListener.java | 6 +- java/jakarta/servlet/ServletRequestListener.java | 4 +- java/jakarta/servlet/ServletResponse.java | 34 +- java/jakarta/servlet/SessionCookieConfig.java | 34 +- java/jakarta/servlet/WriteListener.java| 4 +- .../servlet/descriptor/JspConfigDescriptor.java| 4 +- .../descriptor/JspPropertyGroupDescriptor.java | 26 +- .../servlet/descriptor/TaglibDescriptor.java | 4 +- java/jakarta/servlet/http/HttpServlet.java | 4 +- java/jakarta/servlet/http/HttpServletRequest.java | 78 ++-- java/jakarta/servlet/http/HttpServletResponse.java | 130 +++ java/jakarta/servlet/http/HttpSession.java | 24 +- .../http/HttpSessionActivationListener.java| 4 +- .../servlet/http/HttpSessionAttributeListener.java | 6 +- .../servlet/http/HttpSessionBindingListener.java | 4 +- .../servlet/http/HttpSessionIdListener.java| 2 +- java/jakarta/servlet/http/HttpSessionListener.java | 4 +- java/jakarta/servlet/http/Part.java| 20 +- java/jakarta/servlet/jsp/HttpJspPage.java | 2 +- .../jakarta/servlet/jsp/JspApplicationContext.java | 6 +- java/jakarta/servlet/jsp/JspPage.java | 4 +- .../servlet/jsp/el/ImplicitObjectELResolver.java | 4 +- java/jakarta/servlet/jsp/tagext/BodyTag.java | 2 +- .../servlet/jsp/tagext/DynamicAttributes.java | 2 +- java/jakarta/servlet/jsp/tagext/IterationTag.java | 2 +- java/jakarta/servlet/jsp/tagext/JspIdConsumer.java | 2 +- java/jakarta/servlet/jsp/tagext/SimpleTag.java | 10 +- java/jakarta/servlet/jsp/tagext/Tag.java | 8 +- java/jakarta/transaction/Status.java | 20 +- java/jakarta/transaction/Synchronization.java | 4 +- java/jakarta/transaction/Transaction.java | 14 +- java/jakarta/transaction/TransactionManager.java | 18 +- java/jakarta/websocket/ClientEndpoint.java | 2 +- java/jakarta/websocket/ClientEndpointConfig.java | 6 +- .../websocket/DefaultClientEndpointConfig.java | 2 +- java/jakarta/websocket/HandshakeResponse.java | 2 +- .../server/DefaultServerEndpointConfig.java| 6 +- .../jakarta/websocket/server/HandshakeRequest.java | 8 +-
[tomcat] 02/02: Expand CheckStyle to include test code
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 2b6061151eb4c6d353d70b040391341c046305f7 Author: Mark Thomas AuthorDate: Tue Feb 14 17:21:36 2023 + Expand CheckStyle to include test code --- build.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index fb67c70d7c..1f750eb6ac 100644 --- a/build.xml +++ b/build.xml @@ -861,7 +861,10 @@ - + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] tbw777 commented on pull request #582: Enabled headless build configuration
tbw777 commented on PR #582: URL: https://github.com/apache/tomcat/pull/582#issuecomment-1429800793 Also this is guarantee that no awt components used -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Regenerate with updated jextract
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 9def5c49d6 Regenerate with updated jextract 9def5c49d6 is described below commit 9def5c49d679e75c280c20b23af693b2748833e1 Author: remm AuthorDate: Tue Feb 14 15:03:49 2023 +0100 Regenerate with updated jextract Double check that there are no hidden changes. --- .../apache/tomcat/util/openssl/Constants$root.java | 2 +- .../apache/tomcat/util/openssl/RuntimeHelper.java | 10 --- ...va => SSL_CTX_set_cert_verify_callback$cb.java} | 32 ++ ...ot.java => SSL_CTX_set_tmp_dh_callback$dh.java} | 32 ++ ...nts$root.java => SSL_set_info_callback$cb.java} | 32 ++ .../apache/tomcat/util/openssl/constants$29.java | 2 +- .../org/apache/tomcat/util/openssl/openssl_h.java | 2 +- 7 files changed, 69 insertions(+), 43 deletions(-) diff --git a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/Constants$root.java b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/Constants$root.java index 5e154ba8b3..c4e5e9f4c2 100644 --- a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/Constants$root.java +++ b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/Constants$root.java @@ -36,7 +36,7 @@ final class Constants$root { static final OfLong C_LONG_LONG$LAYOUT = JAVA_LONG; static final OfFloat C_FLOAT$LAYOUT = JAVA_FLOAT; static final OfDouble C_DOUBLE$LAYOUT = JAVA_DOUBLE; -static final OfAddress C_POINTER$LAYOUT = ADDRESS.withBitAlignment(64); +static final OfAddress C_POINTER$LAYOUT = ADDRESS.withBitAlignment(64).withTargetLayout(MemoryLayout.sequenceLayout(Constants$root.C_CHAR$LAYOUT)); } diff --git a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/RuntimeHelper.java b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/RuntimeHelper.java index 2d67ac9dfa..8196a9a3dd 100644 --- a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/RuntimeHelper.java +++ b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/RuntimeHelper.java @@ -19,12 +19,12 @@ package org.apache.tomcat.util.openssl; // Generated by jextract import java.lang.foreign.Linker; -import java.lang.foreign.Arena; import java.lang.foreign.FunctionDescriptor; import java.lang.foreign.GroupLayout; import java.lang.foreign.SymbolLookup; import java.lang.foreign.MemoryLayout; import java.lang.foreign.MemorySegment; +import java.lang.foreign.Arena; import java.lang.foreign.SegmentAllocator; import java.lang.foreign.ValueLayout; import java.lang.invoke.MethodHandle; @@ -67,9 +67,11 @@ final class RuntimeHelper { return obj; } -/*static MemorySegment lookupGlobalVariable(String name, MemoryLayout layout) { -return SYMBOL_LOOKUP.find(name).map(symbol -> MemorySegment.ofAddress(symbol.address(), layout.byteSize(), symbol.scope())).orElse(null); -}*/ +static MemorySegment lookupGlobalVariable(String name, MemoryLayout layout) { +return SYMBOL_LOOKUP.find(name) +.map(s -> s.asUnbounded().asSlice(0, layout)) +.orElse(null); +} static MethodHandle downcallHandle(String name, FunctionDescriptor fdesc) { return SYMBOL_LOOKUP.find(name). diff --git a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/Constants$root.java b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_CTX_set_cert_verify_callback$cb.java similarity index 50% copy from modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/Constants$root.java copy to modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_CTX_set_cert_verify_callback$cb.java index 5e154ba8b3..45b39d6a77 100644 --- a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/Constants$root.java +++ b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_CTX_set_cert_verify_callback$cb.java @@ -24,19 +24,27 @@ import java.lang.invoke.VarHandle; import java.nio.ByteOrder; import java.lang.foreign.*; import static java.lang.foreign.ValueLayout.*; -final class Constants$root { +/** + * {@snippet : + * int (*SSL_CTX_set_cert_verify_callback$cb)(X509_STORE_CTX*,void*); + * } + */ +public interface SSL_CTX_set_cert_verify_callback$cb { -// Suppresses default constructor, ensuring non-instantiability. -private Constants$root() {} -static final OfBoolean C_BOOL$LAYOUT = JAVA_BOOLEAN; -static final OfByte C_CHAR$LAYOUT = JAVA_BYTE; -static final OfShort C_SHORT$LAYOUT = JAVA_SHORT; -static final OfInt C_INT$LAYOUT = JAVA_INT; -static final OfLong C_LONG$LAYOUT = JAVA_LONG; -static final
[GitHub] [tomcat] ChristopherSchultz commented on pull request #582: Enabled headless build configuration
ChristopherSchultz commented on PR #582: URL: https://github.com/apache/tomcat/pull/582#issuecomment-1429782733 If no code requests anything AWT-related, then the headless config of the JVM makes no difference. I see no improvement here at all, just added lines to an already complex build script. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-10.1.x
Build status: BUILD FAILED: Snapshot deployed to ASF Maven snapshot repository (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/663 Blamelist: Mark Thomas Build Text: Snapshot deployed to ASF Maven snapshot repository (failure) Status Detected: new failure Build Source Stamp: [branch 10.1.x] 111fb67b0ccefe5c713c5e3b2da00d56b0978834 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 2 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] tbw777 commented on pull request #582: Enabled headless build configuration
tbw777 commented on PR #582: URL: https://github.com/apache/tomcat/pull/582#issuecomment-1429719724 no problem, just selecting less jvm api to work -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #582: Enabled headless build configuration
markt-asf commented on PR #582: URL: https://github.com/apache/tomcat/pull/582#issuecomment-1429706205 What problem is this PR trying to solve? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on a diff in pull request #583: Replaced old time API
markt-asf commented on code in PR #583: URL: https://github.com/apache/tomcat/pull/583#discussion_r110573 ## java/org/apache/catalina/filters/RequestDumperFilter.java: ## @@ -56,12 +59,13 @@ public class RequestDumperFilter extends GenericFilter { private static final String NON_HTTP_REQ_MSG = "Not available. Non-http request."; private static final String NON_HTTP_RES_MSG = "Not available. Non-http response."; -private static final ThreadLocal timestamp = ThreadLocal.withInitial(Timestamp::new); - // Log must be non-static as loggers are created per class-loader and this // Filter may be used in multiple class loaders private transient Log log = LogFactory.getLog(RequestDumperFilter.class); +private static final ZoneId ZONE_ID = ZoneId.systemDefault(); +private static final DateTimeFormatter DF_DATETIME = DateTimeFormatter.ofPattern("dd-MM- HH:mm:ss"); +private static final AtomicLong ATOMIC_LONG = new AtomicLong(); Review Comment: Need better names - at least for the AtomicLong ## java/org/apache/catalina/filters/RequestDumperFilter.java: ## @@ -239,17 +243,11 @@ private void doLog(String attribute, String value) { } private String getTimestamp() { -Timestamp ts = timestamp.get(); long currentTime = System.currentTimeMillis(); - -if ((ts.date.getTime() + 999) < currentTime) { -ts.date.setTime(currentTime - (currentTime % 1000)); -ts.update(); -} -return ts.dateString; +long res = ATOMIC_LONG.updateAndGet(it -> it + 999 < currentTime ? currentTime - (currentTime % 1000) : it); Review Comment: This appears to create a source of contention across threads - exactly what the current code is designed to avoid. ## java/org/apache/catalina/manager/JspHelper.java: ## @@ -72,14 +74,19 @@ public static String guessDisplayUserFromSession(Session in_session) { return escapeXml(user); } +private static String getDateTimeStr(long value) { +Instant instant = Instant.ofEpochMilli(value); +LocalDateTime ldt = LocalDateTime.ofInstant(instant, ZONE_ID); +return DATE_TIME_FORMAT.format(ldt); +} Review Comment: It is different. But why is it better? ## java/org/apache/catalina/util/Strftime.java: ## @@ -113,36 +113,52 @@ public class Strftime { */ public Strftime( String origFormat, Locale locale ) { String convertedFormat = convertDateFormat( origFormat ); -simpleDateFormat = new SimpleDateFormat( convertedFormat, locale ); +dtf = DateTimeFormatter.ofPattern(convertedFormat).withLocale(locale); } /** * Format the date according to the strftime-style string given in the constructor. * - * @param date the date to format + * @param instant the date to format * @return the formatted date */ -public String format( Date date ) { -return simpleDateFormat.format( date ); +public String format(Instant instant) { Review Comment: Changes to public APIs need more work. Generally, the old API is deprecated in the latest stable release (and possible older releases) and the new API is added to at least the current development release. The new API may be back-ported to older releases where it makes sense to do so. ## java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfo.java: ## @@ -30,7 +33,7 @@ */ public class DefaultPooledObjectInfo implements DefaultPooledObjectInfoMBean { -private static final String PATTERN = "-MM-dd HH:mm:ss Z"; +private static final DateTimeFormatter DTF = DateTimeFormatter.ofPattern("-MM-dd HH:mm:ss Z"); private final PooledObject pooledObject; Review Comment: This code is forked from Commons Pool. Changes need to be made there. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #586: Fixed closing serverSocket in doCloseServerSocket()
markt-asf closed pull request #586: Fixed closing serverSocket in doCloseServerSocket() URL: https://github.com/apache/tomcat/pull/586 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #586: Fixed closing serverSocket in doCloseServerSocket()
markt-asf commented on PR #586: URL: https://github.com/apache/tomcat/pull/586#issuecomment-1429675397 Thanks for the report. Fixed slightly differently (effectively the same code) to align with the existing NIO2 code. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix logic
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 The following commit(s) were added to refs/heads/main by this push: new b70f10d89d Fix logic b70f10d89d is described below commit b70f10d89da0459227c1426712e5d57313173f84 Author: Mark Thomas AuthorDate: Tue Feb 14 12:30:31 2023 + Fix logic --- .../loom/src/main/java/org/apache/tomcat/util/net/BioLoomEndpoint.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/loom/src/main/java/org/apache/tomcat/util/net/BioLoomEndpoint.java b/modules/loom/src/main/java/org/apache/tomcat/util/net/BioLoomEndpoint.java index 3047253a4c..57b5b515c0 100644 --- a/modules/loom/src/main/java/org/apache/tomcat/util/net/BioLoomEndpoint.java +++ b/modules/loom/src/main/java/org/apache/tomcat/util/net/BioLoomEndpoint.java @@ -133,8 +133,6 @@ public class BioLoomEndpoint extends AbstractEndpoint { @Override protected void doCloseServerSocket() throws IOException { -ServerSocket serverSocket = this.serverSocket; - if (serverSocket != null) { serverSocket.close(); serverSocket = null; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Update CheckStyle to 10.7.0
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 e1f3563016d355d64d976c128f948340a222ce03 Author: Mark Thomas AuthorDate: Tue Feb 14 12:05:25 2023 + 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 cea53dd3ab..b8b995ad04 100644 --- a/build.properties.default +++ b/build.properties.default @@ -276,10 +276,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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update to Tomcat Native 1.2.36
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 fc9437f2521b30e92079ab6e9c14ebe69b754833 Author: Mark Thomas AuthorDate: Tue Feb 14 12:14:19 2023 + Update to Tomcat Native 1.2.36 --- build.properties.default | 11 ++- webapps/docs/changelog.xml | 5 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build.properties.default b/build.properties.default index 7b2eb13bfc..cea53dd3ab 100644 --- a/build.properties.default +++ b/build.properties.default @@ -162,19 +162,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=1.2.35 +tomcat-native.version=1.2.36 +tomcat-native-openssl.version=1.1.1t tomcat-native.src.checksum.enabled=true tomcat-native.src.checksum.algorithm=SHA-512 -tomcat-native.src.checksum.value=a290eb0cd940e1f8de0caba72517dd4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d +tomcat-native.src.checksum.value=ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094 tomcat-native.win.checksum.enabled=true tomcat-native.win.checksum.algorithm=SHA-512 -tomcat-native.win.checksum.value=03d53bb61bcdf3d67d9cccb7ef4fe09f341cd4900d38b7661bb019260e320c231e07092f8063a2811adcf2eb7b64325cfbfcdf008cb8d7ea73ffc1a00c751de3 +tomcat-native.win.checksum.value=c72ff5d69dadaa75bac07c2fb1bd7c97afc9bc26bb26b7e1c92ae3eec3ec9ad801461a69164424b1e98a7fc5171509d0027586f4519d9090847fc3e0c02b438d 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-1.1.1q-win32-bin.zip -tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1q-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 586d73b783..9a76577247 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -172,6 +172,11 @@ Improvements to Korean translations. (woonsan) + +Update the packaged version of the Apache Tomcat Native Library to +1.2.36 to pick up the Windows binaries built with with OpenSSL 1.1.1t. +(markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (9055a8771a -> e1f3563016)
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 9055a8771a Code clean-up (reformatting) - no functional change new fc9437f252 Update to Tomcat Native 1.2.36 new e1f3563016 Update CheckStyle to 10.7.0 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.properties.default | 15 --- webapps/docs/changelog.xml | 5 + 2 files changed, 13 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated (0f9b2b39bf -> 111fb67b0c)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 0f9b2b39bf Code clean-up (reformatting) - no functional change new 6dcaa057ee Update to Tomcat Native 2.0.3 new 111fb67b0c Update CheckStyle to 10.7.0 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.properties.default | 15 --- webapps/docs/changelog.xml | 4 2 files changed, 12 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update to Tomcat Native 2.0.3
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 6dcaa057ee441039370d12811e08e238933e17bb Author: Mark Thomas AuthorDate: Tue Feb 14 11:50:56 2023 + 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 45b6bba1bd..c14a48faf2 100644 --- a/build.properties.default +++ b/build.properties.default @@ -157,19 +157,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 51fa7c7c07..313b752379 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -185,6 +185,10 @@ Improvements to Korean translations. (woonsan) + +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) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Update CheckStyle to 10.7.0
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 111fb67b0ccefe5c713c5e3b2da00d56b0978834 Author: Mark Thomas AuthorDate: Tue Feb 14 12:05:25 2023 + 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 c14a48faf2..0ad36ea55e 100644 --- a/build.properties.default +++ b/build.properties.default @@ -271,10 +271,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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Remove references to deleted package o.a.naming.factory.webservices
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 AuthorDate: Tue Feb 14 11:54:48 2023 + 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 @@ - - - - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Update to Tomcat Native 2.0.3
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 AuthorDate: Tue Feb 14 11:50:56 2023 + 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 @@ Improvements to Korean translations. (woonsan) + +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) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Update CheckStyle to 10.7.0
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 AuthorDate: Tue Feb 14 12:05:25 2023 + 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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE, slightly-off-topic] Release Apache Tomcat Native 2.0.3
ofc: [vmouriki@localhost native]$ /usr/bin/openssl version OpenSSL 3.0.1 14 Dec 2021 (Library: OpenSSL 3.0.1 14 Dec 2021) [vmouriki@localhost native]$ ./configure --with-apr=/usr/bin/apr-2-config --with-ssl=/usr/bin --with-java-home=/usr/lib/jvm/java-17-openjdk-17.0.6.0.10-3.el9_1.x86_64 checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking target system type... x86_64-pc-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c ./configure: line 2319: LT_INIT: command not found checking for working mkdir -p... yes Tomcat Native Version: 2.0.3 checking for chosen layout... tcnative checking for APR... yes configure: APR 2.0.0 detected. setting CC to "gcc" setting CPP to "gcc -E" checking JAVA_HOME... /usr/lib/jvm/java-17-openjdk-17.0.6.0.10-3.el9_1.x86_64 adding "-I/usr/lib/jvm/java-17-openjdk-17.0.6.0.10-3.el9_1.x86_64/include" to TCNATIVE_PRIV_INCLUDES checking for JDK os include directory... linux adding "-I/usr/lib/jvm/java-17-openjdk-17.0.6.0.10-3.el9_1.x86_64/include/linux" to TCNATIVE_PRIV_INCLUDES checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking for OpenSSL library... /usr/bin using openssl from /usr/bin/lib and /usr/bin/include checking OpenSSL library version >= 3.0.0... configure: error: Your version of OpenSSL is not compatible with this version of tcnative [vmouriki@localhost native]$ openssl version OpenSSL 3.0.1 14 Dec 2021 (Library: OpenSSL 3.0.1 14 Dec 2021) [vmouriki@localhost native]$ On Mon, Feb 13, 2023 at 11:00 PM Christopher Schultz < ch...@christopherschultz.net> wrote: > Vasileios, > > On 2/13/23 11:17, Vasileios Mourikis wrote: > > [X] Stable, go ahead and release > > > > Note: build was successful with openssl 3.0.8 but not with 3.0.1 > > Can you post the details of the build failure(s)? Environment, error > messages, etc.? > > -chris > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[tomcat] branch main updated: Implement clarification that setting a value of null removes the header
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 The following commit(s) were added to refs/heads/main by this push: new 86a60a13a1 Implement clarification that setting a value of null removes the header 86a60a13a1 is described below commit 86a60a13a1c18a1f1c494f6e5e418c59c0dd94cf Author: Mark Thomas AuthorDate: Tue Feb 14 09:59:08 2023 + Implement clarification that setting a value of null removes the header --- java/org/apache/catalina/connector/Response.java | 2 +- java/org/apache/coyote/Response.java | 10 +- webapps/docs/changelog.xml | 6 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java index 6c47a21f40..e44076ed5b 100644 --- a/java/org/apache/catalina/connector/Response.java +++ b/java/org/apache/catalina/connector/Response.java @@ -1363,7 +1363,7 @@ public class Response implements HttpServletResponse { @Override public void setHeader(String name, String value) { -if (name == null || name.length() == 0 || value == null) { +if (name == null || name.length() == 0) { return; } diff --git a/java/org/apache/coyote/Response.java b/java/org/apache/coyote/Response.java index 1673e9c3b9..0a0cfb16ca 100644 --- a/java/org/apache/coyote/Response.java +++ b/java/org/apache/coyote/Response.java @@ -366,7 +366,11 @@ public final class Response { return; } } -headers.setValue(name).setString(value); +if (value == null) { +headers.removeHeader(name); +} else { +headers.setValue(name).setString(value); +} } @@ -419,6 +423,10 @@ public final class Response { } if (name.equalsIgnoreCase("Content-Length")) { try { +if (value == null) { +setContentLength(-1); +return true; +} long cL = Long.parseLong(value); setContentLength(cL); return true; diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 843885e5b5..621366b7b2 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -180,6 +180,12 @@ HttpServletResponse defined by the Jakarta Servlet project for the Servlet 6.1 API. (markt) + +Implement the clarification from the Jakarta Servlet project that +calling one of the HttpServletResponse methods for setting +HTTP header values with null as the new header value +removes any existing header of that name. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org