[tomcat] branch main updated: Update BND to 6.2.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
The following commit(s) were added to refs/heads/main by this push:
new 755d46d Update BND to 6.2.0
755d46d is described below
commit 755d46db634d36c0058901aabe9a56abad19396c
Author: Mark Thomas
AuthorDate: Wed Mar 16 10:49:21 2022 +
Update BND to 6.2.0
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 030fdb2..fa0eff2 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -292,12 +292,12 @@
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/
# - bnd, version 6.0.0 or later -
# - provides OSGI metadata for JARs -
-bnd.version=6.1.0
+bnd.version=6.2.0
-# checksums for biz.aQute.bnd-6.1.0.jar
+# checksums for biz.aQute.bnd-6.2.0.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=3f4bcd3e67f31a563d49370364b62915|d54eba8fb11eb43bb40eac7e3cb92e906b9fa567
+bnd.checksum.value=4ebce64639ebe72f5b665faebd8dea30|28eaa28c9b5382687e0b83cc69aa540de1f6f56e
bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 88d940f..81d96bd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -146,6 +146,9 @@
Expand the spotbugs Ant task to also cover test code.
(markt)
+
+Update to bnd 6.2.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Update BND to 6.2.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new aa7ded4 Update BND to 6.2.0
aa7ded4 is described below
commit aa7ded480ac526f6f68686a2540aef70f17ae17d
Author: Mark Thomas
AuthorDate: Wed Mar 16 10:49:21 2022 +
Update BND to 6.2.0
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index d25e72b..626fb6f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -297,12 +297,12 @@
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/
# - bnd, version 6.0.0 or later -
# - provides OSGI metadata for JARs -
-bnd.version=6.1.0
+bnd.version=6.2.0
-# checksums for biz.aQute.bnd-6.1.0.jar
+# checksums for biz.aQute.bnd-6.2.0.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=3f4bcd3e67f31a563d49370364b62915|d54eba8fb11eb43bb40eac7e3cb92e906b9fa567
+bnd.checksum.value=4ebce64639ebe72f5b665faebd8dea30|28eaa28c9b5382687e0b83cc69aa540de1f6f56e
bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4463d53..259010e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -146,6 +146,9 @@
Expand the spotbugs Ant task to also cover test code.
(markt)
+
+Update to bnd 6.2.0. (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: Update BND to 6.2.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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7ba714b Update BND to 6.2.0
7ba714b is described below
commit 7ba714b9a35bb4c3b65a9bc6c60133b35aec90d1
Author: Mark Thomas
AuthorDate: Wed Mar 16 10:49:21 2022 +
Update BND to 6.2.0
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index dbeb93c..35ddd11 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -297,12 +297,12 @@
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/
# - bnd, version 6.0.0 or later -
# - provides OSGI metadata for JARs -
-bnd.version=6.1.0
+bnd.version=6.2.0
-# checksums for biz.aQute.bnd-6.1.0.jar
+# checksums for biz.aQute.bnd-6.2.0.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=3f4bcd3e67f31a563d49370364b62915|d54eba8fb11eb43bb40eac7e3cb92e906b9fa567
+bnd.checksum.value=4ebce64639ebe72f5b665faebd8dea30|28eaa28c9b5382687e0b83cc69aa540de1f6f56e
bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ea5fc14..511e378 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,9 @@
Expand the spotbugs Ant task to also cover test code.
(markt)
+
+Update to bnd 6.2.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] sim-lus opened a new pull request #482: replace deprecated getSubjectDN()
sim-lus opened a new pull request #482: URL: https://github.com/apache/tomcat/pull/482 According to java spec, getSubjectDN() should not be used: "denigrated, replaced by getSubjectX500Principal(). This method returns the subject as an implementation specific Principal object, which should not be relied upon by portable code." Not sure if my proposed change is correct, at least it is probably not compatible for all use cases. -- 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
Re: [VOTE] Release Apache Tomcat 8.5.77
вс, 13 мар. 2022 г. в 22:41, Christopher Schultz : > > The proposed Apache Tomcat 8.5.77 release is now available for voting. > > The notable changes compared to 8.5.76 are: > [...] > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.77/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1363 > The tag is: > https://github.com/apache/tomcat/tree/8.5.77 > 3931695e564dd4dd1dbf029026e900b74992408c > > The proposed 8.5.77 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 8.5.76 (stable) [x] Stable - go ahead and release as 8.5.77 (stable) Tested on Windows 10. Smoke tests OK (installer, Java 7, examples). Unit tests OK (Java 11), OK with well-known caveats (Java 7, 8, 17) . Unit tests with Java 17: OK as is, but one test fails. It needs an updated version of ecj library. More details are at BZ 65599 and in related discussions on dev@ https://bz.apache.org/bugzilla/show_bug.cgi?id=65599 Unit tests with Java 8: OK, with some settings in the build.properties file. The recipe is the same as when testing Tomcat 9.0.60 with Java 8, from the "Running unit tests with JVMs < 11" thread (Feb 09, 2022) https://lists.apache.org/thread/mltqyq912z97klqvzg0d5mb7h658j734 Unit tests with Java 7: OK, but in addition to the settings for Java 8 it needs older versions of easymock and objenesis libraries. The recipe - see "Running cipher-suite tests without failure" thread (Feb 24, 2022), https://lists.apache.org/thread/42rkw48o00nzoxnr11jlst2d8p2y6bh5 Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat Native and minimum OpenSSL version
Mark, On 3/15/22 16:40, Mark Thomas wrote: Hi all, We currently have the following text in the VERSIONS file for Tomcat Native: = The current minimum versions are: - OpenSSL 1.0.2 - APR 1.4.3 ... It is current anticipated that Tomcat Native releases will transition to 1.3.x after April 2021 when the minimum version will become OpenSSL 1.1.0 and APR 1.5.2. == This change was driven by Ubuntu 16.04 reaching EOL in April 2021. However, Debian 9 reaches EOL in June this year which would allow us to move to: OpenSSL 1.1.1 APR 1.6.x As I am about to prepare a Tomcat Native release do we want to make the switch to 1.3.0 now or wait until after June and go straight to 1.1.1/1.6.x? +1 to doing a tcnative release right now (!!). I think we should not change anything until June and then go directly to 1.1.1. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65959] New: Tomcat 9.0.59 and 9.0.60 implementation of FunctionMapperImpl breaks application
https://bz.apache.org/bugzilla/show_bug.cgi?id=65959 Bug ID: 65959 Summary: Tomcat 9.0.59 and 9.0.60 implementation of FunctionMapperImpl breaks application Product: Tomcat 9 Version: 9.0.60 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: EL Assignee: dev@tomcat.apache.org Reporter: francois.dambr...@wiiisdom.com Target Milestone: - Created attachment 38229 --> https://bz.apache.org/bugzilla/attachment.cgi?id=38229&action=edit full stack trace Hello, We have a JSF application that is properly running on tomcat 9.0.58 and previous. We use Primefaces as JSF component provider. When we use a dynamic view with ajax, we obtain a full stacktrace du to Serialization error of FunctionMapperImpl (see attached). I analyzed your release notes and commits and found that the full "write" section was modified for the FunctionMapperImpl. I cloned tomcat repository, opened the 9.0.x branch and reverted the code https://github.com/apache/tomcat/commit/89c63c4757854435f8d6525e08c02fc598f4aae7 then redeployed the libraries and everything ran fine. -- 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
Re: Tomcat Native and minimum OpenSSL version
On Wed, Mar 16, 2022 at 11:21 AM Christopher Schultz < ch...@christopherschultz.net> wrote: > Mark, > > On 3/15/22 16:40, Mark Thomas wrote: > > Hi all, > > > > We currently have the following text in the VERSIONS file for Tomcat > > Native: > > > > = > > The current minimum versions are: > > - OpenSSL 1.0.2 > > - APR 1.4.3 > > > > ... > > > > It is current anticipated that Tomcat Native releases will transition to > > 1.3.x > > after April 2021 when the minimum version will become OpenSSL 1.1.0 and > > APR 1.5.2. > > == > > > > > > This change was driven by Ubuntu 16.04 reaching EOL in April 2021. > > However, Debian 9 reaches EOL in June this year which would allow us to > > move to: > > OpenSSL 1.1.1 > > APR 1.6.x > > > > > > As I am about to prepare a Tomcat Native release do we want to make the > > switch to 1.3.0 now or wait until after June and go straight to > > 1.1.1/1.6.x? > > +1 to doing a tcnative release right now (!!). > > I think we should not change anything until June and then go directly to > 1.1.1. > +1 for a release and waiting until June too.
[Bug 65959] Tomcat 9.0.59 and 9.0.60 implementation of FunctionMapperImpl breaks application
https://bz.apache.org/bugzilla/show_bug.cgi?id=65959 François Dambrine changed: What|Removed |Added Severity|normal |regression Hardware|PC |All -- 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
How best to apply a PR and include a changelog entry
All, I'd like to accept a PR and also include a changelog entry at the same time, in a single commit. Is that possible and/or easy? Thanks, -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: How best to apply a PR and include a changelog entry
On 16/03/2022 16:28, Christopher Schultz wrote: All, I'd like to accept a PR and also include a changelog entry at the same time, in a single commit. Is that possible and/or easy? You can but it involves some hoop jumping. Roughly: - start in your local checkout - git checkout -b sim-lus-patch-1 main - git pull https://github.com/sim-lus/tomcat.git patch-1 - cherry pick the commit to main - make the changelog changes and commit them - git rebase -i HEAD~2 - squash the changelog commit into the PR commit - git push Git being git, there are probably multiple ways of doing this. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (755d46d -> 43564a4)
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 755d46d Update BND to 6.2.0 add 43564a4 Update JASPIC to Jakarta Authentication 3.0 No new revisions were added by this update. Summary of changes: .../security/auth/message/AuthException.java | 24 +++ java/jakarta/security/auth/message/ClientAuth.java | 10 +- .../jakarta/security/auth/message/MessageInfo.java | 3 +- java/jakarta/security/auth/message/ServerAuth.java | 8 +- .../auth/message/config/AuthConfigFactory.java | 60 ++-- .../auth/message/config/ClientAuthConfig.java | 3 +- .../auth/message/config/ServerAuthConfig.java | 3 +- .../auth/message/module/ClientAuthModule.java | 6 +- .../auth/message/module/ServerAuthModule.java | 6 +- .../jaspic/AuthConfigFactoryImpl.java | 165 - .../authenticator/jaspic/LocalStrings.properties | 2 + .../authenticator/jaspic/MessageInfoImpl.java | 4 +- .../jaspic/SimpleAuthConfigProvider.java | 6 +- .../jaspic/SimpleServerAuthConfig.java | 15 +- .../jaspic/SimpleServerAuthContext.java| 1 - .../jaspic/TestSimpleServerAuthConfig.java | 2 +- .../authenticator/jaspic/TesterMessageInfo.java| 5 +- .../jaspic/TesterServerAuthModuleA.java| 4 +- webapps/docs/changelog.xml | 9 ++ webapps/docs/config/jaspic.xml | 46 +++--- webapps/docs/config/project.xml| 3 +- webapps/docs/project.xml | 3 +- 22 files changed, 306 insertions(+), 82 deletions(-) - 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 #482: replace deprecated getSubjectDN()
ChristopherSchultz commented on pull request #482: URL: https://github.com/apache/tomcat/pull/482#issuecomment-1069321989 LGTM. getSubjectX500Principal was added in Java 1.4 so we should be good all the way back to 8.5. -- 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 10.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 84eb7c7 Fix typo
84eb7c7 is described below
commit 84eb7c72091148423b544230194e7dc97b766261
Author: Mark Thomas
AuthorDate: Wed Mar 16 17:37:52 2022 +
Fix typo
---
java/org/apache/catalina/ha/deploy/LocalStrings_de.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
b/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
index d09bce9..c317ec2 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
@@ -21,5 +21,5 @@ farmWarDeployer.undeployEnd=Undeployment von [{0}] beendet.
fileMessageFactory.duplicateMessage=Doppelte Nachricht empfangen. Ist der
Timeout für den Sender zu niedrig? Context: [{0}] Dateiname: [{1}] Daten: [{2}]
Datenlänge [{3}]
-warWatcher.cantListWatchDir=Dateien in WatchDir [{0}] können nicht gelistet
werdenm: Prüfen Sie dass Lesezugriff auf das Verzeichnis besteht
+warWatcher.cantListWatchDir=Dateien in WatchDir [{0}] können nicht gelistet
werden: Prüfen Sie dass Lesezugriff auf das Verzeichnis besteht.
warWatcher.checkingWar=WAR-Datei [{0}] wird geprüft.
-
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: Fix typo
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 7e91d87 Fix typo
7e91d87 is described below
commit 7e91d8720535bc406422bfe51dce835b256067f8
Author: Mark Thomas
AuthorDate: Wed Mar 16 17:38:28 2022 +
Fix typo
---
java/org/apache/catalina/ha/deploy/LocalStrings_de.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
b/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
index d09bce9..c317ec2 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
@@ -21,5 +21,5 @@ farmWarDeployer.undeployEnd=Undeployment von [{0}] beendet.
fileMessageFactory.duplicateMessage=Doppelte Nachricht empfangen. Ist der
Timeout für den Sender zu niedrig? Context: [{0}] Dateiname: [{1}] Daten: [{2}]
Datenlänge [{3}]
-warWatcher.cantListWatchDir=Dateien in WatchDir [{0}] können nicht gelistet
werdenm: Prüfen Sie dass Lesezugriff auf das Verzeichnis besteht
+warWatcher.cantListWatchDir=Dateien in WatchDir [{0}] können nicht gelistet
werden: Prüfen Sie dass Lesezugriff auf das Verzeichnis besteht.
warWatcher.checkingWar=WAR-Datei [{0}] wird geprüft.
-
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: Fix typo
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 0e393a9 Fix typo
0e393a9 is described below
commit 0e393a9b75489925edb3710f202b11fe0f5c0f97
Author: Mark Thomas
AuthorDate: Wed Mar 16 17:38:39 2022 +
Fix typo
---
java/org/apache/catalina/ha/deploy/LocalStrings_de.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
b/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
index d09bce9..c317ec2 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
@@ -21,5 +21,5 @@ farmWarDeployer.undeployEnd=Undeployment von [{0}] beendet.
fileMessageFactory.duplicateMessage=Doppelte Nachricht empfangen. Ist der
Timeout für den Sender zu niedrig? Context: [{0}] Dateiname: [{1}] Daten: [{2}]
Datenlänge [{3}]
-warWatcher.cantListWatchDir=Dateien in WatchDir [{0}] können nicht gelistet
werdenm: Prüfen Sie dass Lesezugriff auf das Verzeichnis besteht
+warWatcher.cantListWatchDir=Dateien in WatchDir [{0}] können nicht gelistet
werden: Prüfen Sie dass Lesezugriff auf das Verzeichnis besteht.
warWatcher.checkingWar=WAR-Datei [{0}] wird geprüft.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] tag 1.2.32 created (now 70cf6b8)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 1.2.32 in repository https://gitbox.apache.org/repos/asf/tomcat-native.git. at 70cf6b8 (commit) This tag includes the following new commits: new 70cf6b8 Tag 1.2.32 The 1 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. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 01/01: Tag 1.2.32
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to tag 1.2.32
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 70cf6b871f6010a3bac5430490cf1105fcd476b0
Author: Mark Thomas
AuthorDate: Wed Mar 16 19:21:34 2022 +
Tag 1.2.32
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f8ba663..e8373ef 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -20,7 +20,7 @@ version.major=1
version.minor=2
version.build=32
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 6308818..91136ef 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated: Fix script so it works with current git layout
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-native.git
The following commit(s) were added to refs/heads/main by this push:
new 2133b43 Fix script so it works with current git layout
2133b43 is described below
commit 2133b4383672df280e6b7a868607d004142a3422
Author: Mark Thomas
AuthorDate: Wed Mar 16 19:32:10 2022 +
Fix script so it works with current git layout
---
jnirelease.sh | 8
xdocs/miscellaneous/changelog.xml | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/jnirelease.sh b/jnirelease.sh
index 6763b28..2246585 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -162,11 +162,11 @@ else
git checkout ${JKJNIHASH}
fi
-if [ ! -d .git/refs/remotes/10.0.x ]; then
-git remote add -f 10.0.x ${TCJAVA_GITBASE}
+if [ ! -d .git/refs/remotes/tcjava ]; then
+git remote add -f tcjava ${TCJAVA_GITBASE}
fi
-git remote update 10.0.x
-diffcount=`git diff HEAD remotes/10.0.x/main java/org/apache/tomcat/jni | wc
-l`
+git remote update tcjava
+diffcount=`git diff HEAD remotes/tcjava/10.0.x java/org/apache/tomcat/jni | wc
-l`
if [ $diffcount -ne 0 ]; then
echo "WARNING: git subtree is not up to date with"
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index d749412..f886dee 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -39,6 +39,9 @@
Update recommended OpenSSL version to 1.1.1n or later. (markt)
+
+ Fix release script so it works with the current git layout. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated (2133b43 -> 8e26c6a)
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-native.git. from 2133b43 Fix script so it works with current git layout add 8e26c6a Align with latest 10.0.x source No new revisions were added by this update. Summary of changes: java/org/apache/tomcat/jni/BIOCallback.java | 1 - java/org/apache/tomcat/jni/Buffer.java| 1 - java/org/apache/tomcat/jni/Directory.java | 1 - java/org/apache/tomcat/jni/Error.java | 1 - java/org/apache/tomcat/jni/File.java | 1 - java/org/apache/tomcat/jni/FileInfo.java | 1 - java/org/apache/tomcat/jni/Global.java| 1 - java/org/apache/tomcat/jni/Library.java | 18 +- java/org/apache/tomcat/jni/Local.java | 1 - java/org/apache/tomcat/jni/Lock.java | 1 - java/org/apache/tomcat/jni/Mmap.java | 1 - java/org/apache/tomcat/jni/Multicast.java | 1 - java/org/apache/tomcat/jni/OS.java| 1 - java/org/apache/tomcat/jni/PasswordCallback.java | 1 - java/org/apache/tomcat/jni/Pool.java | 1 - java/org/apache/tomcat/jni/PoolCallback.java | 1 - java/org/apache/tomcat/jni/Proc.java | 1 - java/org/apache/tomcat/jni/ProcErrorCallback.java | 1 - java/org/apache/tomcat/jni/Procattr.java | 1 - java/org/apache/tomcat/jni/Registry.java | 1 - java/org/apache/tomcat/jni/SSLConf.java | 1 - java/org/apache/tomcat/jni/SSLContext.java| 1 - java/org/apache/tomcat/jni/SSLSocket.java | 1 - java/org/apache/tomcat/jni/Shm.java | 1 - java/org/apache/tomcat/jni/Sockaddr.java | 1 - java/org/apache/tomcat/jni/Socket.java| 1 - java/org/apache/tomcat/jni/Status.java| 1 - java/org/apache/tomcat/jni/Stdlib.java| 1 - java/org/apache/tomcat/jni/Thread.java| 1 - java/org/apache/tomcat/jni/Time.java | 1 - java/org/apache/tomcat/jni/User.java | 1 - 31 files changed, 5 insertions(+), 43 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] tag 1.2.32 created (now ee11afc)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 1.2.32 in repository https://gitbox.apache.org/repos/asf/tomcat-native.git. at ee11afc (commit) This tag includes the following new commits: new ee11afc Tag 1.2.32 The 1 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. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 01/01: Tag 1.2.32
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to tag 1.2.32
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit ee11afcb5bc3426b85525985461484222f609406
Author: Mark Thomas
AuthorDate: Wed Mar 16 19:39:25 2022 +
Tag 1.2.32
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f8ba663..e8373ef 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -20,7 +20,7 @@ version.major=1
version.minor=2
version.build=32
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 6308818..91136ef 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 8.5.77
All, The following votes were cast: Binding: +1: isapir, remm, markt, kkolinko, schultz No other votes were cast, therefore the vote passes. Thanks to everyone who contributed to this release. -chris On 3/13/22 15:41, Christopher Schultz wrote: The proposed Apache Tomcat 8.5.77 release is now available for voting. The notable changes compared to 8.5.76 are: - Fix a potential thread-safety issue that could cause HTTP/1.1 request processing to pause, and potentially timeout, waiting for additional data when the full request has been received. - Fix a regression introduced with 65757 bugfix which better identified non request threads but which introduced a similar problem when user code was doing sequential operations in a single thread. - When resolving methods in EL expressions that use beans and/or static fields, ensure that any custom type conversion is considered when identifying the method to call. Along with lots of other bug fixes and improvements. This is the second release of Tomcat 8.5 that has been built with Java 11 (in Java 7 mode) instead of Java 7. Please report any strangeness you may observe especially if you are running Tomcat 8.5 in an environment using Java < 11. We don't expect any issues, but understand that we cannot test all possible environmental configurations. For full details, see the changelog: https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.77/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1363 The tag is: https://github.com/apache/tomcat/tree/8.5.77 3931695e564dd4dd1dbf029026e900b74992408c The proposed 8.5.77 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.5.76 (stable) -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
