[GitHub] [tomcat-jakartaee-migration] mdoerschmidt opened a new issue #13: List modified files

[GitBox]

mdoerschmidt opened a new issue #13:
URL: https://github.com/apache/tomcat-jakartaee-migration/issues/13


   At the moment all files are shown that have been processed by the tool.
   
   A list of all files that have been modified by the tools would be great to 
see, which (Jar) files must be updated.



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.

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: [ANN] Apache Tomcat 7.0.108 released

[jonmcalexander]

We are getting the firewall error again like we did once last year, stating 
that its blacklisted.

Dream * Excel * Explore * Inspire
Jon McAlexander
Infrastructure Engineer
Asst Vice President

Middleware Product Engineering
Enterprise CIO | Platform Services | Middleware | Infrastructure Solutions

8080 Cobblestone Rd | Urbandale, IA 50322
MAC: F4469-010
Tel 515-988-2508 | Cell 515-988-2508

jonmcalexan...@wellsfargo.com

Upcoming PTO: 10/30/2020, 11/6/2020, 11/13/2020, 11/20/2020, 11/27/2020, 
12/2/2020, 12/4/2020, 12/11/2020, 12/18/2020, 12/28/2020, 12/29/2020, 
12/30/2020, 12/31/2020
This message may contain confidential and/or privileged information. If you are 
not the addressee or authorized to receive this for the addressee, you must not 
use, copy, disclose, or take any action based on this message or any 
information herein. If you have received this message in error, please advise 
the sender immediately by reply e-mail and delete this message. Thank you for 
your cooperation.


> -Original Message-
> From: Violeta Georgieva 
> Sent: Monday, February 8, 2021 3:21 AM
> To: Tomcat Users List ; Tomcat Developers List
> ; annou...@tomcat.apache.org;
> annou...@apache.org
> Subject: [ANN] Apache Tomcat 7.0.108 released
> Importance: High
> 
> The Apache Tomcat team announces the immediate availability of Apache
> Tomcat 7.0.108.
> 
> Apache Tomcat is an open source software implementation of the Java Servlet,
> JavaServer Pages, Java Expression Language and Java WebSocket technologies.
> 
> This release contains a number of bug fixes and improvements compared to
> version 7.0.107. The notable changes since 7.0.107 include:
> 
> 
> - Fix a potential file descriptor leak when WebSocket connections are
>   attempted and fail. Patch provided by Maurizio Adami.
> 
> 
> Please refer to the change log for the complete list of changes:
> http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
> 
> Apache Tomcat website:
> http://tomcat.apache.org
> 
> Downloads:
> http://tomcat.apache.org/download-70.cgi
> 
> Migration guides from Apache Tomcat 5.5.x and 6.0.x:
> http://tomcat.apache.org/migration.html
> 
> Enjoy
> 
> The Apache Tomcat team

[GitHub] [tomcat-jakartaee-migration] markt-asf commented on issue #5: ability to ignore file extensions?

[GitBox]

markt-asf commented on issue #5:
URL: 
https://github.com/apache/tomcat-jakartaee-migration/issues/5#issuecomment-775372398


   Fix, primarily in fc2245dd, with the addition of an option that processes 
Zip archives in memory rather than via streaming.



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.

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-jakartaee-migration] markt-asf closed issue #5: ability to ignore file extensions?

[GitBox]

markt-asf closed issue #5:
URL: https://github.com/apache/tomcat-jakartaee-migration/issues/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.

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-jakartaee-migration] branch master updated: Update chnagelog

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 1a8f20a  Update chnagelog
1a8f20a is described below

commit 1a8f20ad541277981b732626715ec7e464a5ee33
Author: Mark Thomas 
AuthorDate: Mon Feb 8 19:02:46 2021 +

Update chnagelog
---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index ee98a7c..af74bb7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@
 - Add a new option `-zipInMemory` that processes archives (ZIP, JAR, WAR, 
etc.) in memory rather via a streaming approach. While less efficient, it 
allows archives to be processed when their structure means that a streaming 
approach will fail. (markt)
 - Include the Maven Wrapper source files in the source distribution. (markt)
 - Ensure that all the Manifest attributes are processed during the migration 
process. (markt)
+- Include `.properties` and `.json` files in the conversion process. (markt)
 
 ## 0.1.0
 


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

[tomcat-jakartaee-migration] 01/03: Only write the part of the buffer that contains data

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 9f3c4479c0b9ba3f46a37d7292062f73cb6523b4
Author: Mark Thomas 
AuthorDate: Mon Feb 8 17:17:25 2021 +

Only write the part of the buffer that contains data
---
 src/main/java/org/apache/tomcat/jakartaee/Migration.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 7a4cbe9..c6a6371 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -209,6 +209,7 @@ public class Migration {
 // Read the source into memory
 ByteArrayOutputStream baos = new ByteArrayOutputStream();
 IOUtils.copy(src, baos);
+baos.flush();
 SeekableInMemoryByteChannel srcByteChannel = new 
SeekableInMemoryByteChannel(baos.toByteArray());
 // Create the destination in memory
 SeekableInMemoryByteChannel destByteChannel = new 
SeekableInMemoryByteChannel();
@@ -234,7 +235,7 @@ public class Migration {
 }
 
 // Write the destination back to the stream
-ByteArrayInputStream bais = new 
ByteArrayInputStream(destByteChannel.array());
+ByteArrayInputStream bais = new 
ByteArrayInputStream(destByteChannel.array(), 0, (int) destByteChannel.size());
 IOUtils.copy(bais, dest);
 
 return result;


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

[tomcat-jakartaee-migration] 03/03: Spring Boot apps require conversion of a couple more configuration files

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit c02864ebb26559e40591efccbf7e9496deed7214
Author: Mark Thomas 
AuthorDate: Mon Feb 8 18:02:00 2021 +

Spring Boot apps require conversion of a couple more configuration files
---
 src/main/java/org/apache/tomcat/jakartaee/TextConverter.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
index d823ffd..57cf1ae 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
@@ -38,6 +38,8 @@ public class TextConverter implements Converter {
 supportedExtensions.add("tld");
 supportedExtensions.add("txt");
 supportedExtensions.add("xml");
+supportedExtensions.add("json");
+supportedExtensions.add("properties");
 }
 
 


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

[tomcat-jakartaee-migration] 02/03: Fix duplicate conversion

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 67cc4f94eb64cdd56151c5b2fe6b52ef669104ce
Author: Mark Thomas 
AuthorDate: Mon Feb 8 17:39:55 2021 +

Fix duplicate conversion
---
 .../apache/tomcat/jakartaee/ManifestConverter.java | 25 +-
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/ManifestConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/ManifestConverter.java
index 667a00e..3a89ae2 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ManifestConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ManifestConverter.java
@@ -53,7 +53,6 @@ public class ManifestConverter implements Converter {
 Manifest destManifest = new Manifest(srcManifest);
 
 removeSignatures(destManifest);
-updateVersion(destManifest);
 updateValues(destManifest, profile);
 
 destManifest.write(dest);
@@ -91,22 +90,6 @@ public class ManifestConverter implements Converter {
 }
 
 
-private void updateVersion(Manifest manifest) {
-updateVersion(manifest.getMainAttributes());
-for (Attributes attributes : manifest.getEntries().values()) {
-updateVersion(attributes);
-}
-}
-
-
-private void updateVersion(Attributes attributes) {
-if (attributes.containsKey(Attributes.Name.IMPLEMENTATION_VERSION)) {
-String newValue = 
attributes.get(Attributes.Name.IMPLEMENTATION_VERSION) + "-" + 
Info.getVersion();
-attributes.put(Attributes.Name.IMPLEMENTATION_VERSION, newValue);
-}
-}
-
-
 private void updateValues(Manifest manifest, EESpecProfile profile) {
 updateValues(manifest.getMainAttributes(), profile);
 for (Attributes attributes : manifest.getEntries().values()) {
@@ -116,12 +99,14 @@ public class ManifestConverter implements Converter {
 
 
 private void updateValues(Attributes attributes, EESpecProfile profile) {
-for (Entry entry : attributes.entrySet()) {
-entry.setValue(profile.convert((String) entry.getValue()));
-}
+// Update version info
 if (attributes.containsKey(Attributes.Name.IMPLEMENTATION_VERSION)) {
 String newValue = 
attributes.get(Attributes.Name.IMPLEMENTATION_VERSION) + "-" + 
Info.getVersion();
 attributes.put(Attributes.Name.IMPLEMENTATION_VERSION, newValue);
 }
+// Update package names in values
+for (Entry entry : attributes.entrySet()) {
+entry.setValue(profile.convert((String) entry.getValue()));
+}
 }
 }


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

[tomcat-jakartaee-migration] branch master updated (018a7d8 -> c02864e)

[markt]

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

markt pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git.


from 018a7d8  Migrate all the Manifest attributes
 new 9f3c447  Only write the part of the buffer that contains data
 new 67cc4f9  Fix duplicate conversion
 new c02864e  Spring Boot apps require conversion of a couple more 
configuration files

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:
 .../apache/tomcat/jakartaee/ManifestConverter.java | 25 +-
 .../org/apache/tomcat/jakartaee/Migration.java |  3 ++-
 .../org/apache/tomcat/jakartaee/TextConverter.java |  2 ++
 3 files changed, 9 insertions(+), 21 deletions(-)


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

[Bug 65131] New: OpenSSLEngine errors on a connection affect other connections

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65131

Bug ID: 65131
   Summary: OpenSSLEngine errors on a connection affect other
connections
   Product: Tomcat 9
   Version: 9.0.34
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: frraj...@cisco.com
  Target Milestone: -

This issue was previously reported in
https://bz.apache.org/bugzilla/show_bug.cgi?id=62054 but was discarded because
it was not reproducible. However, I have been able to reproduce it.

The setup is:
tomcat 9.0.34
HTTPNIO connector, with OpenSSLEngine implementation
openssl 1.0.2u

To reproduce, configure a secure connector with a self-signed certificate.

Then, in a loop, access the secure connector using curl, but ignore the
self-signed certificate errors (-k), like this:
for i in {1..1000} ; do curl -q -k https://hostname >/dev/null 2>&1; echo $?;
done

The exit code should always be zero if the connection is successful.

While the test is running, access the same interface, but let curl fail the
connection by letting it verify the certificate:
curl https://hostname
curl: (60) Peer's certificate issuer has been marked as not trusted by the
user.

The test will start reporting connection errors (exit code 52). Run both in a
tight loop to get many errors.

The following stack trace is visible in tomcat logs:

FINE: OpenSSL error: [336462231] message: [error:140E0197:SSL
routines:SSL_shutdown:shutdown while in init]
Feb 08, 2021 11:41:19 AM org.apache.coyote.http11.Http11Processor service
FINE: Error parsing HTTP request header
javax.net.ssl.SSLException: error:140E0197:SSL routines:SSL_shutdown:shutdown
while in init
at
org.apache.tomcat.util.net.openssl.OpenSSLEngine.checkLastError(OpenSSLEngine.java:946)
at
org.apache.tomcat.util.net.openssl.OpenSSLEngine.pendingReadableBytesInSSL(OpenSSLEngine.java:631)
at
org.apache.tomcat.util.net.openssl.OpenSSLEngine.unwrap(OpenSSLEngine.java:558)
at javax.net.ssl.SSLEngine.unwrap(SSLEngine.java:629)
at
org.apache.tomcat.util.net.SecureNioChannel.read(SecureNioChannel.java:617)
at
org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.fillReadBuffer(NioEndpoint.java:1229)
at
org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.read(NioEndpoint.java:1141)
at
org.apache.coyote.http11.Http11InputBuffer.fill(Http11InputBuffer.java:761)
at
org.apache.coyote.http11.Http11InputBuffer.parseRequestLine(Http11InputBuffer.java:356)
at
org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:260)
at
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)
at
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:868)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1590)
at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
at
com.broadsoft.xsp.platform.InstrumentedExecutor$Tracker.run(InstrumentedExecutor.java:413)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
at java.lang.Thread.run(Thread.java:748)


My feeling is that this is related to the same problem that led to this fix:
https://github.com/apache/tomcat/commit/ebab25a3576a315ca676db7ce2366e53f9dcf311
It looks like, in this case, there are multiple errors waiting in the openssl
error queue, and just reading one error is not sufficient to clear the queue.
Therefore, SSL errors on a connection are permitted to propagate to other
connections as long as they are processed on the same thread.


As an aside, I also noticed the following NPE stacktrace in the logs, but I'm
not sure if it's related. It may be a different scenario that caused it. I
think it's related to SecureNioChannel.processSNI returning/throwing before
creating the SSLEngine.

Feb 08, 2021 11:48:00 AM
org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper doClose
SEVERE: Failed to close channel
java.lang.NullPointerException
at
org.apache.tomcat.util.net.SecureNioChannel.close(SecureNioChannel.java:534)
at
org.apache.tomcat.util.net.SecureNioChannel.close(SecureNioChannel.java:560)
at
org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.doClose(NioEndpoint.java:1172)
at
org.apache.tomcat.util.net.SocketWrapperBase.close(SocketWrapperBase.java:396)
at
org.apache.tomcat.util.net.NioEndpoint$Poller.cancelledKey(NioEndpoint.java:684)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1597)
at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
at

[tomcat-jakartaee-migration] branch master updated: Migrate all the Manifest attributes

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 018a7d8  Migrate all the Manifest attributes
018a7d8 is described below

commit 018a7d8a22ecc4bab5d584bdf2eea9713c582a19
Author: Mark Thomas 
AuthorDate: Mon Feb 8 16:21:13 2021 +

Migrate all the Manifest attributes
---
 CHANGES.md |   1 +
 .../apache/tomcat/jakartaee/ManifestConverter.java | 127 +
 .../org/apache/tomcat/jakartaee/Migration.java | 114 --
 3 files changed, 148 insertions(+), 94 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 876d46d..ee98a7c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@
 - Make `migrate.sh` work from any path (mgrigorov)
 - Add a new option `-zipInMemory` that processes archives (ZIP, JAR, WAR, 
etc.) in memory rather via a streaming approach. While less efficient, it 
allows archives to be processed when their structure means that a streaming 
approach will fail. (markt)
 - Include the Maven Wrapper source files in the source distribution. (markt)
+- Ensure that all the Manifest attributes are processed during the migration 
process. (markt)
 
 ## 0.1.0
 
diff --git a/src/main/java/org/apache/tomcat/jakartaee/ManifestConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/ManifestConverter.java
new file mode 100644
index 000..667a00e
--- /dev/null
+++ b/src/main/java/org/apache/tomcat/jakartaee/ManifestConverter.java
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jakartaee;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Updates Manifests.
+ */
+public class ManifestConverter implements Converter {
+
+private static final Logger logger = 
Logger.getLogger(ManifestConverter.class.getCanonicalName());
+private static final StringManager sm = 
StringManager.getManager(ManifestConverter.class);
+
+@Override
+public boolean accepts(String filename) {
+if (JarFile.MANIFEST_NAME.equals(filename)) {
+return true;
+}
+
+// Reject everything else
+return false;
+}
+
+@Override
+public void convert(InputStream src, OutputStream dest, EESpecProfile 
profile) throws IOException {
+Manifest srcManifest = new Manifest(src);
+Manifest destManifest = new Manifest(srcManifest);
+
+removeSignatures(destManifest);
+updateVersion(destManifest);
+updateValues(destManifest, profile);
+
+destManifest.write(dest);
+}
+
+
+private boolean removeSignatures(Manifest manifest) {
+boolean removedSignatures = 
manifest.getMainAttributes().remove(Attributes.Name.SIGNATURE_VERSION) != null;
+List signatureEntries = new ArrayList<>();
+Map manifestAttributeEntries = 
manifest.getEntries();
+for (Entry entry : 
manifestAttributeEntries.entrySet()) {
+if (isCryptoSignatureEntry(entry.getValue())) {
+String entryName = entry.getKey();
+signatureEntries.add(entryName);
+logger.log(Level.FINE, 
sm.getString("migration.removeSignature", entryName));
+removedSignatures = true;
+}
+}
+
+for (String entry : signatureEntries) {
+manifestAttributeEntries.remove(entry);
+}
+
+return removedSignatures;
+}
+
+
+private boolean isCryptoSignatureEntry(Attributes attributes) {
+for (Object attributeKey : attributes.keySet()) {
+if (attributeKey.toString().endsWith("-Digest")) {
+return true;
+}
+}
+return false;
+}
+
+
+private void updateVersion(Manifest 

[tomcat-jakartaee-migration] branch master updated: Add name so maven-shade-plugin picks it up for the NOTICE file

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new cef2c08  Add name so maven-shade-plugin picks it up for the NOTICE file
cef2c08 is described below

commit cef2c08b192361734a0599fe4b16b31861f41927
Author: Mark Thomas 
AuthorDate: Mon Feb 8 14:52:07 2021 +

Add name so maven-shade-plugin picks it up for the NOTICE file
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 87956f6..c619b54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
 
   org.apache.tomcat
   jakartaee-migration
+  Apache Tomcat Migration Tool for Jakarta EE
   0.2.0-SNAPSHOT
  
   


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

Re: tomcat-jakartaee-migration: shaded jar missing from bin download

[Mark Thomas]

On 08/02/2021 13:27, Rainer Jung wrote:
> Hi there,
> 
> the shaded jar jakartaee-migration-0.1.0-shaded.jar is missing in the
> current bin download file jakartaee-migration-0.1.0-bin.tar.gz.
> 
> The README.md me ntions it, the source dist builds it and it seems to
> work, so it should probably be bundled.

I was thinking of providing this as a separate binary download along
side the -bin file.

Mark

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

[tomcat-jakartaee-migration] branch master updated: Update copyright year

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 2e3ec84  Update copyright year
2e3ec84 is described below

commit 2e3ec843478ce7e8079d73d6e68f9ca4a49a3759
Author: Mark Thomas 
AuthorDate: Mon Feb 8 14:22:18 2021 +

Update copyright year
---
 NOTICE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE.txt b/NOTICE.txt
index 2970a72..2708654 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Tomcat migration tool for Jakarta EE
-Copyright 2020 The Apache Software Foundation
+Copyright 2021 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
\ No newline at end of file


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

[tomcat-jakartaee-migration] branch master updated: Add filter for use when shading commons-compress

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 0fb007b  Add filter for use when shading commons-compress
0fb007b is described below

commit 0fb007b46a78c36557974eef343001faf02d2903
Author: Mark Thomas 
AuthorDate: Mon Feb 8 14:11:28 2021 +

Add filter for use when shading commons-compress
---
 pom.xml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 37b6c19..87956f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,6 +260,12 @@
   
 
 
+  org.apache.commons:*
+  
+META-INF/**
+  
+
+
   commons-io:*
   
 META-INF/**


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

Re: tomcat-jakartaee-migration: ".mvn" missing from source download

[Mark Thomas]

On 08/02/2021 13:24, Rainer Jung wrote:
> Hi there,
> 
> the directory .mvn and its contents is missing in the current source
> download file jakartaee-migration-0.1.0-src.tar.gz.
> 
> Without it, the tool can not be rebuild:
> 
> Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ...
> ./mvnw[223]:
> /path/to/jakartaee-migration-0.1.0/.mvn/wrapper/maven-wrapper.properties: 
> cannot
> open
> 
> It seems at least wrapper/maven-wrapper.properties and
> wrapper/MavenWrapperDownloader.java should be bundled, whereas the file
> wrapper/maven-wrapper.jar seems to get downloaded during build.

Agreed. Fixed.

Mark

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

[tomcat-jakartaee-migration] branch master updated: Add Maven wrapper files to source distribution

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 7692887  Add Maven wrapper files to source distribution
7692887 is described below

commit 7692887d739fb71b19722cba807f9ee54d3b4a58
Author: Mark Thomas 
AuthorDate: Mon Feb 8 14:04:22 2021 +

Add Maven wrapper files to source distribution
---
 CHANGES.md   | 3 ++-
 src/assembly/src.xml | 6 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4099664..876d46d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,7 +17,8 @@
 - Include the `javax.resource` package in the EE profile (ebourg)
 - Fix [#7](https://github.com/apache/tomcat-jakartaee-migration/issues/7). 
Include the `javax.jms` package in the EE profile (alitokmen/mgirgorov)
 - Make `migrate.sh` work from any path (mgrigorov)
-- Add a new option `-zipInMemory` that processes archives (ZIP, JAR, WAR, 
etc.) in memory rather via a streaming approach. While less efficient, it 
allows archives to be processed when their structure means that a streaming 
approach will fail.
+- Add a new option `-zipInMemory` that processes archives (ZIP, JAR, WAR, 
etc.) in memory rather via a streaming approach. While less efficient, it 
allows archives to be processed when their structure means that a streaming 
approach will fail. (markt)
+- Include the Maven Wrapper source files in the source distribution. (markt)
 
 ## 0.1.0
 
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index 2c66d86..1c5d9c1 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -35,5 +35,11 @@
 
   src
 
+
+  .mvn
+  
+**/*.jar
+  
+
   
 


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

[tomcat-jakartaee-migration] 02/02: New features added. Increment minor version.

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit bda72670f13df48129204593b40798f24b358bf5
Author: Mark Thomas 
AuthorDate: Mon Feb 8 13:59:16 2021 +

New features added. Increment minor version.
---
 CHANGES.md | 2 +-
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6e2b583..4099664 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,6 @@
 # Tomcat Migration Tool for Jakarta EE - Changelog
 
-## 0.1.1 (in progress)
+## 0.2.0 (in progress)
 
 - Add this changelog (markt)
 - Update dependencies (Apache Commons IO 2.8.0, Apache Ant 1.10.9) (markt)
diff --git a/pom.xml b/pom.xml
index 5b4b1ec..37b6c19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.tomcat
   jakartaee-migration
-  0.1.1-SNAPSHOT
+  0.2.0-SNAPSHOT
  
   
 This tool is a work in progress.


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

[tomcat-jakartaee-migration] 01/02: Fix#5 Add a new -zipInMemory option

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit fc2245dd5d7d605e77d31a33221fa4af5ce08f7d
Author: Mark Thomas 
AuthorDate: Mon Feb 8 13:58:15 2021 +

Fix#5  Add a new -zipInMemory option
---
 CHANGES.md |  1 +
 pom.xml|  5 ++
 .../org/apache/tomcat/jakartaee/Migration.java | 87 +-
 .../org/apache/tomcat/jakartaee/MigrationCLI.java  |  9 +++
 .../org/apache/tomcat/jakartaee/MigrationTask.java |  6 ++
 .../tomcat/jakartaee/LocalStrings.properties   |  3 +-
 6 files changed, 108 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5e9ed97..6e2b583 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@
 - Include the `javax.resource` package in the EE profile (ebourg)
 - Fix [#7](https://github.com/apache/tomcat-jakartaee-migration/issues/7). 
Include the `javax.jms` package in the EE profile (alitokmen/mgirgorov)
 - Make `migrate.sh` work from any path (mgrigorov)
+- Add a new option `-zipInMemory` that processes archives (ZIP, JAR, WAR, 
etc.) in memory rather via a streaming approach. While less efficient, it 
allows archives to be processed when their structure means that a streaming 
approach will fail.
 
 ## 0.1.0
 
diff --git a/pom.xml b/pom.xml
index d8290db..5b4b1ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,11 @@
   6.5.0
 
 
+  org.apache.commons
+  commons-compress
+  1.20
+
+
   commons-io
   commons-io
   2.8.0
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 69a23c0..2489844 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -16,6 +16,7 @@
  */
 package org.apache.tomcat.jakartaee;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,6 +25,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -36,7 +38,13 @@ import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.zip.ZipException;
 
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
+import org.apache.commons.compress.archivers.zip.ZipFile;
+import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.input.CloseShieldInputStream;
 import org.apache.commons.io.output.CloseShieldOutputStream;
 
@@ -46,6 +54,7 @@ public class Migration {
 private static final StringManager sm = 
StringManager.getManager(Migration.class);
 
 private EESpecProfile profile = EESpecProfile.TOMCAT;
+private boolean zipInMemory;
 private File source;
 private File destination;
 private final List converters;
@@ -79,6 +88,10 @@ public class Migration {
 return profile;
 }
 
+public void setZipInMemory(boolean zipInMemory) {
+this.zipInMemory = zipInMemory;
+}
+
 public void setSource(File source) {
 if (!source.canRead()) {
 throw new 
IllegalArgumentException(sm.getString("migration.cannotReadSource",
@@ -124,6 +137,7 @@ public class Migration {
 
 private boolean migrateDirectory(File src, File dest) throws IOException {
 boolean result = true;
+// Won't return null because src is known to be a directory
 String[] files = src.list();
 for (String file : files) {
 File srcFile = new File(src, file);
@@ -168,7 +182,7 @@ public class Migration {
 }
 
 
-private boolean migrateArchive(InputStream src, OutputStream dest) throws 
IOException {
+private boolean migrateArchiveStreaming(String name, InputStream src, 
OutputStream dest) throws IOException {
 boolean result = true;
 try (JarInputStream jarIs = new JarInputStream(new 
CloseShieldInputStream(src));
 JarOutputStream jarOs = new JarOutputStream(new 
CloseShieldOutputStream(dest))) {
@@ -198,7 +212,59 @@ public class Migration {
 jarOs.putNextEntry(destEntry);
 result = result && migrateStream(destEntry.getName(), jarIs, 
jarOs);
 }
+} catch (ZipException ze) {
+logger.log(Level.SEVERE, sm.getString("migration.archiveFailed", 
name), ze);
+throw ze;
+}
+return result;
+}
+
+
+private boolean migrateArchiveInMemory(InputStream 

[tomcat-jakartaee-migration] branch master updated (72e13d2 -> bda7267)

[markt]

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

markt pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git.


from 72e13d2  Output the stack trace when the log message includes an 
exception
 new fc2245d  Fix#5  Add a new -zipInMemory option
 new bda7267  New features added. Increment minor version.

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:
 CHANGES.md |  3 +-
 pom.xml|  7 +-
 .../org/apache/tomcat/jakartaee/Migration.java | 87 +-
 .../org/apache/tomcat/jakartaee/MigrationCLI.java  |  9 +++
 .../org/apache/tomcat/jakartaee/MigrationTask.java |  6 ++
 .../tomcat/jakartaee/LocalStrings.properties   |  3 +-
 6 files changed, 110 insertions(+), 5 deletions(-)


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

[Bug 65118] Spurious null pointer exception in Http2UpgradeHandler when reloading web page

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65118

Mattias  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

--- Comment #3 from Mattias  ---
I have now tested the fix for this issue using SNAPSHOT
tomcat-9.0-20210208.120325-3060.

I am afraid that the fix does not solve the issue. I still get a null pointer
exception at the same place in the code (however other row number 1252).

>08-Feb-2021 14:07:10.564 FINE [https-openssl-apr-0.0.0.0-8443-exec-34] 
>org.apache.coyote.http2.Http2UpgradeHandler.pruneClosedStreams Connection [1] 
>Starting pruning of old streams. Limit is [500] and there are currently [509] 
>streams.
>08-Feb-2021 14:07:10.564 FINE [https-openssl-apr-0.0.0.0-8443-exec-34] 
>org.apache.coyote.http2.Http2UpgradeHandler.pruneClosedStreams Connection [1] 
>Pruned completed stream [1]
>08-Feb-2021 14:07:10.564 FINE [https-openssl-apr-0.0.0.0-8443-exec-34] 
>org.apache.coyote.http2.Http2UpgradeHandler.pruneClosedStreams Connection [1] 
>Pruned completed stream [3]
>08-Feb-2021 14:07:10.564 FINE [https-openssl-apr-0.0.0.0-8443-exec-34] 
>org.apache.coyote.http2.Http2UpgradeHandler.pruneClosedStreams Connection [1] 
>Pruned completed stream [5]
>08-Feb-2021 14:07:10.564 FINE [https-openssl-apr-0.0.0.0-8443-exec-34] 
>org.apache.coyote.http2.Http2UpgradeHandler.pruneClosedStreams Connection [1] 
>Pruned completed stream [7]
>08-Feb-2021 14:07:10.564 FINE [https-openssl-apr-0.0.0.0-8443-exec-34] 
>org.apache.coyote.http2.Http2UpgradeHandler.pruneClosedStreams Connection [1] 
>Pruned completed stream [5]
>08-Feb-2021 14:07:10.565 SEVERE [https-openssl-apr-0.0.0.0-8443-exec-34] 
>org.apache.coyote.AbstractProtocol$ConnectionHandler.process Error reading 
>request, ignored
>   java.lang.NullPointerException
>   at 
> org.apache.coyote.http2.Http2UpgradeHandler.pruneClosedStreams(Http2UpgradeHandler.java:1252)
>   at 
> org.apache.coyote.http2.Http2UpgradeHandler.createRemoteStream(Http2UpgradeHandler.java:1129)
>   at 
> org.apache.coyote.http2.Http2UpgradeHandler.headersStart(Http2UpgradeHandler.java:1512)
>   at 
> org.apache.coyote.http2.Http2Parser.readHeadersFrame(Http2Parser.java:225)
>   at 
> org.apache.coyote.http2.Http2Parser.readFrame(Http2Parser.java:99)
>   at 
> org.apache.coyote.http2.Http2Parser.readFrame(Http2Parser.java:71)
>   at 
> org.apache.coyote.http2.Http2UpgradeHandler.upgradeDispatch(Http2UpgradeHandler.java:339)
>   at 
> org.apache.coyote.http11.upgrade.UpgradeProcessorInternal.dispatch(UpgradeProcessorInternal.java:60)
>   at 
> org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:59)
>   at 
> org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:893)
>   at 
> org.apache.tomcat.util.net.AprEndpoint$SocketProcessor.doRun(AprEndpoint.java:1991)
>   at 
> org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
>   at 
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
>   at 
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
>   at 
> org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
>   at java.lang.Thread.run(Thread.java:748)


For testing purposes I changed the source code in Http2UpgradeHandler line
1252. 

From 
> while (toClose > 0 && parent.getIdAsInt() > 0 && parent.getIdAsInt() < 
> stream.getIdAsInt() && parent.getChildStreams().isEmpty()) {
To
>  while (toClose > 0 && parent != null && parent.getIdAsInt() > 0 && 
> parent.getIdAsInt() < stream.getIdAsInt() && 
> parent.getChildStreams().isEmpty()) {
In order to avoid the NPE. This fix solved the issue. At least no NPE was
thrown and no problem with loading resources could be seen in the web browsers. 
I hope this can help you pin point the root cause.

-- 
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-jakartaee-migration: shaded jar missing from bin download

[Rainer Jung]

Hi there,

the shaded jar jakartaee-migration-0.1.0-shaded.jar is missing in the 
current bin download file jakartaee-migration-0.1.0-bin.tar.gz.


The README.md me ntions it, the source dist builds it and it seems to 
work, so it should probably be bundled.


Best regards,

Rainer

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

tomcat-jakartaee-migration: ".mvn" missing from source download

[Rainer Jung]

Hi there,

the directory .mvn and its contents is missing in the current source 
download file jakartaee-migration-0.1.0-src.tar.gz.


Without it, the tool can not be rebuild:

Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ...
./mvnw[223]: 
/path/to/jakartaee-migration-0.1.0/.mvn/wrapper/maven-wrapper.properties: cannot 
open


It seems at least wrapper/maven-wrapper.properties and 
wrapper/MavenWrapperDownloader.java should be bundled, whereas the file 
wrapper/maven-wrapper.jar seems to get downloaded during build.


Best regards,

Rainer

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

Re: [External] : Re: JDK 16 is now in the Release Candidate Phase

[Rory O'Donnell]

Many Thanks Martin!

On 08/02/2021 12:44, Martin Grigorov wrote:

Hi Rory,

Apache Tomcat's build and tests pass successfully with JDK 16 b35 & 17 
b8 on Ubuntu 20.04 x86_64 and aarch64!


Regards,
Martin

On Fri, Feb 5, 2021 at 1:12 PM Rory O'Donnell 
mailto:rory.odonn...@oracle.com>> wrote:



*Hi Mark, *

*Per the JDK 16 schedule , we are in the Release Candidate
Phase**[1] .*

*Please advise if you find any issues while testing the latest Early
Access builds.*

  * Schedule for JDK 16
      o *2021/02/04 Initial Release Candidate*
      o 2021/02/18 Final Release Candidate
      o 2021/03/16 General Availability
  * Release Notes [2]

OpenJDK 16 Early Access build 35**is now available at
http://jdk.java.net/16


>

  * These early-access, open-source builds are provided under the GNU
    General Public License, version 2, with the Classpath Exception
    >.
  * Features [3] - the overall feature set is frozen. No further JEPs
    will be targeted to this release.
  * Changes in recent builds that maybe of interest:
      o Build 34:
          + JDK-8259025: Record compact constructor using
            Objects.requireNonNull
              # Reported by JUnit5
      o Build 32:
          + JDK-8259014: Incomplete support for Unix domain sockets in
            Windows 2019 Server

  * JDK 16 - topics of interest:
      o Unix domain socket channels (JEP-380) overview:
https://inside.java/2021/02/03/jep380-unix-domain-sockets-channels/


       
>
      o Java Feature Spotlight: Pattern Matching
https://inside.java/2021/01/22/feature-spotlight-pattern-matching/


       
>
      o Foreign Memory Access - Pulling all the thread
https://inside.java/2021/01/25/memory-access-pulling-all-the-threads/


       
>
  * General – topic of interest:
      o Inside Java Episode 11 “How to contribute to OpenJDK” with
        Stuart Marks and Jesper Wilhelmsson
https://inside.java/2021/01/29/podcast-011/


        >


Project Lanai EA 9 Build 17-lanai+2-49 (2021/1/20)
>
is available now

  * These early-access builds are provided under the GNU General
Public
    License, version 2, with the Classpath Exception
    >
  * EA builds are intended for developers looking to test and provide
    feedback on using Project Lanai.
  * This is a macOS-specific project which implements a new Java 2D
    graphics rendering pipeline for macOS.
  * Project Lanai Wiki:

Re: JDK 16 is now in the Release Candidate Phase

[Martin Grigorov]

Hi Rory,

Apache Tomcat's build and tests pass successfully with JDK 16 b35 & 17 b8
on Ubuntu 20.04 x86_64 and aarch64!

Regards,
Martin

On Fri, Feb 5, 2021 at 1:12 PM Rory O'Donnell 
wrote:

>
> *Hi Mark, *
>
> *Per the JDK 16 schedule , we are in the Release Candidate Phase**[1] .*
>
> *Please advise if you find any issues while testing the latest Early
> Access builds.*
>
>   * Schedule for JDK 16
>   o *2021/02/04 Initial Release Candidate*
>   o 2021/02/18 Final Release Candidate
>   o 2021/03/16 General Availability
>   * Release Notes [2]
>
> OpenJDK 16 Early Access build 35**is now available at
> http://jdk.java.net/16 
>
>   * These early-access, open-source builds are provided under the GNU
> General Public License, version 2, with the Classpath Exception
> .
>   * Features [3] - the overall feature set is frozen. No further JEPs
> will be targeted to this release.
>   * Changes in recent builds that maybe of interest:
>   o Build 34:
>   + JDK-8259025: Record compact constructor using
> Objects.requireNonNull
>   # Reported by JUnit5
>   o Build 32:
>   + JDK-8259014: Incomplete support for Unix domain sockets in
> Windows 2019 Server
>
>   * JDK 16 - topics of interest:
>   o Unix domain socket channels (JEP-380) overview:
>
> https://inside.java/2021/02/03/jep380-unix-domain-sockets-channels/
> <
> https://inside.java/2021/02/03/jep380-unix-domain-sockets-channels/>
>   o Java Feature Spotlight: Pattern Matching
> https://inside.java/2021/01/22/feature-spotlight-pattern-matching/
> <
> https://inside.java/2021/01/22/feature-spotlight-pattern-matching/>
>   o Foreign Memory Access - Pulling all the thread
>
> https://inside.java/2021/01/25/memory-access-pulling-all-the-threads/
> <
> https://inside.java/2021/01/25/memory-access-pulling-all-the-threads/>
>   * General – topic of interest:
>   o Inside Java Episode 11 “How to contribute to OpenJDK” with
> Stuart Marks and Jesper Wilhelmsson
> https://inside.java/2021/01/29/podcast-011/
> 
>
>
> Project Lanai EA 9 Build 17-lanai+2-49 (2021/1/20)
>  is available now
>
>   * These early-access builds are provided under the GNU General Public
> License, version 2, with the Classpath Exception
> 
>   * EA builds are intended for developers looking to test and provide
> feedback on using Project Lanai.
>   * This is a macOS-specific project which implements a new Java 2D
> graphics rendering pipeline for macOS.
>   * Project Lanai Wiki: https://wiki.openjdk.java.net/display/lanai/Main
> 
>   * Please send feedback via e-mail to lanai-...@openjdk.java.net
> . To send e-mail to this address
> you must first subscribe to the mailing list
> .
>
> Project Loom Build 17-loom+2-42 (2021/1/14) 
> based on JDK-17+5
>  is available now
>
>   * These early-access builds are provided under the GNU General Public
> License, version 2, with the Classpath Exception
> 
>   * These builds are intended for developers looking to "kick the tyres"
> and provide feedback on using the API or by sending bug reports.
>   * API Javadoc :
> https://download.java.net/java/early_access/loom/docs/api/
> 
>   * Please send feedback via e-mail to loom-...@openjdk.java.net
> . To send e-mail to this address
> you must first subscribe to the mailing list
> .
>
> OpenJDK 17 Early Access build 8**is now available at
> http://jdk.java.net/17 
>
>   * These early-access, open-source builds are provided under the GNU
> General Public License, version 2, with the Classpath Exception
> .
>   * Changes in recent builds that maybe of interest:
>   o Build 8:
>   + JDK-8222850: Misleading cascade compiler error in switch
> expression with undefined vars
>   # Reported by jOOQ.
>   + JDK-8217633: Configurable extensions with system properties
>   + JDK-8249867: DOM LSSerializer control of newline after XML
> header
>   + JDK-8256421: Added 2 HARICA Root CA Certificates
>   + JDK-8259801: Enable XML Signature secure validation mode by
> default
>   o Build 7:
>   + JDK-8165276: Spec states to invoke the 

[tomcat] branch 9.0.x updated: New releases

[remm]

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

remm 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 831aa32  New releases
831aa32 is described below

commit 831aa32d87afd3a884d13e1134304e11a1ed8c5e
Author: remm 
AuthorDate: Mon Feb 8 11:28:19 2021 +0100

New releases
---
 modules/cxf/pom.xml|  4 ++--
 modules/owb/pom.xml|  4 ++--
 webapps/docs/changelog.xml | 10 ++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index fe8e5d7..4059716 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -29,14 +29,14 @@
 Apache CXF for Apache Tomcat CDI
 Apache CXF packaged for Apache Tomcat CDI
 
-3.4.1
+3.4.2
 jar
 
 
 1.3
 1.1.4
 1.0
-1.2.8
+1.2.10
 
 
 
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index c0a2445..cda3eed 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -29,14 +29,14 @@
 Apache Tomcat CDI 2 support
 Apache Tomcat CDI 2 support using Apache 
OpenWebBeans
 
-2.0.20
+2.0.21
 jar
 
 
 1.2
 1.2
 1.3
-9.0.40
+9.0.43
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5327708..ac585da 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -128,6 +128,16 @@
   
 
   
+  
+
+  
+Update the OWB module to Apache OpenWebBeans 2.0.21. (remm)
+  
+  
+Update the CXF module to Apache CXF 3.4.2. (remm)
+  
+
+  
 
 
   


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

[tomcat] branch master updated: New releases

[remm]

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

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 8626277  New releases
8626277 is described below

commit 86262775315e03bb8c4c1eb0d0753aacbbe8b391
Author: remm 
AuthorDate: Mon Feb 8 11:28:19 2021 +0100

New releases
---
 modules/cxf/pom.xml|  4 ++--
 modules/owb/pom.xml|  4 ++--
 webapps/docs/changelog.xml | 10 ++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index 57ae446..88ba629 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -29,14 +29,14 @@
 Apache CXF for Apache Tomcat CDI
 Apache CXF packaged for Apache Tomcat CDI
 
-3.4.1
+3.4.2
 jar
 
 
 1.3
 1.1.4
 1.0
-1.2.8
+1.2.10
 
 
 
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 619e55a..e22c9bd 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -29,14 +29,14 @@
 Apache Tomcat CDI 2 support
 Apache Tomcat CDI 2 support using Apache 
OpenWebBeans
 
-2.0.20
+2.0.21
 jar
 
 
 1.2
 1.2
 1.3
-10.0.0
+10.0.2
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5e29910..f8057a2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,6 +133,16 @@
   
 
   
+  
+
+  
+Update the OWB module to Apache OpenWebBeans 2.0.21. (remm)
+  
+  
+Update the CXF module to Apache CXF 3.4.2. (remm)
+  
+
+  
 
 
   


-
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 test which would also match NIO2

[remm]

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

remm 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 d6818de  Fix test which would also match NIO2
d6818de is described below

commit d6818de1a70fce80a63af6dfa5227d5621833768
Author: remm 
AuthorDate: Mon Feb 8 11:24:59 2021 +0100

Fix test which would also match NIO2
---
 test/org/apache/tomcat/util/net/TestXxxEndpoint.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java 
b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
index 9b9476f..f54723b 100644
--- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
+++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
@@ -206,7 +206,7 @@ public class TestXxxEndpoint extends TomcatBaseTest {
 Tomcat tomcat = getTomcatInstance();
 Connector c = tomcat.getConnector();
 Assume.assumeTrue("NIO Unix domain sockets have to be supported for 
this test",
-c.getProtocolHandlerClassName().contains("Nio")
+c.getProtocolHandlerClassName().contains("NioProtocol")
 && JreCompat.isJre16Available());
 
 final String unixDomainSocketPath = "/tmp/testUnixDomainSocket";


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

Re: JDK 16 is now in the Release Candidate Phase

[Rémy Maucherat]

On Mon, Feb 8, 2021 at 11:18 AM Martin Grigorov 
wrote:

> Hi Rémy,
>
> On Mon, Feb 8, 2021 at 11:23 AM Rémy Maucherat  wrote:
>
> > On Mon, Feb 8, 2021 at 10:10 AM Martin Grigorov 
> > wrote:
> >
> > > Hi devs,
> > >
> > > TestXxxEndpoint fails concitently on both JDK 16 b35 and JDK 17 b8
> with:
> > >
> > > Testsuite: org.apache.tomcat.util.net.TestXxxEndpoint
> > > Tests run: 3, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 8.983
> sec
> > > - Standard Error -
> > > 08-Feb-2021 08:38:08.129 INFO [main]
> > > org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
> > > [testUnixDomainSocket]
> > > 08-Feb-2021 08:38:08.867 INFO [main]
> > > org.apache.coyote.AbstractProtocol.destroy Destroying ProtocolHandler
> > > ["http-nio2-127.0.0.1-auto-1"]
> > > 08-Feb-2021 08:38:08.926 INFO [main]
> > > org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
> > > [testStartStopBindOnStart]
> > > 08-Feb-2021 08:38:11.842 INFO [main]
> > > org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
> > > ["http-nio2-127.0.0.1-auto-2"]
> > > 08-Feb-2021 08:38:11.976 INFO [main]
> > > org.apache.catalina.core.StandardService.startInternal Starting service
> > > [Tomcat]
> > > 08-Feb-2021 08:38:11.979 INFO [main]
> > > org.apache.catalina.core.StandardEngine.startInternal Starting Servlet
> > > engine: [Apache Tomcat/10.0.3-dev]
> > > 08-Feb-2021 08:38:12.813 INFO [main]
> > > org.apache.catalina.startup.ContextConfig.getDefaultWebXmlFragment No
> > > global web.xml found
> > > 08-Feb-2021 08:38:14.322 INFO [main]
> > > org.apache.jasper.servlet.TldScanner.scanJars At least one JAR was
> > scanned
> > > for TLDs yet contained no TLDs. Enable debug logging for this logger
> for
> > a
> > > complete list of JAR
> > > s that were scanned but no TLDs were found in them. Skipping unneeded
> > JARs
> > > during scanning can improve startup time and JSP compilation time.
> > > 08-Feb-2021 08:38:14.462 INFO [main]
> > > org.apache.catalina.core.ApplicationContext.log ContextListener:
> > > contextInitialized()
> > > 08-Feb-2021 08:38:14.463 INFO [main]
> > > org.apache.catalina.core.ApplicationContext.log SessionListener:
> > > contextInitialized()
> > > 08-Feb-2021 08:38:14.483 INFO [main]
> > > org.apache.catalina.core.ApplicationContext.log ContextListener:
> > > attributeAdded('StockTicker', 'async.Stockticker@3a12c404')
> > > 08-Feb-2021 08:38:14.667 INFO [main]
> > > org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler
> > > ["http-nio2-127.0.0.1-auto-2"]
> > > 08-Feb-2021 08:38:14.812 INFO [main]
> > > org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler
> > > ["http-nio2-127.0.0.1-auto-2-34601"]
> > > 08-Feb-2021 08:38:14.824 INFO [main]
> > > org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler
> > > ["http-nio2-127.0.0.1-auto-2"]
> > > 08-Feb-2021 08:38:14.966 INFO [main]
> > > org.apache.coyote.AbstractProtocol.pause Pausing ProtocolHandler
> > > ["http-nio2-127.0.0.1-auto-2"]
> > > 08-Feb-2021 08:38:14.967 INFO [main]
> > > org.apache.catalina.core.StandardService.stopInternal Stopping service
> > > [Tomcat]
> > > 08-Feb-2021 08:38:14.971 INFO [main]
> > > org.apache.catalina.core.ApplicationContext.log SessionListener:
> > > contextDestroyed()
> > > 08-Feb-2021 08:38:14.972 INFO [main]
> > > org.apache.catalina.core.ApplicationContext.log ContextListener:
> > > contextDestroyed()
> > > 08-Feb-2021 08:38:15.024 INFO [main]
> > > org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler
> > > ["http-nio2-127.0.0.1-auto-2"]
> > > 08-Feb-2021 08:38:15.128 INFO [main]
> > > org.apache.coyote.AbstractProtocol.destroy Destroying ProtocolHandler
> > > ["http-nio2-127.0.0.1-auto-2"]
> > > 08-Feb-2021 08:38:15.134 INFO [main]
> > > org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
> > > [testStartStopBindOnInit]
> > > 08-Feb-2021 08:38:15.135 INFO [main]
> > > org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
> > > ["http-nio2-127.0.0.1-auto-3"]
> > > 08-Feb-2021 08:38:15.240 INFO [main]
> > > org.apache.catalina.core.StandardService.startInternal Starting service
> > > [Tomcat]
> > > 08-Feb-2021 08:38:15.240 INFO [main]
> > > org.apache.catalina.core.StandardEngine.startInternal Starting Servlet
> > > engine: [Apache Tomcat/10.0.3-dev]
> > > 08-Feb-2021 08:38:15.252 INFO [main]
> > > org.apache.catalina.startup.ContextConfig.getDefaultWebXmlFragment No
> > > global web.xml found
> > > 08-Feb-2021 08:38:15.747 INFO [main]
> > > org.apache.jasper.servlet.TldScanner.scanJars At least one JAR was
> > scanned
> > > for TLDs yet contained no TLDs. Enable debug logging for this logger
> for
> > a
> > > complete list of JAR
> > > s that were scanned but no TLDs were found in them. Skipping unneeded
> > JARs
> > > during scanning can improve startup time and JSP compilation time.
> > > 08-Feb-2021 08:38:15.767 INFO [main]
> > > org.apache.catalina.core.ApplicationContext.log 

[tomcat] branch master updated: Fix test which would also match NIO2

[remm]

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

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new b02e7fd  Fix test which would also match NIO2
b02e7fd is described below

commit b02e7fddf65440699cb66211a584cfe63fce8e3f
Author: remm 
AuthorDate: Mon Feb 8 11:24:59 2021 +0100

Fix test which would also match NIO2
---
 test/org/apache/tomcat/util/net/TestXxxEndpoint.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java 
b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
index bc9b1f3..d77132f 100644
--- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
+++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
@@ -217,7 +217,7 @@ public class TestXxxEndpoint extends TomcatBaseTest {
 Tomcat tomcat = getTomcatInstance();
 Connector c = tomcat.getConnector();
 Assume.assumeTrue("NIO Unix domain sockets have to be supported for 
this test",
-c.getProtocolHandlerClassName().contains("Nio")
+c.getProtocolHandlerClassName().contains("NioProtocol")
 && JreCompat.isJre16Available());
 
 final String unixDomainSocketPath = "/tmp/testUnixDomainSocket";


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

Re: JDK 16 is now in the Release Candidate Phase

[Martin Grigorov]

Hi Rémy,

On Mon, Feb 8, 2021 at 11:23 AM Rémy Maucherat  wrote:

> On Mon, Feb 8, 2021 at 10:10 AM Martin Grigorov 
> wrote:
>
> > Hi devs,
> >
> > TestXxxEndpoint fails concitently on both JDK 16 b35 and JDK 17 b8 with:
> >
> > Testsuite: org.apache.tomcat.util.net.TestXxxEndpoint
> > Tests run: 3, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 8.983 sec
> > - Standard Error -
> > 08-Feb-2021 08:38:08.129 INFO [main]
> > org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
> > [testUnixDomainSocket]
> > 08-Feb-2021 08:38:08.867 INFO [main]
> > org.apache.coyote.AbstractProtocol.destroy Destroying ProtocolHandler
> > ["http-nio2-127.0.0.1-auto-1"]
> > 08-Feb-2021 08:38:08.926 INFO [main]
> > org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
> > [testStartStopBindOnStart]
> > 08-Feb-2021 08:38:11.842 INFO [main]
> > org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
> > ["http-nio2-127.0.0.1-auto-2"]
> > 08-Feb-2021 08:38:11.976 INFO [main]
> > org.apache.catalina.core.StandardService.startInternal Starting service
> > [Tomcat]
> > 08-Feb-2021 08:38:11.979 INFO [main]
> > org.apache.catalina.core.StandardEngine.startInternal Starting Servlet
> > engine: [Apache Tomcat/10.0.3-dev]
> > 08-Feb-2021 08:38:12.813 INFO [main]
> > org.apache.catalina.startup.ContextConfig.getDefaultWebXmlFragment No
> > global web.xml found
> > 08-Feb-2021 08:38:14.322 INFO [main]
> > org.apache.jasper.servlet.TldScanner.scanJars At least one JAR was
> scanned
> > for TLDs yet contained no TLDs. Enable debug logging for this logger for
> a
> > complete list of JAR
> > s that were scanned but no TLDs were found in them. Skipping unneeded
> JARs
> > during scanning can improve startup time and JSP compilation time.
> > 08-Feb-2021 08:38:14.462 INFO [main]
> > org.apache.catalina.core.ApplicationContext.log ContextListener:
> > contextInitialized()
> > 08-Feb-2021 08:38:14.463 INFO [main]
> > org.apache.catalina.core.ApplicationContext.log SessionListener:
> > contextInitialized()
> > 08-Feb-2021 08:38:14.483 INFO [main]
> > org.apache.catalina.core.ApplicationContext.log ContextListener:
> > attributeAdded('StockTicker', 'async.Stockticker@3a12c404')
> > 08-Feb-2021 08:38:14.667 INFO [main]
> > org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler
> > ["http-nio2-127.0.0.1-auto-2"]
> > 08-Feb-2021 08:38:14.812 INFO [main]
> > org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler
> > ["http-nio2-127.0.0.1-auto-2-34601"]
> > 08-Feb-2021 08:38:14.824 INFO [main]
> > org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler
> > ["http-nio2-127.0.0.1-auto-2"]
> > 08-Feb-2021 08:38:14.966 INFO [main]
> > org.apache.coyote.AbstractProtocol.pause Pausing ProtocolHandler
> > ["http-nio2-127.0.0.1-auto-2"]
> > 08-Feb-2021 08:38:14.967 INFO [main]
> > org.apache.catalina.core.StandardService.stopInternal Stopping service
> > [Tomcat]
> > 08-Feb-2021 08:38:14.971 INFO [main]
> > org.apache.catalina.core.ApplicationContext.log SessionListener:
> > contextDestroyed()
> > 08-Feb-2021 08:38:14.972 INFO [main]
> > org.apache.catalina.core.ApplicationContext.log ContextListener:
> > contextDestroyed()
> > 08-Feb-2021 08:38:15.024 INFO [main]
> > org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler
> > ["http-nio2-127.0.0.1-auto-2"]
> > 08-Feb-2021 08:38:15.128 INFO [main]
> > org.apache.coyote.AbstractProtocol.destroy Destroying ProtocolHandler
> > ["http-nio2-127.0.0.1-auto-2"]
> > 08-Feb-2021 08:38:15.134 INFO [main]
> > org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
> > [testStartStopBindOnInit]
> > 08-Feb-2021 08:38:15.135 INFO [main]
> > org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
> > ["http-nio2-127.0.0.1-auto-3"]
> > 08-Feb-2021 08:38:15.240 INFO [main]
> > org.apache.catalina.core.StandardService.startInternal Starting service
> > [Tomcat]
> > 08-Feb-2021 08:38:15.240 INFO [main]
> > org.apache.catalina.core.StandardEngine.startInternal Starting Servlet
> > engine: [Apache Tomcat/10.0.3-dev]
> > 08-Feb-2021 08:38:15.252 INFO [main]
> > org.apache.catalina.startup.ContextConfig.getDefaultWebXmlFragment No
> > global web.xml found
> > 08-Feb-2021 08:38:15.747 INFO [main]
> > org.apache.jasper.servlet.TldScanner.scanJars At least one JAR was
> scanned
> > for TLDs yet contained no TLDs. Enable debug logging for this logger for
> a
> > complete list of JAR
> > s that were scanned but no TLDs were found in them. Skipping unneeded
> JARs
> > during scanning can improve startup time and JSP compilation time.
> > 08-Feb-2021 08:38:15.767 INFO [main]
> > org.apache.catalina.core.ApplicationContext.log ContextListener:
> > contextInitialized()
> > 08-Feb-2021 08:38:15.768 INFO [main]
> > org.apache.catalina.core.ApplicationContext.log SessionListener:
> > contextInitialized()
> > 08-Feb-2021 08:38:15.769 INFO [main]
> > org.apache.catalina.core.ApplicationContext.log 

[tomcat-jakartaee-migration] branch master updated: Output the stack trace when the log message includes an exception

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 72e13d2  Output the stack trace when the log message includes an 
exception
72e13d2 is described below

commit 72e13d20efa13cd7d49fcfb850b197d16d46710d
Author: Mark Thomas 
AuthorDate: Mon Feb 8 09:38:39 2021 +

Output the stack trace when the log message includes an exception
---
 src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java 
b/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java
index 1b6dc80..8c33d2d 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java
@@ -32,7 +32,7 @@ public class MigrationCLI {
 private static final String PROFILE_ARG = "-profile=";
 
 public static void main(String[] args) {
-System.setProperty("java.util.logging.SimpleFormatter.format", 
"%5$s%n");
+System.setProperty("java.util.logging.SimpleFormatter.format", "%5$s%n 
%6$s%n");
 
 List arguments = new ArrayList<>(Arrays.asList(args));
 if (arguments.contains("-verbose")) {
@@ -88,5 +88,5 @@ public class MigrationCLI {
 private static void usage() {
 System.out.println(sm.getString("migration.usage"));
 }
-
+
 }


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

[GitHub] [tomcat-jakartaee-migration] markt-asf closed pull request #12: Update README: only SOME packages have been moved to jakarta.

[GitBox]

markt-asf closed pull request #12:
URL: https://github.com/apache/tomcat-jakartaee-migration/pull/12


   



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.

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: JDK 16 is now in the Release Candidate Phase

[Rémy Maucherat]

On Mon, Feb 8, 2021 at 10:10 AM Martin Grigorov 
wrote:

> Hi devs,
>
> TestXxxEndpoint fails concitently on both JDK 16 b35 and JDK 17 b8 with:
>
> Testsuite: org.apache.tomcat.util.net.TestXxxEndpoint
> Tests run: 3, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 8.983 sec
> - Standard Error -
> 08-Feb-2021 08:38:08.129 INFO [main]
> org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
> [testUnixDomainSocket]
> 08-Feb-2021 08:38:08.867 INFO [main]
> org.apache.coyote.AbstractProtocol.destroy Destroying ProtocolHandler
> ["http-nio2-127.0.0.1-auto-1"]
> 08-Feb-2021 08:38:08.926 INFO [main]
> org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
> [testStartStopBindOnStart]
> 08-Feb-2021 08:38:11.842 INFO [main]
> org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
> ["http-nio2-127.0.0.1-auto-2"]
> 08-Feb-2021 08:38:11.976 INFO [main]
> org.apache.catalina.core.StandardService.startInternal Starting service
> [Tomcat]
> 08-Feb-2021 08:38:11.979 INFO [main]
> org.apache.catalina.core.StandardEngine.startInternal Starting Servlet
> engine: [Apache Tomcat/10.0.3-dev]
> 08-Feb-2021 08:38:12.813 INFO [main]
> org.apache.catalina.startup.ContextConfig.getDefaultWebXmlFragment No
> global web.xml found
> 08-Feb-2021 08:38:14.322 INFO [main]
> org.apache.jasper.servlet.TldScanner.scanJars At least one JAR was scanned
> for TLDs yet contained no TLDs. Enable debug logging for this logger for a
> complete list of JAR
> s that were scanned but no TLDs were found in them. Skipping unneeded JARs
> during scanning can improve startup time and JSP compilation time.
> 08-Feb-2021 08:38:14.462 INFO [main]
> org.apache.catalina.core.ApplicationContext.log ContextListener:
> contextInitialized()
> 08-Feb-2021 08:38:14.463 INFO [main]
> org.apache.catalina.core.ApplicationContext.log SessionListener:
> contextInitialized()
> 08-Feb-2021 08:38:14.483 INFO [main]
> org.apache.catalina.core.ApplicationContext.log ContextListener:
> attributeAdded('StockTicker', 'async.Stockticker@3a12c404')
> 08-Feb-2021 08:38:14.667 INFO [main]
> org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler
> ["http-nio2-127.0.0.1-auto-2"]
> 08-Feb-2021 08:38:14.812 INFO [main]
> org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler
> ["http-nio2-127.0.0.1-auto-2-34601"]
> 08-Feb-2021 08:38:14.824 INFO [main]
> org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler
> ["http-nio2-127.0.0.1-auto-2"]
> 08-Feb-2021 08:38:14.966 INFO [main]
> org.apache.coyote.AbstractProtocol.pause Pausing ProtocolHandler
> ["http-nio2-127.0.0.1-auto-2"]
> 08-Feb-2021 08:38:14.967 INFO [main]
> org.apache.catalina.core.StandardService.stopInternal Stopping service
> [Tomcat]
> 08-Feb-2021 08:38:14.971 INFO [main]
> org.apache.catalina.core.ApplicationContext.log SessionListener:
> contextDestroyed()
> 08-Feb-2021 08:38:14.972 INFO [main]
> org.apache.catalina.core.ApplicationContext.log ContextListener:
> contextDestroyed()
> 08-Feb-2021 08:38:15.024 INFO [main]
> org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler
> ["http-nio2-127.0.0.1-auto-2"]
> 08-Feb-2021 08:38:15.128 INFO [main]
> org.apache.coyote.AbstractProtocol.destroy Destroying ProtocolHandler
> ["http-nio2-127.0.0.1-auto-2"]
> 08-Feb-2021 08:38:15.134 INFO [main]
> org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
> [testStartStopBindOnInit]
> 08-Feb-2021 08:38:15.135 INFO [main]
> org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
> ["http-nio2-127.0.0.1-auto-3"]
> 08-Feb-2021 08:38:15.240 INFO [main]
> org.apache.catalina.core.StandardService.startInternal Starting service
> [Tomcat]
> 08-Feb-2021 08:38:15.240 INFO [main]
> org.apache.catalina.core.StandardEngine.startInternal Starting Servlet
> engine: [Apache Tomcat/10.0.3-dev]
> 08-Feb-2021 08:38:15.252 INFO [main]
> org.apache.catalina.startup.ContextConfig.getDefaultWebXmlFragment No
> global web.xml found
> 08-Feb-2021 08:38:15.747 INFO [main]
> org.apache.jasper.servlet.TldScanner.scanJars At least one JAR was scanned
> for TLDs yet contained no TLDs. Enable debug logging for this logger for a
> complete list of JAR
> s that were scanned but no TLDs were found in them. Skipping unneeded JARs
> during scanning can improve startup time and JSP compilation time.
> 08-Feb-2021 08:38:15.767 INFO [main]
> org.apache.catalina.core.ApplicationContext.log ContextListener:
> contextInitialized()
> 08-Feb-2021 08:38:15.768 INFO [main]
> org.apache.catalina.core.ApplicationContext.log SessionListener:
> contextInitialized()
> 08-Feb-2021 08:38:15.769 INFO [main]
> org.apache.catalina.core.ApplicationContext.log ContextListener:
> attributeAdded('StockTicker', 'async.Stockticker@2f48b3d2')
> 08-Feb-2021 08:38:15.774 INFO [main]
> org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler
> ["http-nio2-127.0.0.1-auto-3-39117"]
> 08-Feb-2021 08:38:15.817 INFO [main]
> 

[GitHub] [tomcat-jakartaee-migration] markt-asf commented on pull request #12: Update README: only SOME packages have been moved to jakarta.

[GitBox]

markt-asf commented on pull request #12:
URL: 
https://github.com/apache/tomcat-jakartaee-migration/pull/12#issuecomment-775000851


   Fair point that the old text didn't make clear that not all javax packages 
were part of Java EE. However, I think this proposal goes to far the other way 
and suggests not all Java EE packages have changed name.
   I have reworked that section of the README to try and make this clearer.



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.

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

[ANN] Apache Tomcat 7.0.108 released

[Violeta Georgieva]

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 7.0.108.

Apache Tomcat is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Expression Language and Java
WebSocket technologies.

This release contains a number of bug fixes and improvements compared to
version 7.0.107. The notable changes since 7.0.107 include:


- Fix a potential file descriptor leak when WebSocket connections are
  attempted and fail. Patch provided by Maurizio Adami.


Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-7.0-doc/changelog.html

Apache Tomcat website:
http://tomcat.apache.org

Downloads:
http://tomcat.apache.org/download-70.cgi

Migration guides from Apache Tomcat 5.5.x and 6.0.x:
http://tomcat.apache.org/migration.html

Enjoy

The Apache Tomcat team

[tomcat-jakartaee-migration] branch master updated: Improve wording

[markt]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new d73ce65  Improve wording
d73ce65 is described below

commit d73ce654877a36b4c71f91fbd239a90d0e842ae2
Author: Mark Thomas 
AuthorDate: Mon Feb 8 09:20:02 2021 +

Improve wording
---
 README.md | 22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 4879888..439bcfe 100644
--- a/README.md
+++ b/README.md
@@ -53,11 +53,17 @@ The migration tool is available as an Ant task, here is an 
example:
 
 ## Differences between Java EE 8 and Jakarta EE 9
 
-The differences between Java EE 8 and Jakarta EE 9 are limited to packages
-moving from the `javax.*` namespace to the `jakarta.*` namespace. Some packages
-have also been renamed. This migration tool performs all the package renaming
-necessary to migrate an application from Java EE 8 to Jakarta EE 9.
-
-Note: It will not be necessary to migrate any references to XML schemas. The
-schemas don't directly reference javax packages and Jakarta EE 9 will continue
-to support the use of schemas from Java EE 8 and earlier.
+The difference between Java EE 8 and Jakarta EE 9 is that all the
+[Java EE 8 
packages](https://github.com/apache/tomcat-jakartaee-migration/blob/master/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java#L37)
+in the `javax.*` namespace have moved to the `jakarta.*` namespace.
+Some sub-packages have also been renamed. 
+This migration tool performs all the necessary changes to migrate an 
application
+from Java EE 8 to Jakarta EE 9 by renaming each Java EE 8 package to its 
Jakarta
+EE 9 replacement.
+
+Note: Not all `javax.*` packages are part of Java EE. Only those defined by 
Java
+EE have moved to the `jakarta.*` namespace.
+
+Note: It is not necessary to migrate any references to XML schemas. The schemas
+don't directly reference javax packages and Jakarta EE 9 will continue to
+support the use of schemas from Java EE 8 and earlier.


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

svn commit: r45882 - /release/tomcat/tomcat-7/v7.0.107/

[violetagg]

Author: violetagg
Date: Mon Feb  8 09:15:52 2021
New Revision: 45882

Log:
Remove 7.0.107

Removed:
release/tomcat/tomcat-7/v7.0.107/


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

svn commit: r1886307 - in /tomcat/site/trunk/docs: ./ tomcat-7.0-doc/ tomcat-7.0-doc/annotationapi/ tomcat-7.0-doc/annotationapi/javax/annotation/ tomcat-7.0-doc/annotationapi/javax/annotation/securit

[violetagg]

Author: violetagg
Date: Mon Feb  8 09:12:08 2021
New Revision: 1886307

URL: http://svn.apache.org/viewvc?rev=1886307=rev
Log:
Update docs for Apache Tomcat 7.0.108 release.


[This commit notification would consist of 75 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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

[tomcat] branch master updated: Update to first stable 10 build

[remm]

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

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 052ff33  Update to first stable 10 build
052ff33 is described below

commit 052ff33d95cb96958ff2af8371a32bbc563d9145
Author: remm 
AuthorDate: Mon Feb 8 10:12:08 2021 +0100

Update to first stable 10 build
---
 modules/stuffed/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml
index a46dad5..3d6f129 100644
--- a/modules/stuffed/pom.xml
+++ b/modules/stuffed/pom.xml
@@ -29,8 +29,8 @@
 
 UTF-8
 org.apache.catalina.startup.Tomcat
-10.0.0
-
+10.0.2
+
 
 
 


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

Re: JDK 16 is now in the Release Candidate Phase

[Martin Grigorov]

Hi devs,

TestXxxEndpoint fails concitently on both JDK 16 b35 and JDK 17 b8 with:

Testsuite: org.apache.tomcat.util.net.TestXxxEndpoint
Tests run: 3, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 8.983 sec
- Standard Error -
08-Feb-2021 08:38:08.129 INFO [main]
org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
[testUnixDomainSocket]
08-Feb-2021 08:38:08.867 INFO [main]
org.apache.coyote.AbstractProtocol.destroy Destroying ProtocolHandler
["http-nio2-127.0.0.1-auto-1"]
08-Feb-2021 08:38:08.926 INFO [main]
org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
[testStartStopBindOnStart]
08-Feb-2021 08:38:11.842 INFO [main]
org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
["http-nio2-127.0.0.1-auto-2"]
08-Feb-2021 08:38:11.976 INFO [main]
org.apache.catalina.core.StandardService.startInternal Starting service
[Tomcat]
08-Feb-2021 08:38:11.979 INFO [main]
org.apache.catalina.core.StandardEngine.startInternal Starting Servlet
engine: [Apache Tomcat/10.0.3-dev]
08-Feb-2021 08:38:12.813 INFO [main]
org.apache.catalina.startup.ContextConfig.getDefaultWebXmlFragment No
global web.xml found
08-Feb-2021 08:38:14.322 INFO [main]
org.apache.jasper.servlet.TldScanner.scanJars At least one JAR was scanned
for TLDs yet contained no TLDs. Enable debug logging for this logger for a
complete list of JAR
s that were scanned but no TLDs were found in them. Skipping unneeded JARs
during scanning can improve startup time and JSP compilation time.
08-Feb-2021 08:38:14.462 INFO [main]
org.apache.catalina.core.ApplicationContext.log ContextListener:
contextInitialized()
08-Feb-2021 08:38:14.463 INFO [main]
org.apache.catalina.core.ApplicationContext.log SessionListener:
contextInitialized()
08-Feb-2021 08:38:14.483 INFO [main]
org.apache.catalina.core.ApplicationContext.log ContextListener:
attributeAdded('StockTicker', 'async.Stockticker@3a12c404')
08-Feb-2021 08:38:14.667 INFO [main]
org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler
["http-nio2-127.0.0.1-auto-2"]
08-Feb-2021 08:38:14.812 INFO [main]
org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler
["http-nio2-127.0.0.1-auto-2-34601"]
08-Feb-2021 08:38:14.824 INFO [main]
org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler
["http-nio2-127.0.0.1-auto-2"]
08-Feb-2021 08:38:14.966 INFO [main]
org.apache.coyote.AbstractProtocol.pause Pausing ProtocolHandler
["http-nio2-127.0.0.1-auto-2"]
08-Feb-2021 08:38:14.967 INFO [main]
org.apache.catalina.core.StandardService.stopInternal Stopping service
[Tomcat]
08-Feb-2021 08:38:14.971 INFO [main]
org.apache.catalina.core.ApplicationContext.log SessionListener:
contextDestroyed()
08-Feb-2021 08:38:14.972 INFO [main]
org.apache.catalina.core.ApplicationContext.log ContextListener:
contextDestroyed()
08-Feb-2021 08:38:15.024 INFO [main]
org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler
["http-nio2-127.0.0.1-auto-2"]
08-Feb-2021 08:38:15.128 INFO [main]
org.apache.coyote.AbstractProtocol.destroy Destroying ProtocolHandler
["http-nio2-127.0.0.1-auto-2"]
08-Feb-2021 08:38:15.134 INFO [main]
org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
[testStartStopBindOnInit]
08-Feb-2021 08:38:15.135 INFO [main]
org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
["http-nio2-127.0.0.1-auto-3"]
08-Feb-2021 08:38:15.240 INFO [main]
org.apache.catalina.core.StandardService.startInternal Starting service
[Tomcat]
08-Feb-2021 08:38:15.240 INFO [main]
org.apache.catalina.core.StandardEngine.startInternal Starting Servlet
engine: [Apache Tomcat/10.0.3-dev]
08-Feb-2021 08:38:15.252 INFO [main]
org.apache.catalina.startup.ContextConfig.getDefaultWebXmlFragment No
global web.xml found
08-Feb-2021 08:38:15.747 INFO [main]
org.apache.jasper.servlet.TldScanner.scanJars At least one JAR was scanned
for TLDs yet contained no TLDs. Enable debug logging for this logger for a
complete list of JAR
s that were scanned but no TLDs were found in them. Skipping unneeded JARs
during scanning can improve startup time and JSP compilation time.
08-Feb-2021 08:38:15.767 INFO [main]
org.apache.catalina.core.ApplicationContext.log ContextListener:
contextInitialized()
08-Feb-2021 08:38:15.768 INFO [main]
org.apache.catalina.core.ApplicationContext.log SessionListener:
contextInitialized()
08-Feb-2021 08:38:15.769 INFO [main]
org.apache.catalina.core.ApplicationContext.log ContextListener:
attributeAdded('StockTicker', 'async.Stockticker@2f48b3d2')
08-Feb-2021 08:38:15.774 INFO [main]
org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler
["http-nio2-127.0.0.1-auto-3-39117"]
08-Feb-2021 08:38:15.817 INFO [main]
org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler
["http-nio2-127.0.0.1-auto-3-39117"]
08-Feb-2021 08:38:15.838 INFO [main]
org.apache.tomcat.util.net.TestXxxEndpoint.testStartStopBindOnInit
Exception was
java.net.BindException: Address already in use
   at 

svn commit: r1886306 - in /tomcat/site/trunk: ./ docs/ xdocs/

[violetagg]

Author: violetagg
Date: Mon Feb  8 08:55:33 2021
New Revision: 1886306

URL: http://svn.apache.org/viewvc?rev=1886306=rev
Log:
Updates (excluding docs) for 7.0.108 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-70.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-7.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1886306=1886305=1886306=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Mon Feb  8 08:55:33 2021
@@ -36,7 +36,7 @@ tomcat.loc=https://downloads.apache.org/
 
 
 # - Tomcat versions -
-tomcat70=7.0.107
+tomcat70=7.0.108
 tomcat85=8.5.63
 tomcat90=9.0.43
 tomcat100=10.0.2

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1886306=1886305=1886306=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Mon Feb  8 08:55:33 2021
@@ -81,8 +81,8 @@
 
   
 Latest Stable 7.0.x Release
-2020-11-23
-7.0.107
+2021-02-05
+7.0.108
   
 
 

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1886306=1886305=1886306=diff
==
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Mon Feb  8 08:55:33 2021
@@ -12,7 +12,7 @@
 
   Quick Navigation
 
-[define v]7.0.107[end]
+[define v]7.0.108[end]
 https://downloads.apache.org/tomcat/tomcat-7/KEYS;>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1886306=1886305=1886306=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Mon Feb  8 08:55:33 2021
@@ -28,6 +28,27 @@ wiki page.
 Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
 project logo are trademarks of the Apache Software Foundation.
 
+2021-02-05 Tomcat 7.0.108 Released
+
+The Apache Tomcat Project is proud to announce the release of version 7.0.108 
of
+Apache Tomcat. This release contains a number of bug fixes and improvements
+compared to version 7.0.107.
+
+Fix a potential file descriptor leak when WebSocket connections are
+attempted and fail. Patch provided by Maurizio Adami.
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 7 
changelog.
+
+
+Note: End of life date for Apache Tomcat 7.0.x is 
announced.
+Read more...
+
+
+
+https://tomcat.apache.org/download-70.cgi;>Download
+
 2021-02-02 Tomcat 10.0.2 Released
 
 The Apache Tomcat Project is proud to announce the release of version 10.0.2
@@ -135,28 +156,6 @@ Tomcat Native. The notable changes since
 https://tomcat.apache.org/download-native.cgi;>Download |
 ChangeLog for 1.2.26
 
-2020-11-23 Tomcat 7.0.107 Released
-
-The Apache Tomcat Project is proud to announce the release of version 7.0.107 
of
-Apache Tomcat. This release contains a number of bug fixes and improvements
-compared to version 7.0.106.
-
-Ensure that none of the methods on a ServletContext instance always
-fail when running under a SecurityManager. Pull request provided by
-Kyle Stiemann.
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 7 
changelog.
-
-
-Note: End of life date for Apache Tomcat 7.0.x is 
announced.
-Read more...
-
-
-
-https://tomcat.apache.org/download-70.cgi;>Download
-
 2020-03-06 Tomcat Connectors 1.2.48 Released
 
 The Apache Tomcat Project is proud to announce the release of version 1.2.48 of

Modified: tomcat/site/trunk/docs/migration-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1886306=1886305=1886306=diff
==
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Mon Feb  8 08:55:33 2021
@@ -614,8 +614,9 @@ of Apache Tomcat.
 7.0.103
 7.0.104
 7.0.105
-7.0.106
-7.0.107
+7.0.106
+