Re: [VOTE] Release Apache Tomcat Native 2.0.6

2023-09-29 Thread Mark Thomas

On 28/09/2023 20:14, Christopher Schultz wrote:


1. The resulting binary is libtcnative-2.0.dylib and not
    libtcnative-2.0.6.dylib. Is that expected?


Yes. That is consistent with previous versions I have built locally.


2. Build warnings are mostly deprecation warnings. Given that most of
    the deprecations occurred in OpenSSL 3.0 and libtcnative 2.x requires
    OpenSSL 3.0 or later, should we migrate this source to use the
    replacement functions instead? Or are we trying to keep the code as
    close to 1.x as possible?


For 2.0.x we can/should migrate to the new functions.

For 1.2.x we need to retain compatibility with 1.0.2. If we move to 
1.3.x we only need to retain compatibility with 1.1.1..


Either way, if we want to fix the deprecation in 1.2.x when building 
with 3.0.x onwards, we'll need some "#if OPENSSL_VERSION_NUMBER ..." 
directives



3. Some warnings are "unused variable" and "unused function". If those
    are accurate -- all are "static" and thus file-scoped aka private --
    we should clean them up.


Interesting. I see those warnings on MacOS but not on Linux. Looks like 
configure sets things up slightly differently for Linux and MacOS.


I have removed that unused code in 2.0.6. Thanks for spotting it.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 66875] Handling async error after spring already handled error

2023-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66875

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #3 from Mark Thomas  ---
I have created a test case using the information provided including the
org.jetbrains.kotlinx:kotlinx-coroutines-reactor dependency and am unable to
recreate this issue.

If you still see an issue then I suspect there are additional steps required to
create the reproducible test case that have not been provided. I suggest you
provide a minimal Spring Boot project that demonstrates the issue.

-- 
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] branch main updated: Update Eclipse JDT compiler to 4.29 / 3.35.0

2023-09-29 Thread markt
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 090c0bda06 Update Eclipse JDT compiler to 4.29 / 3.35.0
090c0bda06 is described below

commit 090c0bda06ff0fa016dc06bf565db5c469567b5f
Author: Mark Thomas 
AuthorDate: Fri Sep 29 11:35:25 2023 +0100

Update Eclipse JDT compiler to 4.29 / 3.35.0
---
 build.properties.default| 12 ++--
 res/maven/tomcat-jasper.pom |  2 +-
 webapps/docs/changelog.xml  |  3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 4cf1da6548..742ef846a5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -123,15 +123,15 @@ base-maven.loc=https://repo.maven.apache.org/maven2
 # - Eclipse JDT, version 4.7 or later -#
 # See 
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
 #
-# Checksum is from "SHA512 Checksums for 4.28" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.28-202306050440/
-# 
https://download.eclipse.org/eclipse/downloads/drops4/R-4.28-202306050440/checksum/eclipse-4.28-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.29" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/
+# 
https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/checksum/eclipse-4.29-SUMSSHA512
 #
-jdt.version=4.28
-jdt.release=R-4.28-202306050440
+jdt.version=4.29
+jdt.release=R-4.29-202309031000
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=84a59a52bf7e010a96a38a3ac7a2bc5524b5e3408d90f66c07230cd6c87bc127cd8a2bcfdf66b73c881648bcf1aa4b20d39337f92f84c9767e6816ccedbb35af
+jdt.checksum.value=637595f5cdc8b479c6565d1f53bfacb6c3e7c603ccd17a0a67a2615537ade641553633deaede562a0f2a1ab40f17b66db571025aa8773432186d49647b8fdbe4
 jdt.home=${base.path}/ecj-${jdt.version}
 jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
 # The download will be moved to the archive area eventually. We are taking 
care of that in advance.
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 86cee1f4a3..1c3e444cad 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -60,7 +60,7 @@
 
   org.eclipse.jdt
   ecj
-  3.34.0
+  3.35.0
 
 
   org.apache.tomcat
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 424f2bfb1d..29ef28211e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -183,6 +183,9 @@
 Add the Bundle-License header to the JAR manifest for all
 Tomcat JARs. (markt)
   
+  
+Update to the Eclipse JDT compiler 4.29. (markt)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 66875] Handling async error after spring already handled error

2023-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66875

--- Comment #4 from Nils Kohrs  ---
Here is a minimal project to reproduce it:
https://github.com/nilskohrs/tomcat-bug-66875

-- 
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 67538] Make use of Ant's task to enfore the mininum Java build version

2023-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67538

--- Comment #3 from Christopher Schultz  ---
(In reply to Michael Osipov from comment #2)
> > Compilation is expected to be done with Java 11, but tests can be run with
> > an earlier version, IIRC.
> 
> This seems to be a good point, toolchains missing here.
> Should it go like:
> JAVA_VERSION=11 ant compile
> JAVA_VERSION=8 ant test
> ? Does one use this?

This is what I do for 8.5: build using Java 11 and run all testing using Java
8.

I set JAVA_HOME and run "ant test".

https://github.com/ChristopherSchultz/apache-tomcat-stuff/blob/master/bin/test-tomcat-release.sh

> So Java 11 or bust.

Java 11 is only required for the build. For testing you can:

https://github.com/ChristopherSchultz/apache-tomcat-stuff/blob/master/bin/test-tomcat-release.sh#L269-L279

-- 
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 67538] Make use of Ant's task to enfore the mininum Java build version

2023-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67538

--- Comment #4 from Christopher Schultz  ---
+1 to adding this version check. Anything that causes the build to fail earlier
is a Good Thing if it's gonna fail, anyway.

-- 
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] branch main updated: Perform a simple gpg test at the beginning of the build to ensure that GPG will work later.

2023-09-29 Thread schultz
This is an automated email from the ASF dual-hosted git repository.

schultz 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 5ffb9fb712 Perform a simple gpg test at the beginning of the build to 
ensure that GPG will work later.
5ffb9fb712 is described below

commit 5ffb9fb712691bfb7f79f2d6a5181ff3dec3946a
Author: Christopher Schultz 
AuthorDate: Fri Sep 29 08:39:15 2023 -0400

Perform a simple gpg test at the beginning of the build to ensure that GPG 
will work later.
---
 build.xml | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 41b65ab191..f3d9d845a0 100644
--- a/build.xml
+++ b/build.xml
@@ -2768,7 +2768,7 @@ asf.ldap.username=${release.asfusername}
   
 
   
-  
+  
 
@@ -2780,9 +2780,21 @@ asf.ldap.username=${release.asfusername}
   
 
   
-
-  
-
+gpg.exec.available=${gpg.exec.available}
+gpg.exec=${gpg.exec}
+Enter GPG 
passphrase
+
+  
+
+  
+  
+
+
+  
+
+
+
+
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch main updated: Perform a simple gpg test at the beginning of the build to ensure that GPG will work later.

2023-09-29 Thread Christopher Schultz

All,

On 9/29/23 08:40, schu...@apache.org wrote:

This is an automated email from the ASF dual-hosted git repository.

schultz 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 5ffb9fb712 Perform a simple gpg test at the beginning of the build to 
ensure that GPG will work later.


I added this after being reminded by michael-o that failing a release 
build as early as possible is helpful, especially to RMs.


All this does is sign the build.xml file up-front and then delete the 
signed file, to ensure that signing is going to work.


I modified the gpg-init-2 target to add a newline after the "Enter GPG 
passphrase" prompt.


If there are o=no objections, I will back-port to the other supported 
branches.


-chris


5ffb9fb712 is described below

commit 5ffb9fb712691bfb7f79f2d6a5181ff3dec3946a
Author: Christopher Schultz 
AuthorDate: Fri Sep 29 08:39:15 2023 -0400

 Perform a simple gpg test at the beginning of the build to ensure that GPG 
will work later.
---
  build.xml | 20 
  1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 41b65ab191..f3d9d845a0 100644
--- a/build.xml
+++ b/build.xml
@@ -2768,7 +2768,7 @@ asf.ldap.username=${release.asfusername}

  


-  
+  
  
@@ -2780,9 +2780,21 @@ asf.ldap.username=${release.asfusername}

  


-
-  
-
+gpg.exec.available=${gpg.exec.available}
+gpg.exec=${gpg.exec}
+Enter GPG 
passphrase
+
+  
+
+  
+  
+
+
+  
+
+
+
+

  




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1912606 - in /tomcat/site/trunk: docs/security-jk.html xdocs/security-jk.xml xdocs/stylesheets/tomcat-site.xsl

2023-09-29 Thread jfclere
Author: jfclere
Date: Fri Sep 29 13:35:42 2023
New Revision: 1912606

URL: http://svn.apache.org/viewvc?rev=1912606&view=rev
Log:
Arrange the URL to go to tomcat-connectors.

Modified:
tomcat/site/trunk/docs/security-jk.html
tomcat/site/trunk/xdocs/security-jk.xml
tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl

Modified: tomcat/site/trunk/docs/security-jk.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=1912606&r1=1912605&r2=1912606&view=diff
==
--- tomcat/site/trunk/docs/security-jk.html (original)
+++ tomcat/site/trunk/docs/security-jk.html Fri Sep 29 13:35:42 2023
@@ -30,7 +30,7 @@
by this issue. The ISAPI redirector is not affected.
 
 This was fixed with commit
-   https://github.com/apache/tomcat/commit/0095b6cb84f41313ee4c0364b49c766168790792";>0095b6cb.
+   https://github.com/apache/tomcat-connectors/commit/0095b6cb84f41313ee4c0364b49c766168790792";>0095b6cb.
 
 This issue was reported to the Tomcat Security Team on 7 July 2023. The
issue was made public on 13 September 2023.

Modified: tomcat/site/trunk/xdocs/security-jk.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-jk.xml?rev=1912606&r1=1912605&r2=1912606&view=diff
==
--- tomcat/site/trunk/xdocs/security-jk.xml (original)
+++ tomcat/site/trunk/xdocs/security-jk.xml Fri Sep 29 13:35:42 2023
@@ -43,7 +43,7 @@
by this issue. The ISAPI redirector is not affected.
 
 This was fixed with commit
-   .
+   .
 
 This issue was reported to the Tomcat Security Team on 7 July 2023. The
issue was made public on 13 September 2023.

Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1912606&r1=1912605&r2=1912606&view=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Fri Sep 29 13:35:42 2023
@@ -44,6 +44,7 @@
   https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
   https://svn.apache.org/viewvc?view=rev&rev='"/>
   https://github.com/apache/tomcat/commit/'"/>
+  https://github.com/apache/tomcat-connectors/commit/'"/>
   http://cve.mitre.org/cgi-bin/cvename.cgi?name='"/>
 
   
@@ -360,6 +361,12 @@
   
   
 
+  
+  
+  
+  
+  
+
   
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch main updated: Perform a simple gpg test at the beginning of the build to ensure that GPG will work later.

2023-09-29 Thread Mark Thomas

On 29/09/2023 13:43, Christopher Schultz wrote:

All,

On 9/29/23 08:40, schu...@apache.org wrote:

This is an automated email from the ASF dual-hosted git repository.

schultz 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 5ffb9fb712 Perform a simple gpg test at the beginning of the 
build to ensure that GPG will work later.


I added this after being reminded by michael-o that failing a release 
build as early as possible is helpful, especially to RMs.


All this does is sign the build.xml file up-front and then delete the 
signed file, to ensure that signing is going to work.


I modified the gpg-init-2 target to add a newline after the "Enter GPG 
passphrase" prompt.


If there are o=no objections, I will back-port to the other supported 
branches.


No objections. Just a query as to whether there is any other operation 
that can be used to confirm the passphrase is correct that doesn't have 
any side-effects. Not a big issue, just a nice to have.


Mark



-chris


5ffb9fb712 is described below

commit 5ffb9fb712691bfb7f79f2d6a5181ff3dec3946a
Author: Christopher Schultz 
AuthorDate: Fri Sep 29 08:39:15 2023 -0400

 Perform a simple gpg test at the beginning of the build to ensure 
that GPG will work later.

---
  build.xml | 20 
  1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 41b65ab191..f3d9d845a0 100644
--- a/build.xml
+++ b/build.xml
@@ -2768,7 +2768,7 @@ asf.ldap.username=${release.asfusername}
    
    
-  
+  depends="gpg-init-1,gpg-init-2,gpg-init-3,compile" >

  
@@ -2780,9 +2780,21 @@ asf.ldap.username=${release.asfusername}
    
    
-    addproperty="gpg.passphrase" >

-  
-    
+gpg.exec.available=${gpg.exec.available}
+gpg.exec=${gpg.exec}
+    Enter 
GPG passphrase

+
+  
+
+  
+  
+    
+    
+  
+    
+    property="gpg.success" />

+    
+    
    
    


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.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 UnboundID to 6.0.10

2023-09-29 Thread markt
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 4d4378ad947aa063f1fc6f45bce962b1329d2747
Author: Mark Thomas 
AuthorDate: Fri Sep 29 11:41:54 2023 +0100

Update UnboundID to 6.0.10
---
 build.properties.default   | 4 ++--
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 742ef846a5..d97a73bc8a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -244,10 +244,10 @@ 
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
 
 # - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.9
+unboundid.version=6.0.10
 unboundid.checksum.enabled=true
 unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=38bfe6f69e5b2778ae1a5aae23799b8d8168b11dc571035a7ac96ebbaee1e628f4cae028cd0e4fc227fcf39e4d0e7b60761631f89c392d76460bb93e52a77858
+unboundid.checksum.value=a89df8aaf5d8612465f9be710bd98941f9e738cac6447a3b333a3f9e2fee6ce8120d3673d1cf0604744f4273d19a4fc5e964088109e8e6b6e4852e7528b1
 unboundid.home=${base.path}/unboundid-${unboundid.version}
 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
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 29ef28211e..c14d12806a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -186,6 +186,9 @@
   
 Update to the Eclipse JDT compiler 4.29. (markt)
   
+  
+Update UnboundID to 6.0.9. (markt)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch main updated (5ffb9fb712 -> ec8ef7a3a2)

2023-09-29 Thread markt
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 5ffb9fb712 Perform a simple gpg test at the beginning of the build to 
ensure that GPG will work later.
 new 4d4378ad94 Update UnboundID to 6.0.10
 new ec8ef7a3a2 Update Checkstyle to 10.12.3

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   | 8 
 webapps/docs/changelog.xml | 6 ++
 2 files changed, 10 insertions(+), 4 deletions(-)


-
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.12.3

2023-09-29 Thread markt
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 ec8ef7a3a2fa56afb4db4261ebdc0aba848f23ff
Author: Mark Thomas 
AuthorDate: Fri Sep 29 11:42:37 2023 +0100

Update Checkstyle to 10.12.3
---
 build.properties.default   | 4 ++--
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d97a73bc8a..9222378942 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.12.2
+checkstyle.version=10.12.3
 checkstyle.checksum.enabled=true
 checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=a449f1de0e74935fbc8a1ae3d1425cf1a2d845c9e7e780821c5d8c2a830ae74ea7b4a5d3f5c732b628db7806403e7e4c05e73a423e6b769f1bee5b1e74be9623
+checkstyle.checksum.value=492165913f374b4f5677388c5b4855eaa09af1aac5318dbffd54718804bbeef1700063c5e2b25e60f52031b8a8d495aa3e2306ca51724c82b6cbc1a0fbb83b3e
 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
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c14d12806a..55b6e3d61c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -189,6 +189,9 @@
   
 Update UnboundID to 6.0.9. (markt)
   
+  
+Update Checkstyle to 10.12.3. (markt)
+  
 
   
 


-
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: Update UnboundID to 6.0.10

2023-09-29 Thread markt
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 3c83df4195 Update UnboundID to 6.0.10
3c83df4195 is described below

commit 3c83df41954fad0dd8e6df9b89ce0f82faa18c0d
Author: Mark Thomas 
AuthorDate: Fri Sep 29 11:41:54 2023 +0100

Update UnboundID to 6.0.10
---
 build.properties.default   | 4 ++--
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index b866ee..572c42206f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -265,10 +265,10 @@ 
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
 
 # - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.9
+unboundid.version=6.0.10
 unboundid.checksum.enabled=true
 unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=38bfe6f69e5b2778ae1a5aae23799b8d8168b11dc571035a7ac96ebbaee1e628f4cae028cd0e4fc227fcf39e4d0e7b60761631f89c392d76460bb93e52a77858
+unboundid.checksum.value=a89df8aaf5d8612465f9be710bd98941f9e738cac6447a3b333a3f9e2fee6ce8120d3673d1cf0604744f4273d19a4fc5e964088109e8e6b6e4852e7528b1
 unboundid.home=${base.path}/unboundid-${unboundid.version}
 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
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7ec749186b..04e161d53d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -183,6 +183,9 @@
 Add the Bundle-License header to the JAR manifest for all
 Tomcat JARs. (markt)
   
+  
+Update UnboundID to 6.0.9. (markt)
+  
 
   
 


-
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: Update Checkstyle to 10.12.3

2023-09-29 Thread markt
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 1c10ebfcce Update Checkstyle to 10.12.3
1c10ebfcce is described below

commit 1c10ebfccecb63dd23812afea876e5e8ffc6c453
Author: Mark Thomas 
AuthorDate: Fri Sep 29 11:42:37 2023 +0100

Update Checkstyle to 10.12.3
---
 build.properties.default   | 4 ++--
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 572c42206f..5349eda91b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -274,10 +274,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.12.2
+checkstyle.version=10.12.3
 checkstyle.checksum.enabled=true
 checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=a449f1de0e74935fbc8a1ae3d1425cf1a2d845c9e7e780821c5d8c2a830ae74ea7b4a5d3f5c732b628db7806403e7e4c05e73a423e6b769f1bee5b1e74be9623
+checkstyle.checksum.value=492165913f374b4f5677388c5b4855eaa09af1aac5318dbffd54718804bbeef1700063c5e2b25e60f52031b8a8d495aa3e2306ca51724c82b6cbc1a0fbb83b3e
 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
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 04e161d53d..1efba5a6b4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -186,6 +186,9 @@
   
 Update UnboundID to 6.0.9. (markt)
   
+  
+Update Checkstyle to 10.12.3. (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 (15927d1794 -> 0e7812b883)

2023-09-29 Thread markt
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 15927d1794 Make stats volatile
 new b9df5c6764 Update UnboundID to 6.0.10
 new 0e7812b883 Update Checkstyle to 10.12.3

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   | 8 
 webapps/docs/changelog.xml | 6 ++
 2 files changed, 10 insertions(+), 4 deletions(-)


-
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.12.3

2023-09-29 Thread markt
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 0e7812b88390e2ca989596236b86492dcbb69d18
Author: Mark Thomas 
AuthorDate: Fri Sep 29 11:42:37 2023 +0100

Update Checkstyle to 10.12.3
---
 build.properties.default   | 4 ++--
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d6f4893722..33a0d11427 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.12.2
+checkstyle.version=10.12.3
 checkstyle.checksum.enabled=true
 checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=a449f1de0e74935fbc8a1ae3d1425cf1a2d845c9e7e780821c5d8c2a830ae74ea7b4a5d3f5c732b628db7806403e7e4c05e73a423e6b769f1bee5b1e74be9623
+checkstyle.checksum.value=492165913f374b4f5677388c5b4855eaa09af1aac5318dbffd54718804bbeef1700063c5e2b25e60f52031b8a8d495aa3e2306ca51724c82b6cbc1a0fbb83b3e
 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
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d49b3fc2cf..8a7d86526b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -186,6 +186,9 @@
   
 Update UnboundID to 6.0.9. (markt)
   
+  
+Update Checkstyle to 10.12.3. (markt)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 01/02: Update UnboundID to 6.0.10

2023-09-29 Thread markt
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 b9df5c67642a9a84b48eb43693bd1c48fcf1ca9a
Author: Mark Thomas 
AuthorDate: Fri Sep 29 11:41:54 2023 +0100

Update UnboundID to 6.0.10
---
 build.properties.default   | 4 ++--
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 4422dce4e8..d6f4893722 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -267,10 +267,10 @@ 
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
 
 # - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.9
+unboundid.version=6.0.10
 unboundid.checksum.enabled=true
 unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=38bfe6f69e5b2778ae1a5aae23799b8d8168b11dc571035a7ac96ebbaee1e628f4cae028cd0e4fc227fcf39e4d0e7b60761631f89c392d76460bb93e52a77858
+unboundid.checksum.value=a89df8aaf5d8612465f9be710bd98941f9e738cac6447a3b333a3f9e2fee6ce8120d3673d1cf0604744f4273d19a4fc5e964088109e8e6b6e4852e7528b1
 unboundid.home=${base.path}/unboundid-${unboundid.version}
 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
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 15ec47708c..d49b3fc2cf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -183,6 +183,9 @@
 Add the Bundle-License header to the JAR manifest for all
 Tomcat JARs. (markt)
   
+  
+Update UnboundID to 6.0.9. (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: Update UnboundID to 6.0.10

2023-09-29 Thread markt
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 6642edda1b Update UnboundID to 6.0.10
6642edda1b is described below

commit 6642edda1b9155f3a02ac0c12c0b7bf5563ca983
Author: Mark Thomas 
AuthorDate: Fri Sep 29 11:41:54 2023 +0100

Update UnboundID to 6.0.10
---
 build.properties.default   | 4 ++--
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 4c36a1db79..b04f6db274 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -271,10 +271,10 @@ 
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
 
 # - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.9
+unboundid.version=6.0.10
 unboundid.checksum.enabled=true
 unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=38bfe6f69e5b2778ae1a5aae23799b8d8168b11dc571035a7ac96ebbaee1e628f4cae028cd0e4fc227fcf39e4d0e7b60761631f89c392d76460bb93e52a77858
+unboundid.checksum.value=a89df8aaf5d8612465f9be710bd98941f9e738cac6447a3b333a3f9e2fee6ce8120d3673d1cf0604744f4273d19a4fc5e964088109e8e6b6e4852e7528b1
 unboundid.home=${base.path}/unboundid-${unboundid.version}
 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
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 81196dcee7..5027d895ed 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -175,6 +175,9 @@
 branch requiring additional Commons IO dependencies, Tomcat has 
switched
 to tracking the 1.x branch. (markt)
   
+  
+Update UnboundID to 6.0.9. (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: Update Checkstyle to 10.12.3

2023-09-29 Thread markt
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 4eff00826f Update Checkstyle to 10.12.3
4eff00826f is described below

commit 4eff00826f8a2c7d90fc04bad69bbfd499dce707
Author: Mark Thomas 
AuthorDate: Fri Sep 29 11:42:37 2023 +0100

Update Checkstyle to 10.12.3
---
 build.properties.default   | 4 ++--
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index b04f6db274..8f37429ba0 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.12.2
+checkstyle.version=10.12.3
 checkstyle.checksum.enabled=true
 checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=a449f1de0e74935fbc8a1ae3d1425cf1a2d845c9e7e780821c5d8c2a830ae74ea7b4a5d3f5c732b628db7806403e7e4c05e73a423e6b769f1bee5b1e74be9623
+checkstyle.checksum.value=492165913f374b4f5677388c5b4855eaa09af1aac5318dbffd54718804bbeef1700063c5e2b25e60f52031b8a8d495aa3e2306ca51724c82b6cbc1a0fbb83b3e
 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
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5027d895ed..64cad82b65 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -178,6 +178,9 @@
   
 Update UnboundID to 6.0.9. (markt)
   
+  
+Update Checkstyle to 10.12.3. (markt)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch main updated: Perform a simple gpg test at the beginning of the build to ensure that GPG will work later.

2023-09-29 Thread Christopher Schultz

Mark,

On 9/29/23 10:13, Mark Thomas wrote:

On 29/09/2023 13:43, Christopher Schultz wrote:

All,

On 9/29/23 08:40, schu...@apache.org wrote:

This is an automated email from the ASF dual-hosted git repository.

schultz 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 5ffb9fb712 Perform a simple gpg test at the beginning of 
the build to ensure that GPG will work later.


I added this after being reminded by michael-o that failing a release 
build as early as possible is helpful, especially to RMs.


All this does is sign the build.xml file up-front and then delete the 
signed file, to ensure that signing is going to work.


I modified the gpg-init-2 target to add a newline after the "Enter GPG 
passphrase" prompt.


If there are o=no objections, I will back-port to the other supported 
branches.


No objections. Just a query as to whether there is any other operation 
that can be used to confirm the passphrase is correct that doesn't have 
any side-effects. Not a big issue, just a nice to have.


I couldn't really think of one. I might be able to write a test-sign 
process that dumps the result to a bit-bucket instead of writing the 
file to the disk. Is the production of the file what you are (mindly) 
objecting to? It's being deleted immediately.


-chris


5ffb9fb712 is described below

commit 5ffb9fb712691bfb7f79f2d6a5181ff3dec3946a
Author: Christopher Schultz 
AuthorDate: Fri Sep 29 08:39:15 2023 -0400

 Perform a simple gpg test at the beginning of the build to 
ensure that GPG will work later.

---
  build.xml | 20 
  1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 41b65ab191..f3d9d845a0 100644
--- a/build.xml
+++ b/build.xml
@@ -2768,7 +2768,7 @@ asf.ldap.username=${release.asfusername}
    
    
-  
+  depends="gpg-init-1,gpg-init-2,gpg-init-3,compile" >

  
@@ -2780,9 +2780,21 @@ asf.ldap.username=${release.asfusername}
    
    
-    addproperty="gpg.passphrase" >

-  
-    
+gpg.exec.available=${gpg.exec.available}
+gpg.exec=${gpg.exec}
+    type="secure"/>Enter GPG passphrase

+
+  
+
+  
+  
+    
+    
+  
+    
+    property="gpg.success" />

+    
+    
    
    


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch main updated: Perform a simple gpg test at the beginning of the build to ensure that GPG will work later.

2023-09-29 Thread Mark Thomas

On 29/09/2023 15:32, Christopher Schultz wrote:

On 9/29/23 10:13, Mark Thomas wrote:


No objections. Just a query as to whether there is any other operation 
that can be used to confirm the passphrase is correct that doesn't 
have any side-effects. Not a big issue, just a nice to have.


I couldn't really think of one. I might be able to write a test-sign 
process that dumps the result to a bit-bucket instead of writing the 
file to the disk. Is the production of the file what you are (mindly) 
objecting to? It's being deleted immediately.


It is the creation of the file I'd like to avoid if there is a simple 
way to do that. If there isn't, don't worry about it. Not a big deal.


Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch main updated: Perform a simple gpg test at the beginning of the build to ensure that GPG will work later.

2023-09-29 Thread Christopher Schultz

Mark,

On 9/29/23 10:36, Mark Thomas wrote:

On 29/09/2023 15:32, Christopher Schultz wrote:

On 9/29/23 10:13, Mark Thomas wrote:


No objections. Just a query as to whether there is any other 
operation that can be used to confirm the passphrase is correct that 
doesn't have any side-effects. Not a big issue, just a nice to have.


I couldn't really think of one. I might be able to write a test-sign 
process that dumps the result to a bit-bucket instead of writing the 
file to the disk. Is the production of the file what you are (mindly) 
objecting to? It's being deleted immediately.


It is the creation of the file I'd like to avoid if there is a simple 
way to do that. If there isn't, don't worry about it. Not a big deal.


I think I can do that, at the expense of another target. Or maybe just 
make this target very specific.


-chris

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch main updated: Check GPG viability without actually creating a file.

2023-09-29 Thread schultz
This is an automated email from the ASF dual-hosted git repository.

schultz 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 622a3d0a0b Check GPG viability without actually creating a file.
622a3d0a0b is described below

commit 622a3d0a0b79bfaa5686f810295890c5a53987d0
Author: Christopher Schultz 
AuthorDate: Fri Sep 29 11:07:41 2023 -0400

Check GPG viability without actually creating a file.
---
 build.xml | 22 +++---
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index f3d9d845a0..d1af5a62e2 100644
--- a/build.xml
+++ b/build.xml
@@ -2788,13 +2788,21 @@ asf.ldap.username=${release.asfusername}
 
   
   
-
-
-  
-
-
-
-
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch main updated: Check GPG viability without actually creating a file.

2023-09-29 Thread Mark Thomas

29 Sept 2023 16:08:37 schu...@apache.org:


This is an automated email from the ASF dual-hosted git repository.

schultz 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 622a3d0a0b Check GPG viability without actually creating a 
file.

622a3d0a0b is described below

commit 622a3d0a0b79bfaa5686f810295890c5a53987d0
Author: Christopher Schultz 
AuthorDate: Fri Sep 29 11:07:41 2023 -0400

    Check GPG viability without actually creating a file.


Tx Chris.

Mark



---
build.xml | 22 +++---
1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index f3d9d845a0..d1af5a62e2 100644
--- a/build.xml
+++ b/build.xml
@@ -2788,13 +2788,21 @@ asf.ldap.username=${release.asfusername}

   
   
-    
-    
-  
-    
-    property="gpg.success" />

-    
-    
+    
+  
+  
+  
+  
+  
+  
+  
+  
+  
+    
   

   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch main updated: Check GPG viability without actually creating a file.

2023-09-29 Thread Christopher Schultz

Mark,

On 9/29/23 11:18, Mark Thomas wrote:

29 Sept 2023 16:08:37 schu...@apache.org:


This is an automated email from the ASF dual-hosted git repository.

schultz 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 622a3d0a0b Check GPG viability without actually creating a file.
622a3d0a0b is described below

commit 622a3d0a0b79bfaa5686f810295890c5a53987d0
Author: Christopher Schultz 
AuthorDate: Fri Sep 29 11:07:41 2023 -0400

    Check GPG viability without actually creating a file.


Tx Chris.


Of course. Can you check that it works in your environment(s)?

I only tested this far on MacOS but Linux should work the same and the 
only thing Windows-specific that I was even slightly worried about was 
the "-o -" switch for gpg which outputs to stdout.


Thanks,
-chris


build.xml | 22 +++---
1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index f3d9d845a0..d1af5a62e2 100644
--- a/build.xml
+++ b/build.xml
@@ -2788,13 +2788,21 @@ asf.ldap.username=${release.asfusername}

   
   
-    
-    
-  
-    
-    property="gpg.success" />

-    
-    
+    
+  
+  
+  
+  
+  
+  
+  
+  
+  
+    
   

   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch main updated: Check GPG viability without actually creating a file.

2023-09-29 Thread Mark Thomas

On 29/09/2023 17:29, Christopher Schultz wrote:

Mark,

On 9/29/23 11:18, Mark Thomas wrote:

29 Sept 2023 16:08:37 schu...@apache.org:


This is an automated email from the ASF dual-hosted git repository.

schultz 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 622a3d0a0b Check GPG viability without actually creating a 
file.

622a3d0a0b is described below

commit 622a3d0a0b79bfaa5686f810295890c5a53987d0
Author: Christopher Schultz 
AuthorDate: Fri Sep 29 11:07:41 2023 -0400

    Check GPG viability without actually creating a file.


Tx Chris.


Of course. Can you check that it works in your environment(s)?

I only tested this far on MacOS but Linux should work the same and the 
only thing Windows-specific that I was even slightly worried about was 
the "-o -" switch for gpg which outputs to stdout.


All looks good on Linux and Windows. Tx again.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch main updated: Check GPG viability without actually creating a file.

2023-09-29 Thread Christopher Schultz

Mark,

On 9/29/23 14:15, Mark Thomas wrote:

On 29/09/2023 17:29, Christopher Schultz wrote:

Mark,

On 9/29/23 11:18, Mark Thomas wrote:

29 Sept 2023 16:08:37 schu...@apache.org:


This is an automated email from the ASF dual-hosted git repository.

schultz 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 622a3d0a0b Check GPG viability without actually creating a 
file.

622a3d0a0b is described below

commit 622a3d0a0b79bfaa5686f810295890c5a53987d0
Author: Christopher Schultz 
AuthorDate: Fri Sep 29 11:07:41 2023 -0400

    Check GPG viability without actually creating a file.


Tx Chris.


Of course. Can you check that it works in your environment(s)?

I only tested this far on MacOS but Linux should work the same and the 
only thing Windows-specific that I was even slightly worried about was 
the "-o -" switch for gpg which outputs to stdout.


All looks good on Linux and Windows. Tx again.


No problem.

During this release cycle, give the tools/update-version.sh script a try 
when performing your site-updates. I find that part of the release the 
most tedious :)


You will need perl to be installed on your path.

-chris

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org